Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -27,7 +27,7 @@ jobs:

strategy:
matrix:
java_version: [ 11, 17, 21 ]
java_version: [ 17, 21 ]

steps:
- name: Checkout for build
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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 "
Expand All @@ -22,6 +22,10 @@ This project contains Jakarta JSON Processing specification, API and TCK.

## Build

Prerequisites:
* JDK 17+
* Maven 3.9.0+

Use the following command:
```bash
mvn -U -C clean install
Expand Down
26 changes: 6 additions & 20 deletions api/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2011, 2023 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
Expand Down Expand Up @@ -30,7 +30,7 @@
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>

<version>2.1.4-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<name>Jakarta JSON Processing API</name>
<description>Jakarta JSON Processing defines a Java(R) based framework for parsing, generating, transforming, and querying JSON documents.</description>
<url>https://github.com/eclipse-ee4j/jsonp</url>
Expand Down Expand Up @@ -87,7 +87,7 @@

<non.final>false</non.final>
<extension.name>jakarta.json</extension.name>
<spec.version>2.1</spec.version>
<spec.version>2.2</spec.version>
<legal.doc.source>${project.basedir}/..</legal.doc.source>
<vendor.name>Eclipse Foundation</vendor.name>
</properties>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -264,28 +264,14 @@
<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>
<arg>-Xdoclint:all</arg>
</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>
Expand Down
4 changes: 2 additions & 2 deletions spec/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Building

Prerequisites:

* JDK8+
* Maven 3.0.3+
* JDK 17+
* Maven 3.9.0+

Run the full build with DRAFT status:

Expand Down
17 changes: 10 additions & 7 deletions spec/pom.xml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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>
Expand All @@ -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>

Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
39 changes: 34 additions & 5 deletions tck/pom.xml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -28,7 +28,7 @@

<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jakarta JSON Processing TCK</name>
<description>Jakarta JSON Processing TCK</description>
Expand Down Expand Up @@ -57,11 +57,11 @@

<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.1.0</jakarta.json-api.version>
<jakarta.json-api.version>2.2.0</jakarta.json-api.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -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>
4 changes: 2 additions & 2 deletions tck/tck-common/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2025 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
Expand All @@ -22,7 +22,7 @@
<parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions tck/tck-dist-eftl/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2021, 2025 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
Expand All @@ -23,7 +23,7 @@
<parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions tck/tck-dist-eftl/src/main/bin/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, 2025 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
Expand Down Expand Up @@ -32,7 +32,7 @@
<!-- Vendor Implementation (VI) -->
<jsonp-api.groupId>jakarta.json</jsonp-api.groupId>
<jsonp-api.artifactId>jakarta.json-api</jsonp-api.artifactId>
<jsonp-api.version>2.1.0</jsonp-api.version>
<jsonp-api.version>2.2.0</jsonp-api.version>
<!-- Compatible Implementation (CI) -->
<jsonp-impl.groupId>org.eclipse.parsson</jsonp-impl.groupId>
<jsonp-impl.artifactId>parsson</jsonp-impl.artifactId>
Expand All @@ -43,7 +43,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jimage.dir>\${project.build.directory}/jdk-bundle</jimage.dir>
<!-- !!! DO NOT EDIT !!! -->
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
<jakarta.json-api.version>2.2.0</jakarta.json-api.version>
<impl.alltests>true</impl.alltests>
</properties>
<dependencyManagement>
Expand Down
4 changes: 2 additions & 2 deletions tck/tck-dist-eftl/src/main/scripts/artifact-install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2021, 2025 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
Expand All @@ -20,7 +20,7 @@
if [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
VERSION="$1"
else
VERSION="2.1.0-SNAPSHOT"
VERSION="2.2.0-SNAPSHOT"
fi

# Parent pom
Expand Down
4 changes: 2 additions & 2 deletions tck/tck-dist-epl/pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, 2025 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
Expand All @@ -23,7 +23,7 @@
<parent>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-tck</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading
Loading