From 00b6be9017ca8609a0083470086d1fbd3b47c919 Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@gmail.com>
Date: Fri, 24 Jun 2022 23:15:03 +0200
Subject: [PATCH 1/4] Tidying poms

* Fix mixed whitespace - now all spaces
* Formatting
* Elements in Maven preferred order
* Updated versions
* Updated specification configuration according to asciidoc 2.0+
* Added flatten plug-in for API

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
---
 api/pom.xml                       | 270 ++++++++++----------
 pom.xml                           | 153 ++++++------
 specification/pom.xml             |  73 +++---
 tck-dist/pom.xml                  | 186 +++++++-------
 tck-dist/src/main/starter/pom.xml | 338 ++++++++++++-------------
 tck/pom.xml                       | 400 +++++++++++++++---------------
 6 files changed, 725 insertions(+), 695 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index a95c2efc..d2fc2c66 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -18,33 +18,52 @@
 -->
 
 <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>
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
         <version>3.0.1-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jakarta.enterprise.concurrent-api</artifactId>
-    
-    <name>Jakarta Concurrency</name>
-    <description>Jakarta Concurrency API Module</description>
 
-    <properties>
+    <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>
 
-        <api_package>jakarta.enterprise.concurrent</api_package>
-        <non.final>false</non.final> <!-- switch back to true once release is completed -->
-        <last.spec_version>2.0</last.spec_version>
-        <next.spec_version>3.0</next.spec_version>
-        <spec.version>${next.spec_version}</spec.version>
-        <new.spec.version>3.1</new.spec.version>
-        <build_number />
-        <packages.export>jakarta.enterprise.concurrent.*; version=${spec.bundle.version}</packages.export>
-    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
+             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        
             <!-- First sets properties for the maven-bundle-plugin and later checks if they are indeed used. -->
             <plugin>
                 <groupId>org.glassfish.build</groupId>
@@ -52,13 +71,9 @@
                 <version>2.1</version>
                 <configuration>
                     <spec>
-                        <specVersion>${spec.version}</specVersion>
-                        <specImplVersion>3.0.1</specImplVersion>
-                        <apiPackage>${api_package}</apiPackage>
-                        
-                        <nonFinal>${non.final}</nonFinal>
-                        <newSpecVersion>${new.spec.version}</newSpecVersion>
-                        <specBuild>${build_number}</specBuild>
+                        <specVersion>3.0</specVersion>
+                        <specImplVersion>${project.version}</specImplVersion>
+                        <apiPackage>jakarta.enterprise.concurrent</apiPackage>
                     </spec>
                 </configuration>
                 <executions>
@@ -70,26 +85,28 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-              This plugin is reponsible for packaging artifacts
-              as OSGi bundles.  Please refer to
-              http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
-              for more information about how to use this plugin.
-            -->
+            
+            <!-- Creates the OSGi MANIFEST.MF file -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>5.1.6</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <supportedProjectTypes>
+                        <supportedProjectType>jar</supportedProjectType>
+                    </supportedProjectTypes>
                     <instructions>
                         <Bundle-Version>${spec.bundle.version}</Bundle-Version>
                         <Bundle-SymbolicName>${spec.bundle.symbolic-name}</Bundle-SymbolicName>
                         <Extension-Name>${spec.extension.name}</Extension-Name>
                         <Implementation-Version>${spec.implementation.version}</Implementation-Version>
                         <Specification-Version>${spec.specification.version}</Specification-Version>
+                        <Bundle-Description>
+                            Jakarta Concurrency ${spec.specification.version} Specification
+                        </Bundle-Description>
                         <specversion>${spec.specification.version}</specversion>
-                        <Export-Package>${packages.export}</Export-Package>
+                        <Export-Package>jakarta.enterprise.concurrent.*; version=${spec.bundle.version}</Export-Package>
                     </instructions>
                 </configuration>
                 <executions>
@@ -102,73 +119,81 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
+           
+            <!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.2</version>
                 <configuration>
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                    </archive>
+                    <excludes>
+                        <exclude>**/*.java</exclude>
+                    </excludes>
                 </configuration>
             </plugin>
+            
+                        <!-- 
+               Create Javadoc for API jar
+            -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>buildnumber-maven-plugin</artifactId>
-                <configuration>
-                    <format>{0,date,MM/dd/yyyy hh:mm aa}</format>
-                    <items>
-                        <item>timestamp</item>
-                    </items>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.4.0</version>
                 <executions>
                     <execution>
-                        <phase>validate</phase>
+                        <id>attach-api-javadocs</id>
                         <goals>
-                            <goal>create</goal>
+                            <goal>jar</goal>
                         </goals>
+                        <configuration>
+                            <source>11</source>
+                            <quiet>true</quiet>                          
+                            <additionalJOption>-Xdoclint:none</additionalJOption>
+                            <description>Jakarta Concurrency API documentation</description>
+                            <doctitle>Jakarta Concurrency API documentation</doctitle>
+                            <windowtitle>Jakarta Concurrency API documentation</windowtitle>
+                            <header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
+                            <bottom><![CDATA[
+Comments to: <a href="mailto:jaspic-dev@eclipse.org">cu-dev@eclipse.org</a>.<br>
+Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
+Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
+                            </bottom>
+                            <docfilessubdirs>true</docfilessubdirs>
+                            <groups>
+                                <group>
+                                    <title>Jakarta Authentication API Documentation</title>
+                                    <packages>
+                                        jakarta.enterprise.concurrent
+                                    </packages>
+                                </group>
+                            </groups>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+          
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addDefaultEntries>false</addDefaultEntries>
-                        </manifest>
-                    </archive>
-                    <source>11</source>
-                    <doclint>none</doclint>
-                    <notimestamp>true</notimestamp>
-                    <docfilessubdirs>true</docfilessubdirs>
-                    <quiet>true</quiet>
-                    <header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
-                    <bottom>
-<![CDATA[Copyright (c) 2020, 2022 Eclipse Foundation.
-    Use is subject to
-    <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.
-]]>
-                    </bottom>
-                    <groups>
-                        <group>
-                            <title>Jakarta(tm) Concurrency API Documentation</title>
-                            <packages>jakarta.enterprise.concurrent</packages>
-                        </group>
-                    </groups>
-                </configuration>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <id>add-resource</id>
@@ -191,22 +216,11 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -216,6 +230,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
@@ -234,51 +249,38 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M6</version>
+                <version>3.0.0-M7</version>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.2.7</version>
+                <configuration>
+                    <flattenMode>ossrh</flattenMode>
+                </configuration>
+                <executions>
+                    <!-- enable flattening -->
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <!-- ensure proper cleanup -->
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.interceptor</groupId>
-            <artifactId>jakarta.interceptor-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 5082732a..d8b076d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
     <name>Jakarta Concurrency</name>
     <description>Jakarta Concurrency Parent</description>
     <url>https://github.com/jakartaee/concurrency</url>
-
     <licenses>
         <license>
             <name>EPL 2.0</name>
@@ -47,12 +46,6 @@
         </license>
     </licenses>
 
-    <scm>
-        <connection>scm:git:https://github.com/jakartaee/concurrency.git</connection>
-        <developerConnection>scm:git:git@github.com:jakartaee/concurrency.git</developerConnection>
-        <url>https://github.com/jakartaee/concurrency</url>
-    </scm>
-    
     <developers>
         <developer>
             <id>anthony.lai</id>
@@ -60,87 +53,99 @@
             <organization>Oracle</organization>
         </developer>
     </developers>
-    
-    <!-- For artifacts not yet in Maven Central -->
-    <repositories> 
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Sonatype Nexus Staging</name>
-			<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+
+    <modules>
+        <module>api</module>
+        <module>tck</module>
+    </modules>
+
+    <scm>
+        <connection>scm:git:https://github.com/jakartaee/concurrency.git</connection>
+        <developerConnection>scm:git:git@github.com:jakartaee/concurrency.git</developerConnection>
+        <url>https://github.com/jakartaee/concurrency</url>
+    </scm>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.source>11</maven.compiler.source>
-        
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.release>11</maven.compiler.release>
+
         <!-- Used in TCK only -->
         <testng.version>6.14.3</testng.version>
         <arquillian.version>1.6.0.Final</arquillian.version>
-                
-        <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
 
+        <jakarta.servlet.version>6.0.0</jakarta.servlet.version>
         <jakarta.ejb.version>4.0.1</jakarta.ejb.version>
-        
         <jakarta.jsp.version>3.1.0</jakarta.jsp.version>
-        
         <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
-        
         <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
-        
         <jakarta.cdi.version>4.0.1</jakarta.cdi.version>
     </properties>
 
-    <modules>
-        <module>api</module>
-        <module>tck</module>
-    </modules>
-
     <dependencyManagement>
-    <dependencies>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <version>${jakarta.servlet.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.servlet.jsp</groupId>
-            <artifactId>jakarta.servlet.jsp-api</artifactId>
-            <version>${jakarta.jsp.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.ejb</groupId>
-            <artifactId>jakarta.ejb-api</artifactId>
-            <version>${jakarta.ejb.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${jakarta.annotation.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.interceptor</groupId>
-            <artifactId>jakarta.interceptor-api</artifactId>
-            <version>${jakarta.interceptor.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.enterprise</groupId>
-            <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <version>${jakarta.cdi.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+        <dependencies>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.servlet.jsp</groupId>
+                <artifactId>jakarta.servlet.jsp-api</artifactId>
+                <version>${jakarta.jsp.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.ejb</groupId>
+                <artifactId>jakarta.ejb-api</artifactId>
+                <version>${jakarta.ejb.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta.annotation.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.interceptor</groupId>
+                <artifactId>jakarta.interceptor-api</artifactId>
+                <version>${jakarta.interceptor.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.enterprise</groupId>
+                <artifactId>jakarta.enterprise.cdi-api</artifactId>
+                <version>${jakarta.cdi.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
     </dependencyManagement>
+
+    <build>
+        <plugins>
+            <!-- Sets minimal Maven version to 3.6.0 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.6.0</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/specification/pom.xml b/specification/pom.xml
index 5f04faa3..67a5efce 100644
--- a/specification/pom.xml
+++ b/specification/pom.xml
@@ -16,30 +16,22 @@
     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/maven-v4_0_0.xsd">
+<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.6</version>
-        <relativePath/>
+        <relativePath />
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+
     <groupId>jakarta.enterprise.concurrent</groupId>
     <artifactId>concurrency-spec</artifactId>
-    <packaging>pom</packaging>
     <version>3.0-SNAPSHOT</version>
-    <name>Jakarta Concurrency Specification</name>
+    <packaging>pom</packaging>
 
-    <properties>
-        <site.output.dir>${project.build.directory}/staging</site.output.dir>
-        <maven.site.skip>true</maven.site.skip>
-        <asciidoctor.maven.plugin.version>1.5.7.1</asciidoctor.maven.plugin.version>
-        <asciidoctorj.version>1.6.2</asciidoctorj.version>
-        <asciidoctorj.pdf.version>1.5.0-alpha.16</asciidoctorj.pdf.version>
-        <jruby.version>9.2.6.0</jruby.version>
-        <!-- status: DRAFT, BETA, etc., or blank for final -->
-        <status>DRAFT</status>
-    </properties>
+    <name>Jakarta Concurrency Specification</name>
 
     <scm>
         <connection>scm:git:git@github.com:eclipse-ee4j/jakarta-concurrency.git</connection>
@@ -47,37 +39,54 @@
         <url>https://github.com/eclipse-ee4j/jakarta-concurrency</url>
         <tag>HEAD</tag>
     </scm>
-
     <distributionManagement>
         <site>
             <url>scm:git:git@github.com: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>
+        <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
+        <asciidoctorj.version>2.5.4</asciidoctorj.version>
+        <asciidoctorj.pdf.version>2.1.2</asciidoctorj.pdf.version>
+        <jruby.version>9.3.4.0</jruby.version>
+        <!-- status: DRAFT, BETA, etc., or blank for final -->
+        <status>DRAFT</status>
+        <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
+        <revisiondate>${maven.build.timestamp}</revisiondate>
+        
+        <!-- default is the same for backward compatibility reason
+            Easy to override when building with a system property -->
+        <spec.version>${project.version}</spec.version>
+    </properties>
+
     <build>
         <defaultGoal>package</defaultGoal>
         <plugins>
+            <!-- Sets minimal Maven version to 3.6.0 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>
-                <version>1.4.1</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
-                        <id>enforce-versions</id>
+                        <id>enforce-maven</id>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
                         <configuration>
                             <rules>
-                                <requireJavaVersion>
-                                    <version>[1.8.0,12.0)</version>
-                                    <message>You need JDK11 or lower</message>
-                                </requireJavaVersion>
+                                <requireMavenVersion>
+                                    <version>3.6.0</version>
+                                </requireMavenVersion>
                             </rules>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.asciidoctor</groupId>
                 <artifactId>asciidoctor-maven-plugin</artifactId>
@@ -107,8 +116,12 @@
                             <goal>process-asciidoc</goal>
                         </goals>
                         <configuration>
-                            <backend>xhtml</backend>
+                            <backend>html5</backend>
+                            <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
+                            <outputFile>${project.build.directory}/generated-docs/jakarta-concurrency-spec-${spec.version}.html</outputFile>
                             <attributes>
+                                <source-highlighter>coderay</source-highlighter>
+                                <imagesdir>images</imagesdir>
                                 <doctype>book</doctype>
                                 <status>${status}</status>
                                 <data-uri />
@@ -130,7 +143,11 @@
                         </goals>
                         <configuration>
                             <backend>pdf</backend>
+                            <sourceDirectory>${basedir}/src/main/asciidoc</sourceDirectory>
+                            <outputFile>${project.build.directory}/generated-docs/jakarta-concurrency-spec-${spec.version}.pdf</outputFile>
                             <attributes>
+                                <source-highlighter>coderay</source-highlighter>
+                                <imagesdir>images</imagesdir>
                                 <pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir>
                                 <pdf-style>jakartaee</pdf-style>
                                 <doctype>book</doctype>
@@ -149,16 +166,16 @@
                         </configuration>
                     </execution>
                 </executions>
-		<configuration>
+                <configuration>
                     <sourceDocumentName>jakarta-concurrency-spec.adoc</sourceDocumentName>
-                    <sourceHighlighter>coderay</sourceHighlighter>
                     <attributes>
-                        <revnumber>${project.version}</revnumber>
+                        <revnumber>${spec.version}</revnumber>
                         <revremark>${status}</revremark>
                         <revdate>${revisiondate}</revdate>
                     </attributes>
                 </configuration>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
@@ -172,7 +189,7 @@
                     <dependency>
                         <groupId>org.apache.maven.scm</groupId>
                         <artifactId>maven-scm-provider-gitexe</artifactId>
-                        <version>1.9.4</version>
+                        <version>2.0.0-M1</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -183,7 +200,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.0</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml
index 691266be..7dc05d41 100644
--- a/tck-dist/pom.xml
+++ b/tck-dist/pom.xml
@@ -18,12 +18,11 @@
 -->
 <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.0.0-SNAPSHOT</version>
-    
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
@@ -46,111 +45,110 @@
     </licenses>
 
     <properties>
-        
         <jakarta.concurrent.version.ga>3.0.0</jakarta.concurrent.version.ga>
         <jakarta.concurrent.version.dev>${project.version}</jakarta.concurrent.version.dev>
-        
+
         <maven.site.skip>true</maven.site.skip>
         <asciidoctor.maven.plugin.version>2.2.2</asciidoctor.maven.plugin.version>
         <asciidoctorj.version>2.5.3</asciidoctorj.version>
         <asciidoctorj.pdf.version>1.6.2</asciidoctorj.pdf.version>
         <jruby.version>9.2.20.1</jruby.version>
-
     </properties>
-    
+
     <dependencies>
         <dependency>
-          <groupId>jakarta.enterprise.concurrent</groupId>
-          <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
-          <version>${jakarta.concurrent.version.ga}</version>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+            <version>${jakarta.concurrent.version.ga}</version>
         </dependency>
         <dependency>
-          <groupId>jakarta.enterprise.concurrent</groupId>
-          <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
-          <version>${jakarta.concurrent.version.ga}</version>
-          <type>pom</type>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+            <version>${jakarta.concurrent.version.ga}</version>
+            <type>pom</type>
         </dependency>
     </dependencies>
-    
+
     <build>
-      <plugins>
-        <!-- Aciidoctor will create the html and pdf distributions of the user-guide -->
-        <plugin>
-          <groupId>org.asciidoctor</groupId>
-          <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>${asciidoctor.maven.plugin.version}</version>
-          <dependencies>
-            <dependency>
-                <groupId>org.jruby</groupId>
-                <artifactId>jruby-complete</artifactId>
-                <version>${jruby.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctorj</artifactId>
-                <version>${asciidoctorj.version}</version>
-            </dependency>
-            <dependency>
+        <plugins>
+            <!-- Aciidoctor will create the html and pdf distributions of the user-guide -->
+            <plugin>
                 <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctorj-pdf</artifactId>
-                <version>${asciidoctorj.pdf.version}</version>
-            </dependency>
-          </dependencies>
-          <executions>
-            <execution>
-                <id>asciidoc-to-html</id>
-                <phase>generate-resources</phase>
-                <goals>
-                    <goal>process-asciidoc</goal>
-                </goals>
-                <configuration>
-                    <backend>html5</backend>
-                    <outputFile>
-                        ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.version.ga}.html
-                    </outputFile>
-                </configuration>
-            </execution>
-            <execution>
-                <id>asciidoc-to-pdf</id>
-                <phase>generate-resources</phase>
-                <goals>
-                    <goal>process-asciidoc</goal>
-                </goals>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+                <version>${asciidoctor.maven.plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.jruby</groupId>
+                        <artifactId>jruby-complete</artifactId>
+                        <version>${jruby.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj</artifactId>
+                        <version>${asciidoctorj.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.asciidoctor</groupId>
+                        <artifactId>asciidoctorj-pdf</artifactId>
+                        <version>${asciidoctorj.pdf.version}</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>asciidoc-to-html</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                        <configuration>
+                            <backend>html5</backend>
+                            <outputFile>
+                                ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.version.ga}.html
+                            </outputFile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>asciidoc-to-pdf</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                        <configuration>
+                            <backend>pdf</backend>
+                            <outputFile>
+                                ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.version.ga}.pdf
+                            </outputFile>
+                        </configuration>
+                    </execution>
+                </executions>
                 <configuration>
-                    <backend>pdf</backend>
-                    <outputFile>
-                        ${project.build.directory}/generated-docs/concurrency-tck-reference-guide-${jakarta.concurrent.version.ga}.pdf
-                    </outputFile>
+                    <toc>left</toc>
+                    <sourceDocumentName>concurrency-tck-reference-guide.adoc</sourceDocumentName>
+                    <sourceHighlighter>coderay</sourceHighlighter>
+                    <skip>${maven.adoc.skip}</skip>
                 </configuration>
-            </execution>
-          </executions>
-          <configuration>
-              <toc>left</toc>
-              <sourceDocumentName>concurrency-tck-reference-guide.adoc</sourceDocumentName>
-              <sourceHighlighter>coderay</sourceHighlighter>
-              <skip>${maven.adoc.skip}</skip>
-          </configuration>
-        </plugin>
-        <!-- Assembly plugin to collect everything into a single distribution -->
-        <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>distribution</id>
-              <phase>package</phase>
-              <goals>
-                <goal>single</goal>
-              </goals>
-              <configuration>
-                <descriptors>
-                  <descriptor>src/main/assembly/assembly.xml</descriptor>
-                </descriptors>
-                <finalName>concurrency-tck-${jakarta.concurrent.version.ga}</finalName>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <!--
+            </plugin>
+            
+            <!-- Assembly plugin to collect everything into a single distribution -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/assembly/assembly.xml</descriptor>
+                            </descriptors>
+                            <finalName>concurrency-tck-${jakarta.concurrent.version.ga}</finalName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -170,6 +168,6 @@
           </executions>
         </plugin>
         -->
-      </plugins>
-	</build>
+        </plugins>
+    </build>
 </project>
diff --git a/tck-dist/src/main/starter/pom.xml b/tck-dist/src/main/starter/pom.xml
index 5f29d145..512cc4df 100644
--- a/tck-dist/src/main/starter/pom.xml
+++ b/tck-dist/src/main/starter/pom.xml
@@ -17,184 +17,184 @@
  */
 -->
 <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">
+    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>
+    <modelVersion>4.0.0</modelVersion>
 
-	<groupId>[YOUR_GROUP_ID]</groupId>
-	<artifactId>concurrency.tck.runner</artifactId>
-	<version>1.0-SNAPSHOT</version>
-	<name>Jakarta Concurrency TCK Runner for [YOUR_IMPL]</name>
+    <groupId>[YOUR_GROUP_ID]</groupId>
+    <artifactId>concurrency.tck.runner</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>Jakarta Concurrency TCK Runner for [YOUR_IMPL]</name>
 
-	<properties>
-		<!-- General properties -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+    <properties>
+        <!-- General properties -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
 
-		<!-- Dependency and Plugin Versions -->
-		<jakarta.concurrent.version>3.0.0</jakarta.concurrent.version>
-		<arquillian.version>1.7.0.Alpha10</arquillian.version>
-		<testng.version>6.14.3</testng.version>
-		<sigtest.version>1.6</sigtest.version>
-		<derby.version>10.15.2.0</derby.version>
-		<maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
-		<maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>
-		<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
+        <!-- Dependency and Plugin Versions -->
+        <jakarta.concurrent.version>3.0.0</jakarta.concurrent.version>
+        <arquillian.version>1.7.0.Alpha10</arquillian.version>
+        <testng.version>6.14.3</testng.version>
+        <sigtest.version>1.6</sigtest.version>
+        <derby.version>10.15.2.0</derby.version>
+        <maven.dep.plugin.version>3.3.0</maven.dep.plugin.version>
+        <maven.comp.plugin.version>3.10.1</maven.comp.plugin.version>
+        <maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
 
-		<!-- Location to put test application dependencies -->
-		<application.server.lib>[path/to/appserver/lib]</application.server.lib>
+        <!-- Location to put test application dependencies -->
+        <application.server.lib>[path/to/appserver/lib]</application.server.lib>
 
-		<!-- Pointer to suite.xml file that has the TestNG configuration -->
-		<suiteXmlFile>suite.xml</suiteXmlFile>
-		
-		<!-- Pointer to logging.properties file that has the java.util.logging configuration -->
-		<logging.config>logging.properties</logging.config>
+        <!-- Pointer to suite.xml file that has the TestNG configuration -->
+        <suiteXmlFile>suite.xml</suiteXmlFile>
+        
+        <!-- Pointer to logging.properties file that has the java.util.logging configuration -->
+        <logging.config>logging.properties</logging.config>
 
-		<!-- Output directory -->
-		<targetDirectory>${project.basedir}/target</targetDirectory>
-	</properties>
+        <!-- Output directory -->
+        <targetDirectory>${project.basedir}/target</targetDirectory>
+    </properties>
 
-	<repositories>
-		<!-- TODO add private repo if your implementation is not public -->
-		<!-- TODO add staging repo if you want to use SNAPSHOT versions of the 
-			API and TCK -->
-	</repositories>
+    <repositories>
+        <!-- TODO add private repo if your implementation is not public -->
+        <!-- TODO add staging repo if you want to use SNAPSHOT versions of the 
+            API and TCK -->
+    </repositories>
 
-	<!-- tag::testClientDep[] -->
-	<!-- The Arquillian test framework -->
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.jboss.arquillian</groupId>
-				<artifactId>arquillian-bom</artifactId>
-				<version>${arquillian.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <!-- tag::testClientDep[] -->
+    <!-- The Arquillian test framework -->
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.arquillian</groupId>
+                <artifactId>arquillian-bom</artifactId>
+                <version>${arquillian.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-	<!-- Client Dependencies -->
-	<dependencies>
-		<!-- The TCK -->
-		<dependency>
-			<groupId>jakarta.enterprise.concurrent</groupId>
-			<artifactId>jakarta.enterprise.concurrent-tck</artifactId>
-			<version>${jakarta.concurrent.version}</version>
-		</dependency>
-		<!-- The API -->
-		<dependency>
-			<groupId>jakarta.enterprise.concurrent</groupId>
-			<artifactId>jakarta.enterprise.concurrent-api</artifactId>
-			<version>${jakarta.concurrent.version}</version>
-		</dependency>
-		<!-- Arquillian Implementation for TestNG -->
-		<dependency>
-			<groupId>org.jboss.arquillian.testng</groupId>
-			<artifactId>arquillian-testng-container</artifactId>
-			<version>${arquillian.version}</version>
-		</dependency>
-		<!-- TODO add Arquillian SPI impl for your Jakarta EE Platform -->
-		<!-- Arquillian transitive dependency on Servlet -->
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-			<version>${jakarta.servlet.version}</version>
-		</dependency>
-		<!-- TestNG -->
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>${testng.version}</version>
-		</dependency>
-		<!-- Signature Test Plugin -->
-		<dependency>
-			<groupId>org.netbeans.tools</groupId>
-			<artifactId>sigtest-maven-plugin</artifactId>
-			<version>${sigtest.version}</version>
-		</dependency>
-	</dependencies>
-	<!-- end::testClientDep[] -->
+    <!-- Client Dependencies -->
+    <dependencies>
+        <!-- The TCK -->
+        <dependency>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+            <version>${jakarta.concurrent.version}</version>
+        </dependency>
+        <!-- The API -->
+        <dependency>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <version>${jakarta.concurrent.version}</version>
+        </dependency>
+        <!-- Arquillian Implementation for TestNG -->
+        <dependency>
+            <groupId>org.jboss.arquillian.testng</groupId>
+            <artifactId>arquillian-testng-container</artifactId>
+            <version>${arquillian.version}</version>
+        </dependency>
+        <!-- TODO add Arquillian SPI impl for your Jakarta EE Platform -->
+        <!-- Arquillian transitive dependency on Servlet -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet.version}</version>
+        </dependency>
+        <!-- TestNG -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>${testng.version}</version>
+        </dependency>
+        <!-- Signature Test Plugin -->
+        <dependency>
+            <groupId>org.netbeans.tools</groupId>
+            <artifactId>sigtest-maven-plugin</artifactId>
+            <version>${sigtest.version}</version>
+        </dependency>
+    </dependencies>
+    <!-- end::testClientDep[] -->
 
-	<build>
-		<directory>${targetDirectory}</directory>
-		<defaultGoal>clean test</defaultGoal>
-		<plugins>
-			<!-- tag::testServerDep[] -->
-			<!-- Test Server Dependencies -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>${maven.dep.plugin.version}</version>
-				<configuration>
-					<artifactItems>
-						<artifactItem>
-							<groupId>org.testng</groupId>
-							<artifactId>testng</artifactId>
-							<version>${testng.version}</version>
-						</artifactItem>
-						<artifactItem>
-							<groupId>org.apache.derby</groupId>
-							<artifactId>derby</artifactId>
-							<version>${derby.version}</version>
-						</artifactItem>
-						<artifactItem>
-							<groupId>org.netbeans.tools</groupId>
-							<artifactId>sigtest-maven-plugin</artifactId>
-							<version>${sigtest.version}</version>
-						</artifactItem>
-					</artifactItems>
-					<outputDirectory>${application.server.lib}</outputDirectory>
-				</configuration>
-			</plugin>
-			<!-- end::testServerDep[] -->
-			<!-- Compile plugin for any supplemental class files -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${maven.comp.plugin.version}</version>
-				<configuration>
-					<source>${maven.compiler.source}</source>
-					<target>${maven.compiler.target}</target>
-				</configuration>
-			</plugin>
-			<!-- tag::configTestNG[] -->
-			<!-- Surefire plugin - Entrypoint for TestNG -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${maven.surefire.plugin.version}</version>
-				<configuration>
-					<!-- tag::logging[] -->
-					<systemProperties>
-						<property>
-							<name>java.util.logging.config.file</name>
-							<value>${logging.config}</value>
-						</property>
-					</systemProperties>
-					<!-- end::logging[] -->
-					<!-- tag::ignore[] -->
-					<systemPropertyVariables>
-						<!-- Properties shared with Arquillian -->
-						<tck_server>[TODO]</tck_server>
-						<tck_hostname>[TODO]</tck_hostname>
-						<tck_username>[TODO]</tck_username>
-						<tck_password>[TODO]</tck_password>
-						<tck_port>[TODO]</tck_port>
-						<tck_port>[TODO]</tck_port>
-					</systemPropertyVariables>
-					<!-- end::ignore[] -->
-					<suiteXmlFiles>
-						<suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
-					</suiteXmlFiles>
-					<!-- Ensure surfire plugin looks under src/main/java instead of src/test/java -->
-					<testSourceDirectory>${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator}</testSourceDirectory>
-				</configuration>
-			</plugin>
-			<!-- end::configTestNG[] -->
-			<!-- TODO: you can include a plugin to start your application server here -->
-		</plugins>
-	</build>
+    <build>
+        <directory>${targetDirectory}</directory>
+        <defaultGoal>clean test</defaultGoal>
+        <plugins>
+            <!-- tag::testServerDep[] -->
+            <!-- Test Server Dependencies -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>${maven.dep.plugin.version}</version>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.testng</groupId>
+                            <artifactId>testng</artifactId>
+                            <version>${testng.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.apache.derby</groupId>
+                            <artifactId>derby</artifactId>
+                            <version>${derby.version}</version>
+                        </artifactItem>
+                        <artifactItem>
+                            <groupId>org.netbeans.tools</groupId>
+                            <artifactId>sigtest-maven-plugin</artifactId>
+                            <version>${sigtest.version}</version>
+                        </artifactItem>
+                    </artifactItems>
+                    <outputDirectory>${application.server.lib}</outputDirectory>
+                </configuration>
+            </plugin>
+            <!-- end::testServerDep[] -->
+            <!-- Compile plugin for any supplemental class files -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven.comp.plugin.version}</version>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <!-- tag::configTestNG[] -->
+            <!-- Surefire plugin - Entrypoint for TestNG -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.plugin.version}</version>
+                <configuration>
+                    <!-- tag::logging[] -->
+                    <systemProperties>
+                        <property>
+                            <name>java.util.logging.config.file</name>
+                            <value>${logging.config}</value>
+                        </property>
+                    </systemProperties>
+                    <!-- end::logging[] -->
+                    <!-- tag::ignore[] -->
+                    <systemPropertyVariables>
+                        <!-- Properties shared with Arquillian -->
+                        <tck_server>[TODO]</tck_server>
+                        <tck_hostname>[TODO]</tck_hostname>
+                        <tck_username>[TODO]</tck_username>
+                        <tck_password>[TODO]</tck_password>
+                        <tck_port>[TODO]</tck_port>
+                        <tck_port>[TODO]</tck_port>
+                    </systemPropertyVariables>
+                    <!-- end::ignore[] -->
+                    <suiteXmlFiles>
+                        <suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
+                    </suiteXmlFiles>
+                    <!-- Ensure surfire plugin looks under src/main/java instead of src/test/java -->
+                    <testSourceDirectory>${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator}</testSourceDirectory>
+                </configuration>
+            </plugin>
+            <!-- end::configTestNG[] -->
+            <!-- TODO: you can include a plugin to start your application server here -->
+        </plugins>
+    </build>
 </project>
\ No newline at end of file
diff --git a/tck/pom.xml b/tck/pom.xml
index 91f5be53..86a33e58 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -16,80 +16,78 @@
  * 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.0.1-SNAPSHOT</version>
-	</parent>
+<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>
 
-	<artifactId>jakarta.enterprise.concurrent-tck</artifactId>
-	<packaging>jar</packaging>
+    <parent>
+        <groupId>jakarta.enterprise.concurrent</groupId>
+        <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
+        <version>3.0.1-SNAPSHOT</version>
+    </parent>
 
-	<name>Jakarta Concurrency TCK</name>
-	<description>Jakarta Concurrency TCK Tests</description>
+    <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
+    <packaging>jar</packaging>
 
-	<licenses>
-		<license>
-			<name>Eclipse Public License 2.0</name>
-			<url>https://projects.eclipse.org/license/epl-2.0</url>
-			<distribution>repo</distribution>
-		</license>
-		<license>
-			<name>GNU General Public License, version 2 with the GNU Classpath Exception</name>
-			<url>https://projects.eclipse.org/license/secondary-gpl-2.0-cp</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
+    <name>Jakarta Concurrency TCK</name>
+    <description>Jakarta Concurrency TCK Tests</description>
+    <licenses>
+        <license>
+            <name>Eclipse Public License 2.0</name>
+            <url>https://projects.eclipse.org/license/epl-2.0</url>
+            <distribution>repo</distribution>
+        </license>
+        <license>
+            <name>GNU General Public License, version 2 with the GNU Classpath Exception</name>
+            <url>https://projects.eclipse.org/license/secondary-gpl-2.0-cp</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-	<properties>
+    <properties>
+        <jakarta.concurrent.version.ga>3.0.0</jakarta.concurrent.version.ga>
+        <jakarta.concurrent.version.dev>${project.version}</jakarta.concurrent.version.dev>
+        <sigtest.version>1.6</sigtest.version>
+    </properties>
 
-		<jakarta.concurrent.version.ga>3.0.0</jakarta.concurrent.version.ga>
-		<jakarta.concurrent.version.dev>${project.version}</jakarta.concurrent.version.dev>
-		<sigtest.version>1.6</sigtest.version>
-
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>jakarta.enterprise.concurrent</groupId>
-			<artifactId>jakarta.enterprise.concurrent-api</artifactId>
-			<version>${jakarta.concurrent.version.dev}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.netbeans.tools</groupId>
-			<artifactId>sigtest-maven-plugin</artifactId>
-			<version>${sigtest.version}</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet.jsp</groupId>
-			<artifactId>jakarta.servlet.jsp-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.ejb</groupId>
-			<artifactId>jakarta.ejb-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.annotation</groupId>
-			<artifactId>jakarta.annotation-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.interceptor</groupId>
-			<artifactId>jakarta.interceptor-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>jakarta.enterprise</groupId>
-			<artifactId>jakarta.enterprise.cdi-api</artifactId>
-		</dependency>
-		<dependency>
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <version>${jakarta.concurrent.version.dev}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.netbeans.tools</groupId>
+            <artifactId>sigtest-maven-plugin</artifactId>
+            <version>${sigtest.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <version>${testng.version}</version>
@@ -99,132 +97,142 @@
             <artifactId>arquillian-testng-container</artifactId>
             <version>${arquillian.version}</version>
         </dependency>
-	</dependencies>
-	<build>
-		<resources>
-			<!-- The default resource location -->
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>**/*.*</include>
-				</includes>
-			</resource>
-			<!-- Additional resources kept inside packages for ease of development -->
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-					<include>**/*.jsp</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-	      <plugin>
-	        <groupId>org.apache.maven.plugins</groupId>
-	        <artifactId>maven-source-plugin</artifactId>
-	        <version>3.2.0</version>
-	        <executions>
-	          <execution>
-	            <id>attach-sources</id>
-	            <phase>verify</phase>
-	            <goals>
-	              <goal>jar-no-fork</goal>
-	            </goals>
-	          </execution>
-	        </executions>
-	      </plugin>
-	    </plugins>
-	</build>
+    </dependencies>
+
+    <build>
+        <resources>
+            <!-- The default resource location -->
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.*</include>
+                </includes>
+            </resource>
+            <!-- Additional resources kept inside packages for ease of development -->
+            <resource>
+                <directory>src/main/java</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                    <include>**/*.jsp</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-	<profiles>
-		<profile>
-			<!--This profile can be used to (re)generate signatures of Concurrency 
-				API, note that they differ based on JDK used to build them -->
-			<!--All .sig files should be included in the generated jar files! -->
-			<id>signature-generation</id>
-			<activation>
-				<property>
-					<name>signature</name>
-				</property>
-			</activation>
-			<properties>
-				<!--Default assumed JDK version, can be overriden via -Dmajor.jdk.version=X -->
-				<jdk.major.version>11</jdk.major.version>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>unpack</id>
-								<phase>generate-sources</phase>
-								<goals>
-									<goal>unpack</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>jakarta.enterprise.concurrent</groupId>
-											<artifactId>jakarta.enterprise.concurrent-api</artifactId>
-											<version>${jakarta.concurrent.version.ga}</version>
-											<type>jar</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>${project.build.directory}/concurrency-api</outputDirectory>
-											<includes>**/*.class,**/*.xml</includes>
-										</artifactItem>
-									</artifactItems>
-									<includes>**/*.java</includes>
-									<excludes>**/*.properties</excludes>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.netbeans.tools</groupId>
-						<artifactId>sigtest-maven-plugin</artifactId>
-						<version>${sigtest.version}</version>
-						<executions>
-							<execution>
-								<id>createSigFile</id>
-								<goals>
-									<goal>generate</goal>
-								</goals>
-							</execution>
-						</executions>
-						<configuration>
-							<classes>${project.build.directory}/concurrency-api</classes>
-							<packages>
-								jakarta.enterprise.concurrent,
-								jakarta.enterprise.concurrent.spi,
-							</packages>
-							<attach>false</attach>
-							<sigfile>${project.build.directory}/jakarta.enterprise.concurrent.sig_${project.version}</sigfile>
-							<!-- Ensure that the signature file we generated will work for both JDK11 and JDK17 -->
-							<ignoreJDKClasses>
-								<include>java.util.Map</include>
-								<include>java.lang.Object</include>
-								<include>java.io.ByteArrayInputStream</include>
-								<include>java.io.InputStream</include>
-								<include>java.lang.Deprecated</include>
-								<include>java.io.Writer</include>
-								<include>java.io.OutputStream</include>
-								<include>java.util.List</include>
-								<include>java.util.Collection</include>
-								<include>java.lang.instrument.IllegalClassFormatException</include>
-								<include>javax.transaction.xa.XAException</include>
-								<include>java.lang.annotation.Repeatable</include>
-								<include>java.lang.InterruptedException</include>
-								<include>java.lang.CloneNotSupportedException</include>
-								<include>java.lang.Throwable</include>
-								<include>java.lang.Thread</include>
-								<include>java.lang.Enum</include>
-							</ignoreJDKClasses>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+    <profiles>
+        <profile>
+            <!--This profile can be used to (re)generate signatures of Concurrency 
+                API, note that they differ based on JDK used to build them -->
+            <!--All .sig files should be included in the generated jar files! -->
+            <id>signature-generation</id>
+            <activation>
+                <property>
+                    <name>signature</name>
+                </property>
+            </activation>
+            <properties>
+                <!--Default assumed JDK version, can be overriden via -Dmajor.jdk.version=X -->
+                <jdk.major.version>11</jdk.major.version>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>unpack</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>unpack</goal>
+                                </goals>
+                                <configuration>
+                                    <artifactItems>
+                                        <artifactItem>
+                                            <groupId>jakarta.enterprise.concurrent</groupId>
+                                            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+                                            <version>${jakarta.concurrent.version.ga}</version>
+                                            <type>jar</type>
+                                            <overWrite>false</overWrite>
+                                            <outputDirectory>${project.build.directory}/concurrency-api</outputDirectory>
+                                            <includes>**/*.class,**/*.xml</includes>
+                                        </artifactItem>
+                                    </artifactItems>
+                                    <includes>**/*.java</includes>
+                                    <excludes>**/*.properties</excludes>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.netbeans.tools</groupId>
+                        <artifactId>sigtest-maven-plugin</artifactId>
+                        <version>${sigtest.version}</version>
+                        <executions>
+                            <execution>
+                                <id>createSigFile</id>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <classes>${project.build.directory}/concurrency-api</classes>
+                            <packages>
+                                jakarta.enterprise.concurrent,
+                                jakarta.enterprise.concurrent.spi,
+                            </packages>
+                            <attach>false</attach>
+                            <sigfile>${project.build.directory}/jakarta.enterprise.concurrent.sig_${project.version}</sigfile>
+                            <!-- Ensure that the signature file we generated will work for both JDK11 and JDK17 -->
+                            <ignoreJDKClasses>
+                                <include>java.util.Map</include>
+                                <include>java.lang.Object</include>
+                                <include>java.io.ByteArrayInputStream</include>
+                                <include>java.io.InputStream</include>
+                                <include>java.lang.Deprecated</include>
+                                <include>java.io.Writer</include>
+                                <include>java.io.OutputStream</include>
+                                <include>java.util.List</include>
+                                <include>java.util.Collection</include>
+                                <include>java.lang.instrument.IllegalClassFormatException</include>
+                                <include>javax.transaction.xa.XAException</include>
+                                <include>java.lang.annotation.Repeatable</include>
+                                <include>java.lang.InterruptedException</include>
+                                <include>java.lang.CloneNotSupportedException</include>
+                                <include>java.lang.Throwable</include>
+                                <include>java.lang.Thread</include>
+                                <include>java.lang.Enum</include>
+                            </ignoreJDKClasses>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

From e69fcfe12717b19e6da045d8202576a34951d83f Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@gmail.com>
Date: Sat, 25 Jun 2022 01:07:37 +0200
Subject: [PATCH 2/4] Replaced 5.1.6 bundle with 5.1.4, which still works.

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
---
 api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/pom.xml b/api/pom.xml
index d2fc2c66..945a6aed 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -90,7 +90,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>5.1.6</version>
+                <version>5.1.4</version>
                 <extensions>true</extensions>
                 <configuration>
                     <supportedProjectTypes>

From 2cfd2ab8e2410e0f34bbe72ed3d663a428d059e5 Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@gmail.com>
Date: Sat, 25 Jun 2022 01:59:40 +0200
Subject: [PATCH 3/4] Fix URLs and bundle plug-in.

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
---
 api/pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 945a6aed..f8aedfc4 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -34,6 +34,13 @@
         components without compromising container integrity while still preserving the Jakarta EE 
         platform’s fundamental benefits.
     </description>
+    <url>https://github.com/jakartaee/concurrency</url>
+
+    <scm>
+        <connection>scm:git:https://github.com/jakartaee/concurrency.git</connection>
+        <developerConnection>scm:git:git@github.com:jakartaee/concurrency.git</developerConnection>
+        <url>https://github.com/jakartaee/concurrency</url>
+    </scm>
 
     <dependencies>
         <dependency>
@@ -91,7 +98,6 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>5.1.4</version>
-                <extensions>true</extensions>
                 <configuration>
                     <supportedProjectTypes>
                         <supportedProjectType>jar</supportedProjectType>
@@ -135,7 +141,7 @@
                 </configuration>
             </plugin>
             
-                        <!-- 
+            <!-- 
                Create Javadoc for API jar
             -->
             <plugin>

From a2b595bf78f757b18cfb63ecf7a4b2452ca21338 Mon Sep 17 00:00:00 2001
From: Arjan Tijms <arjan.tijms@gmail.com>
Date: Sun, 26 Jun 2022 18:45:32 +0200
Subject: [PATCH 4/4] Fix copy/paste mistakes after feedback

Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
---
 api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index f8aedfc4..54bcc729 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -163,14 +163,14 @@
                             <windowtitle>Jakarta Concurrency API documentation</windowtitle>
                             <header><![CDATA[<br>Jakarta Concurrency API v${project.version}]]></header>
                             <bottom><![CDATA[
-Comments to: <a href="mailto:jaspic-dev@eclipse.org">cu-dev@eclipse.org</a>.<br>
+Comments to: <a href="mailto:cu-dev@eclipse.org">cu-dev@eclipse.org</a>.<br>
 Copyright &#169; 2020, 2022 Eclipse Foundation. All rights reserved.<br>
 Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
                             </bottom>
                             <docfilessubdirs>true</docfilessubdirs>
                             <groups>
                                 <group>
-                                    <title>Jakarta Authentication API Documentation</title>
+                                    <title>Jakarta Concurrency API Documentation</title>
                                     <packages>
                                         jakarta.enterprise.concurrent
                                     </packages>