Update group id to remove 'enterprise'

jakartaee · Jul 9, 2024 · b6b31d2 · b6b31d2
1 parent c7af8f9
commit b6b31d2
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 47 deletions.
diff --git a/.github/ISSUE_TEMPLATE/certification.yml b/.github/ISSUE_TEMPLATE/certification.yml
@@ -45,7 +45,7 @@ body:
       description: |
         SHA-256 Checksum
         This is the checksum of the TCK Distribution zip, not the checksum for the TCK jar artifact.
-        Example: `shasum -a 256 jakarta.enterprise.concurrent-tck-dist-3.1.0-dist.zip`
+        Example: `shasum -a 256 jakarta.concurrent-tck-dist-3.1.0-dist.zip`
   - type: textarea
     id: tckResults
     validations:

diff --git a/api/pom.xml b/api/pom.xml
@@ -21,18 +21,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+    <artifactId>jakarta.concurrent-api</artifactId>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.enterprise.concurrent</groupId>
+          <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+        </relocation>
+    </distributionManagement>
 
     <name>Jakarta Concurrency</name>
     <description>
         Jakarta Concurrency provides a specification for using concurrency from application 
         components without compromising container integrity while still preserving the Jakarta EE 
-        platform’s fundamental benefits.
+        platform's fundamental benefits.
     </description>
     <url>https://github.com/jakartaee/concurrency</url>
 

diff --git a/pom.xml b/pom.xml
@@ -23,11 +23,18 @@
         <version>1.0.9</version>
     </parent>
 
-    <groupId>jakarta.enterprise.concurrent</groupId>
-    <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+    <groupId>jakarta.concurrent</groupId>
+    <artifactId>jakarta.concurrent.parent</artifactId>
     <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.enterprise.concurrent</groupId>
+          <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        </relocation>
+    </distributionManagement>
+
     <name>Jakarta Concurrency</name>
     <description>Jakarta Concurrency Parent</description>
     <url>https://github.com/jakartaee/concurrency</url>

diff --git a/specification/pom.xml b/specification/pom.xml
@@ -20,29 +20,32 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>concurrency-spec</artifactId>
+    <artifactId>jakarta.concurrent-spec</artifactId>
     <packaging>pom</packaging>
-
     <name>Jakarta Concurrency Specification</name>
 
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.enterprise.concurrent</groupId>
+          <artifactId>concurrency-spec</artifactId>
+        </relocation>
+        <site>
+            <url>scm:git:[email protected]:jakartaee/jakarta-concurrency.git</url>
+        </site>
+    </distributionManagement>
+
     <scm>
         <connection>scm:git:[email protected]:eclipse-ee4j/jakarta-concurrency.git</connection>
         <developerConnection>scm:git:[email protected]:eclipse-ee4j/jakarta-concurrency.git</developerConnection>
         <url>https://github.com/eclipse-ee4j/jakarta-concurrency</url>
         <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <site>
-            <url>scm:git:[email protected]:eclipse-ee4j/jakarta-concurrency.git</url>
-        </site>
-    </distributionManagement>
-
     <properties>
         <site.output.dir>${project.build.directory}/staging</site.output.dir>
         <maven.site.skip>true</maven.site.skip>

diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml
@@ -20,15 +20,22 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
+    <artifactId>jakarta.concurrent-tck-dist</artifactId>
     <name>Jakarta Concurrency TCK Distribution</name>
     <description>Jakarta Concurrency TCK Distribution</description>
 
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.enterprise.concurrent</groupId>
+          <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
+        </relocation>
+    </distributionManagement>
+
     <licenses>
         <license>
             <name>Eclipse Public License 2.0</name>
@@ -54,19 +61,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent.parent</artifactId>
             <version>${jakarta.concurrent.version}</version>
             <type>pom</type>
         </dependency>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-api</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-tck</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
     </dependencies>
@@ -104,7 +111,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>jakarta.enterprise.concurrent-tck</includeArtifactIds>
+                            <includeArtifactIds>jakarta.concurrent-tck</includeArtifactIds>
                             <classifier>sources</classifier>
                             <prependGroupId>true</prependGroupId>
                             <outputDirectory>${project.build.directory}/copied-sources/</outputDirectory>
@@ -132,7 +139,7 @@
                     <arguments>
                         <argument>false</argument> <!-- debug? -->
                         <argument>
-                            ${jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-tck:jar}</argument>
+                            ${jakarta.concurrent:jakarta.concurrent-tck:jar}</argument>
                         <argument>
                             ${project.basedir}/src/main/asciidoc/generated</argument>
                     </arguments>

diff --git a/tck-dist/src/main/artifacts/artifact-install.sh b/tck-dist/src/main/artifacts/artifact-install.sh
@@ -5,15 +5,15 @@
 POM=$(ls *.pom)
 TCK=$(ls *.jar | grep -v sources)
 
-NO_EXT=${POM%.*}      # jakarta.enterprise.concurrent-parent-3.1.0-SNAPSHOT.pom > jakarta.enterprise.concurrent-parent-3.1.0-SNAPSHOT
-NO_REPO=${NO_EXT#*-}  # jakarta.enterprise.concurrent-parent-3.1.0-SNAPSHOT > parent-3.1.0-SNAPSHOT
+NO_EXT=${POM%.*}      # jakarta.concurrent-parent-3.1.0-SNAPSHOT.pom > jakarta.concurrent-parent-3.1.0-SNAPSHOT
+NO_REPO=${NO_EXT#*-}  # jakarta.concurrent-parent-3.1.0-SNAPSHOT > parent-3.1.0-SNAPSHOT
 VERSION=${NO_REPO#*-} # parent-3.1.0-SNAPSHOT > 3.1.0-SNAPSHOT
 
 echo "Installing $POM with version $VERSION"
 mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 -Dfile=$POM \
--DgroupId=jakarta.enterprise.concurrent \
--DartifactId=jakarta.enterprise.concurrent.parent \
+-DgroupId=jakarta.concurrent \
+-DartifactId=jakarta.concurrent.parent \
 -Dversion=$VERSION \
 -Dpackaging=pom
 

diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml
@@ -42,10 +42,10 @@
             <destName>README.md</destName>
         </file>
 
-        <!-- The jakarta.enterprise.concurrent-parent pom file -->
+        <!-- The jakarta.concurrent-parent pom file -->
         <file>
             <source>../pom.xml</source>
-            <destName>artifacts/jakarta.enterprise.concurrent-parent-${project.version}.pom</destName>
+            <destName>artifacts/jakarta.concurrent-parent-${project.version}.pom</destName>
         </file>
 
     </files>
@@ -99,7 +99,7 @@
     <dependencySets>
         <dependencySet>
             <includes>
-                <include>jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-tck</include>
+                <include>jakarta.concurrent:jakarta.concurrent-tck</include>
             </includes>
             <useTransitiveDependencies>true</useTransitiveDependencies>
             <outputDirectory>artifacts</outputDirectory>

diff --git a/tck-dist/src/main/starter/pom.xml b/tck-dist/src/main/starter/pom.xml
@@ -22,7 +22,7 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>jakarta.enterprise.concurrent</groupId>
+    <groupId>jakarta.concurrent</groupId>
     <artifactId>concurrency.tck.runner</artifactId>
     <version>1.0-SNAPSHOT</version>
     <name>Jakarta Concurrency TCK Runner</name>
@@ -81,14 +81,14 @@
     <dependencies>
         <!-- The TCK -->
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-tck</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
         <!-- The API -->
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-api</artifactId>
             <version>${jakarta.concurrent.version}</version>
         </dependency>
         <!-- Arquillian Implementation for JUnit5 -->

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -23,14 +23,21 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>jakarta.enterprise.concurrent</groupId>
-        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent.parent</artifactId>
         <version>3.2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+    <artifactId>jakarta.concurrent-tck</artifactId>
     <packaging>jar</packaging>
 
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.enterprise.concurrent</groupId>
+          <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+        </relocation>
+    </distributionManagement>
+
     <name>Jakarta Concurrency TCK</name>
     <description>Jakarta Concurrency TCK Tests</description>
     <licenses>
@@ -54,8 +61,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>jakarta.enterprise.concurrent</groupId>
-            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <groupId>jakarta.concurrent</groupId>
+            <artifactId>jakarta.concurrent-api</artifactId>
             <version>${jakarta.concurrent.api.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -225,8 +232,8 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>jakarta.enterprise.concurrent</groupId>
-                                            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+                                            <groupId>jakarta.concurrent</groupId>
+                                            <artifactId>jakarta.concurrent-api</artifactId>
                                             <version>${jakarta.concurrent.api.version}</version>
                                             <type>jar</type>
                                             <overWrite>false</overWrite>