Skip to content

Commit c7af8f9

Browse files
authored
Merge pull request #537 from KyleAure/prepare-for-jakarta-ee-12
2 parents 9b9c478 + a1454e6 commit c7af8f9

File tree

16 files changed

+34
-508
lines changed

16 files changed

+34
-508
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# TODO update once 25-ea is available
2323
strategy:
2424
matrix:
25-
java-version: [ '17', '21' ]
25+
java-version: [ '21' ]
2626

2727
runs-on: ubuntu-latest
2828

.github/workflows/specification.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
steps:
1818
- name: Checkout source
1919
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
20-
- name: Set up JDK 17
20+
- name: Set up JDK 21
2121
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
2222
with:
23-
java-version: 17
23+
java-version: 21
2424
distribution: 'temurin'
2525
cache: maven
2626
- name: Generate specification docs

.github/workflows/update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
max-parallel: 1
1414
matrix:
15-
java-version: [ '17', '21' ]
15+
java-version: ['21']
1616

1717
steps:
1818
- name: Checkout source

api/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Building
88

99
Prerequisites:
1010

11-
* JDK 17+
11+
* JDK 21+
1212
* Maven 3.8.0+
1313

1414
Build and test the API:

api/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>jakarta.enterprise.concurrent</groupId>
2525
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
26-
<version>3.1.1-SNAPSHOT</version>
26+
<version>3.2.0-SNAPSHOT</version>
2727
</parent>
2828

2929
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
@@ -45,7 +45,7 @@
4545
<properties>
4646
<!-- default is the same for backward compatibility reason
4747
Easy to override when building with a system property -->
48-
<spec.version>3.1</spec.version>
48+
<spec.version>3.2</spec.version>
4949
</properties>
5050

5151
<dependencies>
@@ -72,8 +72,8 @@
7272
<artifactId>maven-compiler-plugin</artifactId>
7373
<version>3.13.0</version>
7474
<configuration>
75-
<source>17</source>
76-
<target>17</target>
75+
<source>21</source>
76+
<target>21</target>
7777
</configuration>
7878
</plugin>
7979

@@ -161,7 +161,7 @@
161161
<goal>jar</goal>
162162
</goals>
163163
<configuration>
164-
<source>17</source>
164+
<source>21</source>
165165
<quiet>true</quiet>
166166
<additionalJOption>-Xdoclint:none</additionalJOption>
167167
<description>Jakarta Concurrency API documentation</description>

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<groupId>jakarta.enterprise.concurrent</groupId>
2727
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
28-
<version>3.1.1-SNAPSHOT</version>
28+
<version>3.2.0-SNAPSHOT</version>
2929
<packaging>pom</packaging>
3030

3131
<name>Jakarta Concurrency</name>
@@ -68,7 +68,7 @@
6868
<properties>
6969
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7070
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
71-
<maven.compiler.release>17</maven.compiler.release>
71+
<maven.compiler.release>21</maven.compiler.release>
7272

7373
<maven.checkstyle.plugin.version>3.4.0</maven.checkstyle.plugin.version>
7474
<checkstyle.version>10.17.0</checkstyle.version>

specification/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Building
88

99
Prerequisites:
1010

11-
* JDK 17+
11+
* JDK 21+
1212
* Maven 3.8.5+
1313

1414
Run the full build:

specification/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>jakarta.enterprise.concurrent</groupId>
2424
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
25-
<version>3.1.1-SNAPSHOT</version>
25+
<version>3.2.0-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>concurrency-spec</artifactId>

specification/src/main/asciidoc/jakarta-concurrency.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:sectnums:
2-
= Jakarta Concurrency Specification, Version 3.1
2+
= Jakarta Concurrency Specification, Version 3.2
33

44
Copyright (c) 2013, 2024 Oracle and/or its affiliates. All rights reserved.
55

@@ -26,7 +26,7 @@ It is because of this behavior that application components are typically
2626
unable to reliably use other Jakarta EE platform services from a thread
2727
that is not managed by the container.
2828

29-
Jakarta EE Product Providers (see chapter 2.12 of the Jakarta EE 11
29+
Jakarta EE Product Providers (see chapter 2.12 of the Jakarta EE 12
3030
Specification) also discourage the use of resources in a non-managed
3131
way, because it can potentially undermine the enterprise features that
3232
the platform is designed to provide such as availability, security, and

tck-dist/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>jakarta.enterprise.concurrent</groupId>
2424
<artifactId>jakarta.enterprise.concurrent.parent</artifactId>
25-
<version>3.1.1-SNAPSHOT</version>
25+
<version>3.2.0-SNAPSHOT</version>
2626
</parent>
2727

2828
<artifactId>jakarta.enterprise.concurrent-tck-dist</artifactId>
@@ -79,8 +79,8 @@
7979
<artifactId>maven-compiler-plugin</artifactId>
8080
<version>3.13.0</version>
8181
<configuration>
82-
<source>17</source>
83-
<target>17</target>
82+
<source>21</source>
83+
<target>21</target>
8484
</configuration>
8585
</plugin>
8686

0 commit comments

Comments
 (0)