Merge pull request #537 from KyleAure/prepare-for-jakarta-ee-12

jakartaee · Jul 9, 2024 · c7af8f9 · c7af8f9
2 parents 9b9c478 + a1454e6
commit c7af8f9
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 508 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
     # TODO update once 25-ea is available
     strategy:
       matrix:
-        java-version: [ '17', '21' ]
+        java-version: [ '21' ]
 
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/specification.yml b/.github/workflows/specification.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
     - name: Checkout source
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
-        java-version: 17
+        java-version: 21
         distribution: 'temurin'
         cache: maven
     - name: Generate specification docs

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        java-version: [ '17', '21' ]
+        java-version: ['21']
 
     steps:
     - name: Checkout source

diff --git a/api/README.md b/api/README.md
@@ -8,7 +8,7 @@ Building
 
 Prerequisites:
 
-* JDK 17+
+* JDK 21+
 * Maven 3.8.0+
 
 Build and test the API:

diff --git a/api/pom.xml b/api/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>jakarta.enterprise.concurrent</groupId>
         <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.enterprise.concurrent-api</artifactId>
@@ -45,7 +45,7 @@
     <properties>
         <!-- default is the same for backward compatibility reason
             Easy to override when building with a system property -->
-        <spec.version>3.1</spec.version>
+        <spec.version>3.2</spec.version>
     </properties>
 
     <dependencies>
@@ -72,8 +72,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
 
@@ -161,7 +161,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <source>17</source>
+                            <source>21</source>
                             <quiet>true</quiet>                          
                             <additionalJOption>-Xdoclint:none</additionalJOption>
                             <description>Jakarta Concurrency API documentation</description>

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>jakarta.enterprise.concurrent</groupId>
     <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
-    <version>3.1.1-SNAPSHOT</version>
+    <version>3.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Jakarta Concurrency</name>
@@ -68,7 +68,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
 
         <maven.checkstyle.plugin.version>3.4.0</maven.checkstyle.plugin.version>
         <checkstyle.version>10.17.0</checkstyle.version>

diff --git a/specification/README.md b/specification/README.md
@@ -8,7 +8,7 @@ Building
 
 Prerequisites:
 
-* JDK 17+
+* JDK 21+
 * Maven 3.8.5+
 
 Run the full build:

diff --git a/specification/pom.xml b/specification/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.enterprise.concurrent</groupId>
         <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>concurrency-spec</artifactId>

diff --git a/specification/src/main/asciidoc/jakarta-concurrency.adoc b/specification/src/main/asciidoc/jakarta-concurrency.adoc
@@ -1,5 +1,5 @@
 :sectnums:
-= Jakarta Concurrency Specification, Version 3.1
+= Jakarta Concurrency Specification, Version 3.2
 
 Copyright (c) 2013, 2024 Oracle and/or its affiliates. All rights reserved.
 
@@ -26,7 +26,7 @@ It is because of this behavior that application components are typically
 unable to reliably use other Jakarta EE platform services from a thread
 that is not managed by the container.
 
-Jakarta EE Product Providers (see chapter 2.12 of the Jakarta EE 11
+Jakarta EE Product Providers (see chapter 2.12 of the Jakarta EE 12
 Specification) also discourage the use of resources in a non-managed
 way, because it can potentially undermine the enterprise features that
 the platform is designed to provide such as availability, security, and

diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.enterprise.concurrent</groupId>
         <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
@@ -79,8 +79,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
 

diff --git a/tck-dist/src/main/asciidoc/concurrency-tck-reference-guide.adoc b/tck-dist/src/main/asciidoc/concurrency-tck-reference-guide.adoc
@@ -1,24 +1,24 @@
 = Jakarta Concurrency TCK Reference Guide
 :author: Kyle Aure
 :email: [email protected]
-:revnumber: v1.1
+:revnumber: v1.2
 :toc:
 :sectnums:
 
 :APIShortName: Concurrency
 :APILongName: Jakarta Concurrency
-:APIVersion: 3.1.0
+:APIVersion: 3.2
 
-:APISpecSite: https://jakarta.ee/specifications/concurrency/3.1/
+:APISpecSite: https://jakarta.ee/specifications/concurrency/3.2/
 :APIEclipseSite: https://projects.eclipse.org/projects/ee4j.cu
 :APIGitSite: https://github.com/jakartaee/concurrency
 
 :TCKTestPlatform: Junit5
 :SigPluginVersion: 2.3
 :SigPluginGAV: jakarta.tck:sigtest-maven-plugin:{SigPluginVersion}
 
-:JavaVersion1: 17
-:JavaVersion2: 21
+:JavaVersion1: 21
+:JavaVersion2: 25
 
 :license: Eclipse Foundation Technology Compatibility Kit License
 :licenseURL: https://www.eclipse.org/legal/tck.php

diff --git a/tck-dist/src/main/starter/pom.xml b/tck-dist/src/main/starter/pom.xml
@@ -30,11 +30,11 @@
     <properties>
         <!-- General properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
         <!-- Dependency and Plugin Versions -->
-        <jakarta.concurrent.version>3.1.1</jakarta.concurrent.version>
+        <jakarta.concurrent.version>3.2.0</jakarta.concurrent.version>
         <jakarta.servlet.version>6.1.0</jakarta.servlet.version>
 
         <arquillian.version>1.9.0.Final</arquillian.version>

diff --git a/tck/README.md b/tck/README.md
@@ -15,7 +15,7 @@ This guide will help you build and run the TCK on a supported Jakarta EE Applica
 ### System Requirements
 You will need to download and install the following software before you begin.
 
-- JDK 17 or higher
+- JDK 21 or higher
 - [Maven 3.8.0 or higher](https://maven.apache.org/download.cgi)
 - Jakarta EE Application Server or Container [Glassfish, Open Liberty, JBoss, WebLogic, etc.]
 

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>jakarta.enterprise.concurrent</groupId>
         <artifactId>jakarta.enterprise.concurrent.parent</artifactId>
-        <version>3.1.1-SNAPSHOT</version>
+        <version>3.2.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.enterprise.concurrent-tck</artifactId>
@@ -138,8 +138,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -185,7 +185,7 @@
                             <goal>jar</goal>
                         </goals>
                         <configuration>
-                            <source>17</source>
+                            <source>21</source>
                             <quiet>true</quiet>
                             <additionalJOption>-Xdoclint:none</additionalJOption>
                         </configuration>
@@ -208,7 +208,7 @@
             </activation>
             <properties>
                 <!--Default assumed JDK version, can be overriden via -Dmajor.jdk.version=X -->
-                <jdk.major.version>17</jdk.major.version>
+                <jdk.major.version>21</jdk.major.version>
             </properties>
             <build>
                 <plugins>