Skip to content

Commit e74e6d7

Browse files
mswatoshmswatosh
committed
Java version update to 17 and require Maven 3.9+
1 parent 6a919ba commit e74e6d7

8 files changed

Lines changed: 62 additions & 38 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
2+
# Copyright (c) 2021, 2026 Contributors to the Eclipse Foundation
33
#
44
# This program and the accompanying materials are made available under the
55
# terms of the Eclipse Public License v. 2.0 which is available at
@@ -27,7 +27,7 @@ jobs:
2727

2828
strategy:
2929
matrix:
30-
java_version: [ 11, 17, 21 ]
30+
java_version: [ 17, 21 ]
3131

3232
steps:
3333
- name: Checkout for build

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[//]: # " Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. "
1+
[//]: # " Copyright (c) 2018, 2026 Oracle and/or its affiliates. All rights reserved. "
22
[//]: # " "
33
[//]: # " This program and the accompanying materials are made available under the "
44
[//]: # " terms of the Eclipse Public License v. 2.0, which is available at "
@@ -22,6 +22,10 @@ This project contains Jakarta JSON Processing specification, API and TCK.
2222

2323
## Build
2424

25+
Prerequisites:
26+
* JDK 17+
27+
* Maven 3.9.0+
28+
2529
Use the following command:
2630
```bash
2731
mvn -U -C clean install

‎api/pom.xml‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2011, 2025 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2011, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -175,10 +175,10 @@
175175
<configuration>
176176
<rules>
177177
<requireJavaVersion>
178-
<version>[11,)</version>
178+
<version>[17,)</version>
179179
</requireJavaVersion>
180180
<requireMavenVersion>
181-
<version>[3.6.0,)</version>
181+
<version>[3.9.0,)</version>
182182
</requireMavenVersion>
183183
</rules>
184184
</configuration>
@@ -264,28 +264,14 @@
264264
<groupId>org.apache.maven.plugins</groupId>
265265
<artifactId>maven-compiler-plugin</artifactId>
266266
<configuration>
267-
<release>9</release>
267+
<release>17</release>
268268
<createMissingPackageInfoClass>false</createMissingPackageInfoClass>
269269
<compilerArgs>
270270
<arg>-Xlint:all</arg>
271271
<arg>-Xdoclint:all</arg>
272272
</compilerArgs>
273273
<showDeprecation>true</showDeprecation>
274274
</configuration>
275-
<executions>
276-
<execution>
277-
<id>base-compile</id>
278-
<goals>
279-
<goal>compile</goal>
280-
</goals>
281-
<configuration>
282-
<release>8</release>
283-
<excludes>
284-
<exclude>module-info.java</exclude>
285-
</excludes>
286-
</configuration>
287-
</execution>
288-
</executions>
289275
</plugin>
290276
<plugin>
291277
<groupId>org.glassfish.build</groupId>

‎spec/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Building
88

99
Prerequisites:
1010

11-
* JDK8+
12-
* Maven 3.0.3+
11+
* JDK 17+
12+
* Maven 3.9.0+
1313

1414
Run the full build with DRAFT status:
1515

‎spec/pom.xml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2017, 2020 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2017, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,7 +27,7 @@
2727
<groupId>jakarta.json</groupId>
2828
<artifactId>jakarta.json-spec</artifactId>
2929
<packaging>pom</packaging>
30-
<version>2.0-SNAPSHOT</version>
30+
<version>2.2-SNAPSHOT</version>
3131
<name>Jakarta JSON Processing Specification</name>
3232

3333
<properties>
@@ -38,6 +38,7 @@
3838
<!-- status: DRAFT, BETA, etc., or blank for final -->
3939
<status>DRAFT</status>
4040
<maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format>
41+
<maven.enforcer.plugin.version>3.6.2</maven.enforcer.plugin.version>
4142
<revisiondate>${maven.build.timestamp}</revisiondate>
4243
</properties>
4344

@@ -60,7 +61,7 @@
6061
<plugin>
6162
<groupId>org.apache.maven.plugins</groupId>
6263
<artifactId>maven-enforcer-plugin</artifactId>
63-
<version>1.4.1</version>
64+
<version>${maven.enforcer.plugin.version}</version>
6465
<executions>
6566
<execution>
6667
<id>enforce-versions</id>
@@ -70,9 +71,11 @@
7071
<configuration>
7172
<rules>
7273
<requireJavaVersion>
73-
<version>[1.8.0,)</version>
74-
<message>You need JDK8 or higher</message>
74+
<version>[17,)</version>
7575
</requireJavaVersion>
76+
<requireMavenVersion>
77+
<version>[3.9.0,)</version>
78+
</requireMavenVersion>
7679
</rules>
7780
</configuration>
7881
</execution>
@@ -142,12 +145,12 @@
142145
</execution>
143146
</executions>
144147
<configuration>
145-
<sourceDocumentName>jsonp-spec.adoc</sourceDocumentName>
146-
<sourceHighlighter>coderay</sourceHighlighter>
148+
<sourceDocumentName>jsonp-spec.adoc</sourceDocumentName>
147149
<attributes>
148150
<revnumber>${project.version}</revnumber>
149151
<revremark>${status}</revremark>
150152
<revdate>${revisiondate}</revdate>
153+
<source-highlighter>coderay</source-highlighter>
151154
</attributes>
152155
</configuration>
153156

‎tck/pom.xml‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2020, 2022 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2020, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -57,8 +57,8 @@
5757

5858
<properties>
5959
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
60-
<maven.compiler.target>11</maven.compiler.target>
61-
<maven.compiler.source>11</maven.compiler.source>
60+
<maven.compiler.target>17</maven.compiler.target>
61+
<maven.compiler.source>17</maven.compiler.source>
6262
<junit.jupiter.version>5.7.2</junit.jupiter.version>
6363

6464
<jakarta.json-api.version>2.2.0</jakarta.json-api.version>
@@ -139,7 +139,36 @@
139139
<artifactId>maven-javadoc-plugin</artifactId>
140140
<version>3.3.1</version>
141141
</plugin>
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-enforcer-plugin</artifactId>
145+
<version>3.4.0</version>
146+
</plugin>
142147
</plugins>
143148
</pluginManagement>
149+
<plugins>
150+
<plugin>
151+
<groupId>org.apache.maven.plugins</groupId>
152+
<artifactId>maven-enforcer-plugin</artifactId>
153+
<executions>
154+
<execution>
155+
<id>enforce-maven</id>
156+
<goals>
157+
<goal>enforce</goal>
158+
</goals>
159+
<configuration>
160+
<rules>
161+
<requireJavaVersion>
162+
<version>[17,)</version>
163+
</requireJavaVersion>
164+
<requireMavenVersion>
165+
<version>[3.9.0,)</version>
166+
</requireMavenVersion>
167+
</rules>
168+
</configuration>
169+
</execution>
170+
</executions>
171+
</plugin>
172+
</plugins>
144173
</build>
145174
</project>

‎tck/tck-docs/userguide/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ page, and the body generated from asciidoc content.
88

99
## Pre requisites
1010

11-
- Maven
12-
- JDK11+
11+
- Maven 3.9.0+
12+
- JDK 17+
1313

1414
Deploying to Github will require password less authentication.
1515

‎tck/tck-docs/userguide/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2017, 2025 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2017, 2026 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -81,9 +81,11 @@
8181
<configuration>
8282
<rules>
8383
<requireJavaVersion>
84-
<version>[11,)</version>
85-
<message>You need JDK11 or newer</message>
84+
<version>[17,)</version>
8685
</requireJavaVersion>
86+
<requireMavenVersion>
87+
<version>[3.9.0,)</version>
88+
</requireMavenVersion>
8789
</rules>
8890
</configuration>
8991
</execution>

0 commit comments

Comments
 (0)
⚡