Skip to content

Commit

Permalink
Merge pull request #380 from KyleAure/379-standardize-all-artifacts
Browse files Browse the repository at this point in the history
Artifact name standardization
  • Loading branch information
otaviojava authored Nov 28, 2023
2 parents b059e51 + 1f1776f commit f49f03a
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 30 deletions.
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<parent>
<groupId>jakarta.data</groupId>
<artifactId>jakarta-data-parent</artifactId>
<artifactId>jakarta.data-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</parent>

<groupId>jakarta.data</groupId>
<artifactId>jakarta-data-parent</artifactId>
<artifactId>jakarta.data-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>

Expand Down
6 changes: 3 additions & 3 deletions spec/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2022 Contributors to the Eclipse Foundation
~ Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -22,11 +22,11 @@

<parent>
<groupId>jakarta.data</groupId>
<artifactId>jakarta-data-parent</artifactId>
<artifactId>jakarta.data-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta-data-spec</artifactId>
<artifactId>jakarta.data-spec</artifactId>
<packaging>pom</packaging>
<name>Jakarta Data Specification</name>

Expand Down
31 changes: 19 additions & 12 deletions tck-dist/pom.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ~ Copyright (c) 2022 Contributors to the Eclipse Foundation ~ ~ This
program and the accompanying materials are made available under the ~ terms
of the Eclipse Public License v. 2.0, which is available at ~ http://www.eclipse.org/legal/epl-2.0.
~ ~ This Source Code may also be made available under the following Secondary
~ Licenses when the conditions for such availability set forth in the ~ Eclipse
Public License v. 2.0 are satisfied: GNU General Public License, ~ version
2 with the GNU Classpath Exception, which is available at ~ https://www.gnu.org/software/classpath/license.html.
~ ~ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -->
<!--
~ Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
~
~ This program and the accompanying materials are made available under the
~ terms of the Eclipse Public License v. 2.0, which is available at
~ http://www.eclipse.org/legal/epl-2.0.
~
~ This Source Code may also be made available under the following Secondary
~ Licenses when the conditions for such availability set forth in the
~ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
~ version 2 with the GNU Classpath Exception, which is available at
~ https://www.gnu.org/software/classpath/license.html.
~
~ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>jakarta.data</groupId>
<artifactId>jakarta-data-parent</artifactId>
<artifactId>jakarta.data-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta-data-tck-dist</artifactId>
<artifactId>jakarta.data-tck-dist</artifactId>
<name>Jakarta Data Technology Compatibility Kit Distribution</name>
<description>Jakarta Data :: TCK Distribution</description>

Expand Down Expand Up @@ -50,7 +57,7 @@
<!-- The TCK, used to auto generate docs -->
<dependency>
<groupId>jakarta.data</groupId>
<artifactId>jakarta-data-tck</artifactId>
<artifactId>jakarta.data-tck</artifactId>
<version>${jakarta.data.tck.version}</version>
</dependency>
<!-- Provided dependencies for the TCK -->
Expand Down Expand Up @@ -113,7 +120,7 @@
<mainClass>ee.jakarta.tck.data.metadata.CollectMetaData</mainClass>
<arguments>
<argument>true</argument>
<argument>${jakarta.data:jakarta-data-tck:jar}</argument>
<argument>${jakarta.data:jakarta.data-tck:jar}</argument>
<argument>${project.basedir}/src/main/asciidoc/sections/generated</argument>
</arguments>
</configuration>
Expand Down
6 changes: 3 additions & 3 deletions tck-dist/src/main/artifacts/artifact-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ fi

# Parent pom
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
-Dfile=jakarta-data-parent-"$VERSION".pom \
-Dfile=jakarta.data-parent-"$VERSION".pom \
-DgroupId=jakarta.data \
-DartifactId=jakarta-data-parent \
-DartifactId=jakarta.data-parent \
-Dversion="$VERSION" \
-Dpackaging=pom

# Jakarta Data TCK Installed Library
mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
-Dfile=jakarta-data-tck-"$VERSION".jar
-Dfile=jakarta.data-tck-"$VERSION".jar
8 changes: 4 additions & 4 deletions tck-dist/src/main/assembly/assembly.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2022 Contributors to the Eclipse Foundation
~ Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
~
~ This program and the accompanying materials are made available under the
~ terms of the Eclipse Public License v. 2.0, which is available at
Expand Down Expand Up @@ -75,9 +75,9 @@
<dependencySets>
<dependencySet>
<includes>
<include>jakarta.data:jakarta-data-tck</include>
<include>jakarta.data:jakarta-data-tck:jar:sources</include>
<include>jakarta.data:jakarta-data-parent</include>
<include>jakarta.data:jakarta.data-tck</include>
<include>jakarta.data:jakarta.data-tck:jar:sources</include>
<include>jakarta.data:jakarta.data-parent</include>
</includes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<outputDirectory>artifacts</outputDirectory>
Expand Down
4 changes: 2 additions & 2 deletions tck-dist/src/main/starter/ee-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<!-- The TCK -->
<dependency>
<groupId>jakarta-data</groupId>
<artifactId>jakarta-data-tck</artifactId>
<artifactId>jakarta.data-tck</artifactId>
<version>${jakarta.data.tck.version}</version>
</dependency>
<!-- The API -->
Expand Down Expand Up @@ -150,7 +150,7 @@
<version>${maven.surefire.plugin.version}</version>
<configuration>
<dependenciesToScan>
<dependency>jakarta.data:jakarta-data-tck</dependency>
<dependency>jakarta.data:jakarta.data-tck</dependency>
</dependenciesToScan>
<!-- tag::systemProperties[] -->
<systemPropertyVariables>
Expand Down
4 changes: 2 additions & 2 deletions tck-dist/src/main/starter/se-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
<!-- The TCK -->
<dependency>
<groupId>jakarta-data</groupId>
<artifactId>jakarta-data-tck</artifactId>
<artifactId>jakarta.data-tck</artifactId>
<version>${jakarta.data.tck.version}</version>
</dependency>
<!-- The API -->
Expand Down Expand Up @@ -145,7 +145,7 @@
<version>${maven.surefire.plugin.version}</version>
<configuration>
<dependenciesToScan>
<dependency>jakarta.data:jakarta-data-tck</dependency>
<dependency>jakarta.data:jakarta.data-tck</dependency>
</dependenciesToScan>
<!-- tag::systemProperties[] -->
<systemPropertyVariables>
Expand Down
4 changes: 2 additions & 2 deletions tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

<parent>
<groupId>jakarta.data</groupId>
<artifactId>jakarta-data-parent</artifactId>
<artifactId>jakarta.data-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>jakarta-data-tck</artifactId>
<artifactId>jakarta.data-tck</artifactId>
<name>Jakarta Data Technology Compatibility Kit</name>
<description>Jakarta Data :: TCK</description>

Expand Down

0 comments on commit f49f03a

Please sign in to comment.