Proposed changes to maven coordinates for consistency in EE 12

.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:

.github/workflows/ci.yml

@@ -35,7 +35,21 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build project
-      run: mvn -B package --file pom.xml
+      run: mvn -B install --file pom.xml
+
+  relocate:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - name: Set up JDK 21
+      uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+      with:
+        java-version: 21
+        distribution: 'temurin'
+        cache: maven
+    - name: Build relocation
+      run: mvn -B package --file relocation/pom.xml
+
   verify:
     runs-on: ubuntu-latest
     steps:
@@ -49,4 +63,4 @@ jobs:
     - name: Analyze starters
       # Note: the starter is always 1 version ahead of what is in maven central
       # therefore, when we analyze the starters we need to force a prior version
-      run: mvn dependency:analyze -Djakarta.concurrent.version=3.1.1 --file tck-dist/src/main/starter/pom.xml
+      run: mvn dependency:analyze -Djakarta.concurrent.groupid=jakarta.enterprise.concurrent -Djakarta.concurrent.version=3.1.1 --file tck-dist/src/main/starter/pom.xml

.github/workflows/specification.yml

@@ -24,10 +24,9 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Generate specification docs
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
       run: |
-        mvn package -Pstaging --file api/pom.xml -Dspec.version=${{ github.event.inputs.specVersion }}
-        mvn package -Pstaging --file specification/pom.xml -Dstatus=FINAL -Dspec.version=${{ github.event.inputs.specVersion }}
+        mvn package --file api/pom.xml -Dspec.version=${{ github.event.inputs.specVersion }}
+        mvn package --file specification/pom.xml -Dstatus=FINAL -Dspec.version=${{ github.event.inputs.specVersion }}
     - name: Assemble documentation
       run: |
         mkdir documentation/

.github/workflows/update.yml

@@ -27,10 +27,9 @@ jobs:
       id: checkout
       run: .github/scripts/checkout.sh update-generated-files-${{ github.sha }}
     - name: Generate signatures
-      #TODO remove -Pstaging once all Jakarta EE 11 dependencies are GA
       run: |
-        mvn install -Pstaging --file api/pom.xml
-        mvn package -Pstaging -Psignature-generation --file tck/pom.xml
+        mvn install --file api/pom.xml
+        mvn package -Psignature-generation --file tck/pom.xml
     ## Add any other automated update steps here
     - name: Needs updates
       id: update

api/pom.xml

@@ -21,18 +21,17 @@
     <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>
     <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>
 

pom.xml

@@ -23,8 +23,8 @@
         <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>
 

relocation/api/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 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.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+    <packaging>pom</packaging>
+
+    <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.
+    </description>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.concurrent</groupId>
+          <artifactId>jakarta.concurrent-api</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>

relocation/pom.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 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>org.eclipse.ee4j</groupId>
+        <artifactId>project</artifactId>
+        <version>1.0.9</version>
+        <relativePath />
+    </parent>
+
+    <groupId>jakarta.enterprise.concurrent</groupId>
+    <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+    <version>3.2.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency</name>
+    <description>Jakarta Concurrency Parent</description>
+
+    <licenses>
+        <license>
+            <name>EPL 2.0</name>
+            <url>http://www.eclipse.org/legal/epl-2.0</url>
+            <distribution>repo</distribution>
+        </license>
+        <license>
+            <name>GPL2 w/ CPE</name>
+            <url>https://www.gnu.org/software/classpath/license.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.concurrent</groupId>
+          <artifactId>jakarta.concurrent.parent</artifactId>
+        </relocation>
+    </distributionManagement>
+
+    <modules>
+        <module>api</module>
+        <module>specification</module>
+        <module>tck</module>
+        <module>tck-dist</module>
+    </modules>
+
+</project>

relocation/specification/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 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.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>concurrency-spec</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency Specification</name>
+
+    <distributionManagement>
+        <relocation>
+          <groupId>jakarta.concurrent</groupId>
+          <artifactId>jakarta.concurrent-spec</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>

relocation/tck-dist/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 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.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency TCK Distribution</name>
+    <description>Jakarta Concurrency TCK Distribution</description>
+
+    <distributionManagement>
+        <relocation>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent-tck-dist</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>

relocation/tck/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2024 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.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>jakarta.concurrent-tck</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Jakarta Concurrency TCK</name>
+    <description>Jakarta Concurrency TCK Tests</description>
+
+    <distributionManagement>
+        <relocation>
+        <groupId>jakarta.concurrent</groupId>
+        <artifactId>jakarta.concurrent-tck</artifactId>
+        </relocation>
+    </distributionManagement>
+</project>

specification/pom.xml

@@ -20,29 +20,28 @@
     <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>
+        <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>