Java version update to 17 and require Maven 3.9+
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5922b5a..b09766f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml
@@ -1,5 +1,5 @@ # -# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation +# Copyright (c) 2021, 2026 Contributors to the Eclipse Foundation # # This program and the accompanying materials are made available under the # terms of the Eclipse Public License v. 2.0 which is available at @@ -27,7 +27,7 @@ strategy: matrix: - java_version: [ 11, 17, 21 ] + java_version: [ 17, 21 ] steps: - name: Checkout for build
diff --git a/README.md b/README.md index 586a9ff..5b5835b 100644 --- a/README.md +++ b/README.md
@@ -1,4 +1,4 @@ -[//]: # " Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. " +[//]: # " Copyright (c) 2018, 2026 Oracle and/or its affiliates. All rights reserved. " [//]: # " " [//]: # " This program and the accompanying materials are made available under the " [//]: # " terms of the Eclipse Public License v. 2.0, which is available at " @@ -22,6 +22,10 @@ ## Build +Prerequisites: +* JDK 17+ +* Maven 3.9.0+ + Use the following command: ```bash mvn -U -C clean install
diff --git a/api/pom.xml b/api/pom.xml index 75e1036..6f6496e 100644 --- a/api/pom.xml +++ b/api/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2026 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -175,10 +175,10 @@ <configuration> <rules> <requireJavaVersion> - <version>[11,)</version> + <version>[17,)</version> </requireJavaVersion> <requireMavenVersion> - <version>[3.6.0,)</version> + <version>[3.9.0,)</version> </requireMavenVersion> </rules> </configuration> @@ -264,7 +264,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <release>9</release> + <release>17</release> <createMissingPackageInfoClass>false</createMissingPackageInfoClass> <compilerArgs> <arg>-Xlint:all</arg> @@ -272,20 +272,6 @@ </compilerArgs> <showDeprecation>true</showDeprecation> </configuration> - <executions> - <execution> - <id>base-compile</id> - <goals> - <goal>compile</goal> - </goals> - <configuration> - <release>8</release> - <excludes> - <exclude>module-info.java</exclude> - </excludes> - </configuration> - </execution> - </executions> </plugin> <plugin> <groupId>org.glassfish.build</groupId>
diff --git a/spec/README.md b/spec/README.md index e25307a..e4d3647 100644 --- a/spec/README.md +++ b/spec/README.md
@@ -8,8 +8,8 @@ Prerequisites: -* JDK8+ -* Maven 3.0.3+ +* JDK 17+ +* Maven 3.9.0+ Run the full build with DRAFT status:
diff --git a/spec/pom.xml b/spec/pom.xml index be9a379..6b6c3b7 100644 --- a/spec/pom.xml +++ b/spec/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2017, 2026 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -27,7 +27,7 @@ <groupId>jakarta.json</groupId> <artifactId>jakarta.json-spec</artifactId> <packaging>pom</packaging> - <version>2.0-SNAPSHOT</version> + <version>2.2-SNAPSHOT</version> <name>Jakarta JSON Processing Specification</name> <properties> @@ -38,6 +38,7 @@ <!-- status: DRAFT, BETA, etc., or blank for final --> <status>DRAFT</status> <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format> + <maven.enforcer.plugin.version>3.6.2</maven.enforcer.plugin.version> <revisiondate>${maven.build.timestamp}</revisiondate> </properties> @@ -60,7 +61,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>${maven.enforcer.plugin.version}</version> <executions> <execution> <id>enforce-versions</id> @@ -70,9 +71,11 @@ <configuration> <rules> <requireJavaVersion> - <version>[1.8.0,)</version> - <message>You need JDK8 or higher</message> + <version>[17,)</version> </requireJavaVersion> + <requireMavenVersion> + <version>[3.9.0,)</version> + </requireMavenVersion> </rules> </configuration> </execution> @@ -142,12 +145,12 @@ </execution> </executions> <configuration> - <sourceDocumentName>jsonp-spec.adoc</sourceDocumentName> - <sourceHighlighter>coderay</sourceHighlighter> + <sourceDocumentName>jsonp-spec.adoc</sourceDocumentName> <attributes> <revnumber>${project.version}</revnumber> <revremark>${status}</revremark> <revdate>${revisiondate}</revdate> + <source-highlighter>coderay</source-highlighter> </attributes> </configuration>
diff --git a/tck/pom.xml b/tck/pom.xml index 6ba3f79..747d1a7 100644 --- a/tck/pom.xml +++ b/tck/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2020, 2026 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -57,8 +57,8 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>11</maven.compiler.target> - <maven.compiler.source>11</maven.compiler.source> + <maven.compiler.target>17</maven.compiler.target> + <maven.compiler.source>17</maven.compiler.source> <junit.jupiter.version>5.7.2</junit.jupiter.version> <jakarta.json-api.version>2.2.0</jakarta.json-api.version> @@ -139,7 +139,36 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>3.3.1</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.4.0</version> + </plugin> </plugins> </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>enforce-maven</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>[17,)</version> + </requireJavaVersion> + <requireMavenVersion> + <version>[3.9.0,)</version> + </requireMavenVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project>
diff --git a/tck/tck-docs/userguide/README.md b/tck/tck-docs/userguide/README.md index 05bacb8..2f890b6 100644 --- a/tck/tck-docs/userguide/README.md +++ b/tck/tck-docs/userguide/README.md
@@ -8,8 +8,8 @@ ## Pre requisites -- Maven -- JDK11+ +- Maven 3.9.0+ +- JDK 17+ Deploying to Github will require password less authentication.
diff --git a/tck/tck-docs/userguide/pom.xml b/tck/tck-docs/userguide/pom.xml index cf506df..b3c8fcd 100644 --- a/tck/tck-docs/userguide/pom.xml +++ b/tck/tck-docs/userguide/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2025 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2017, 2026 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -81,9 +81,11 @@ <configuration> <rules> <requireJavaVersion> - <version>[11,)</version> - <message>You need JDK11 or newer</message> + <version>[17,)</version> </requireJavaVersion> + <requireMavenVersion> + <version>[3.9.0,)</version> + </requireMavenVersion> </rules> </configuration> </execution>