Merge pull request #455 from KyleAure/prep-for-m1 prepare project for an M1 release
diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3fe6cb7..8c3d5d9 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml
@@ -9,7 +9,7 @@ - "bot" - package-ecosystem: "maven" - directory: "/api" + directory: "/" schedule: interval: "daily" labels: @@ -17,17 +17,9 @@ - "bot" - package-ecosystem: "maven" - directory: "/spec" + directory: "/perf" schedule: - interval: "daily" - labels: - - "dependencies" - - "bot" - - - package-ecosystem: "maven" - directory: "/tck" - schedule: - interval: "daily" + interval: "weekly" labels: - "dependencies" - "bot"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d189a3d..abbc5b4 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml
@@ -10,11 +10,17 @@ # SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause # -name: JSON-P API +name: Java CI with Maven on: - pull_request: push: + branches: + - 'main' + - '*-BRANCH' + pull_request: + branches: + - 'main' + - '*-BRANCH' concurrency: group: ${{ github.ref }} @@ -22,21 +28,35 @@ jobs: build: - name: Test on JDK ${{ matrix.java_version }} - runs-on: ubuntu-latest - strategy: matrix: - java_version: [ 17, 21, 25 ] + java-version: [ '17', '21', '25' ] + + name: Test on JDK ${{ matrix.java-version }} + runs-on: ubuntu-latest steps: - - name: Checkout for build - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - - name: Set up JDK - uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0 + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0 with: + java-version: ${{ matrix.java-version }} distribution: 'temurin' - java-version: ${{ matrix.java_version }} - cache: 'maven' - - name: Verify - run: cd api && mvn -B -V -U -C -Poss-release -Pstaging clean verify -Dgpg.skip=true + cache: maven + - name: Build project + run: mvn -B -V -U -C clean package + - name: Verify TCK Distribution + run: | + # Unzip tck-dist zip + TCK_UNZIP=tck-dist/target/tck-unzipped + mkdir -p "$TCK_UNZIP" + unzip -q "$(ls tck-dist/target/*.zip)" -d "$TCK_UNZIP" + + # Find TCK directory + TCK_VERSIONED_ROOT=$(find "$TCK_UNZIP" -mindepth 1 -maxdepth 1 -type d) + + # Run artifact-install + "$TCK_VERSIONED_ROOT/artifacts/artifact-install.sh" + + # Verify pom.xml and sub-modules are valid + mvn -B -V -f "$TCK_VERSIONED_ROOT/bin/pom.xml" clean validate
diff --git a/.github/workflows/update-signature.yml b/.github/workflows/update-signature.yml new file mode 100644 index 0000000..8b62459 --- /dev/null +++ b/.github/workflows/update-signature.yml
@@ -0,0 +1,86 @@ +# +# Copyright (c) 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 +# http://www.eclipse.org/legal/epl-2.0, +# or the Eclipse Distribution License v. 1.0 which is available at +# http://www.eclipse.org/org/documents/edl-v10.php. +# +# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause +# + +# Re-generates the TCK signature file(s) whenever the API module is updated. +# If the generated signature differs from the committed one, a pull request is opened. +# Can also be run manually using workflow_dispatch. + +name: Update signature files + +on: + push: + branches: + - 'main' + paths: + - 'api/src/**' + workflow_dispatch: # For manual testing + +permissions: + contents: write + pull-requests: write + +concurrency: + group: update-signature-${{ github.ref }} + cancel-in-progress: false + +jobs: + update: + + strategy: + max-parallel: 1 + matrix: + java-version: [ '17' ] # Add other Java versions if multiple signature files are supported. + + name: Update signature file for JDK ${{ matrix.java-version }} + runs-on: ubuntu-latest + + env: + SIGNATURE_DIR: tck/tck-tests/src/main/resources/ee/jakarta/tck/jsonp/signaturetest + UPDATE_BRANCH: update-signature-files-${{ github.sha }} + + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@b843ebf9b913146b38da2eaa7aeddf76074ae1ad # v6.1.0 + with: + distribution: 'temurin' + java-version: ${{ matrix.java-version }} + cache: 'maven' + - name: Generate signature file + run: | + mvn install -DskipTests -Dmaven.javadoc.skip=true -projects ".,api" + mvn package -DskipTests -Psignature-generation --file tck/pom.xml + - name: Check for changes + id: changes + run: | + git add --intent-to-add "${SIGNATURE_DIR}" + if git diff --quiet -- "${SIGNATURE_DIR}"; then + echo "changed=false" >> "$GITHUB_OUTPUT" + else + echo "changed=true" >> "$GITHUB_OUTPUT" + fi + - name: Create pull request + if: steps.changes.outputs.changed == 'true' + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config user.name "github-actions[bot]" + git checkout -b "${UPDATE_BRANCH}" + git add "${SIGNATURE_DIR}" + git commit -s -m "Update signature file for JDK ${{ matrix.java-version }}" + git push origin "${UPDATE_BRANCH}" + gh pr create \ + --base "${{ github.ref_name }}" \ + --head "${UPDATE_BRANCH}" \ + --title "Update signature file for JDK ${{ matrix.java-version }}" \ + --body "Generated from ${{ github.sha }} after a change to the API module."
diff --git a/api/pom.xml b/api/pom.xml index bae5305..a188d3c 100644 --- a/api/pom.xml +++ b/api/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2011, 2026 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -17,64 +18,29 @@ --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.ee4j</groupId> - <artifactId>project</artifactId> - <version>2.0.6</version> - <relativePath/> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>2.2.0-SNAPSHOT</version> </parent> - <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> - <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> - - <scm> - <connection>scm:git:git://github.com/eclipse-ee4j/jsonp.git</connection> - <developerConnection>scm:git:git@github.com:eclipse-ee4j/jsonp.git</developerConnection> - <url>https://github.com/eclipse-ee4j/jsonp</url> - <tag>HEAD</tag> - </scm> - - <licenses> - <license> - <name>Eclipse Public License 2.0</name> - <url>https://projects.eclipse.org/license/epl-2.0</url> - <distribution>repo</distribution> - </license> - <license> - <name>GNU General Public License, version 2 with the GNU Classpath Exception</name> - <url>https://projects.eclipse.org/license/secondary-gpl-2.0-cp</url> - <distribution>repo</distribution> - </license> - </licenses> - - <developers> - <developer> - <id>m0mus</id> - <name>Dmitry Kornilov</name> - <organization>Oracle</organization> - <roles> - <role>project lead</role> - </roles> - </developer> - <developer> - <id>lukasj</id> - <name>Lukas Jungmann</name> - <organization>Oracle</organization> - <roles> - <role>dev lead</role> - </roles> - </developer> - </developers> + <description> + Jakarta JSON Processing defines a Java(R) based framework + for parsing, generating, transforming, and querying JSON documents. + </description> <properties> + <non.final>false</non.final> + <spec.version>2.2</spec.version> + <vendor.name>Eclipse Foundation</vendor.name> <copyright.exclude>${project.basedir}/../etc/copyright-exclude</copyright.exclude> <copyright.templatefile>${project.basedir}/../etc/copyright.txt</copyright.templatefile> <copyright.ignoreyear>true</copyright.ignoreyear> @@ -83,116 +49,12 @@ <spotbugs.exclude>${project.basedir}/../etc/spotbugs-exclude.xml</spotbugs.exclude> <spotbugs.skip>false</spotbugs.skip> <spotbugs.threshold>Low</spotbugs.threshold> - <spotbugs.version>4.7.3.5</spotbugs.version> - - <!-- Required by org.eclipse.ee4j:project parent POM for Nexus staging deployment --> - <nexus.staging.repository>jsonp-maven2-staging</nexus.staging.repository> - <non.final>false</non.final> - <extension.name>jakarta.json</extension.name> - <spec.version>2.2</spec.version> <legal.doc.source>${project.basedir}/..</legal.doc.source> - <vendor.name>Eclipse Foundation</vendor.name> </properties> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>3.2.0</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>3.6.0</version> - </plugin> - <plugin> - <groupId>org.glassfish.copyright</groupId> - <artifactId>glassfish-copyright-maven-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.13.0</version> - </plugin> - <plugin> - <groupId>org.glassfish.build</groupId> - <artifactId>spec-version-maven-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>5.1.9</version> - <configuration> - <instructions> - <_noextraheaders>true</_noextraheaders> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>3.4.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.3.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>3.7.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.5.0</version> - </plugin> - <plugin> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-maven-plugin</artifactId> - <version>${spotbugs.version}</version> - <configuration> - <skip>${spotbugs.skip}</skip> - <threshold>${spotbugs.threshold}</threshold> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>flatten-maven-plugin</artifactId> - <version>1.8.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> - <plugin> <!-- e.g. mvn validate glassfish-copyright:repair --> <groupId>org.glassfish.copyright</groupId> <artifactId>glassfish-copyright-maven-plugin</artifactId> @@ -271,7 +133,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <release>17</release> <createMissingPackageInfoClass>false</createMissingPackageInfoClass> <compilerArgs> <arg>-Xlint:all</arg> @@ -289,7 +150,7 @@ <jarType>api</jarType> <specVersion>${spec.version}</specVersion> <specImplVersion>${project.version}</specImplVersion> - <apiPackage>${extension.name}</apiPackage> + <apiPackage>${project.groupId}</apiPackage> </spec> </configuration> <executions> @@ -400,30 +261,6 @@ <failThreshold>High</failThreshold> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>flatten-maven-plugin</artifactId> - <executions> - <execution> - <id>flatten</id> - <phase>process-resources</phase> - <goals> - <goal>flatten</goal> - </goals> - <configuration> - <flattenMode>ossrh</flattenMode> - </configuration> - </execution> - <execution> - <id>flatten.clean</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> - </project>
diff --git a/perf/pom.xml b/perf/pom.xml index 4f2f2b7..ac814db 100644 --- a/perf/pom.xml +++ b/perf/pom.xml
@@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -9,13 +26,15 @@ <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> <version>2.0.5</version> + <relativePath/> </parent> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-perf</artifactId> <version>2.2.0-SNAPSHOT</version> - <description>This is a performance testing project for Jakarta JSON-P. + <description> + This is a performance testing project for Jakarta JSON-P. It leverages a JMH technology. See https://openjdk.java.net/projects/code-tools/jmh/. </description>
diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9f42885 --- /dev/null +++ b/pom.xml
@@ -0,0 +1,284 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.ee4j</groupId> + <artifactId>project</artifactId> + <version>2.0.6</version> + <relativePath/> + </parent> + + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>2.2.0-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Jakarta JSON Processing Parent</name> + <description>Parent project aggregating the Jakarta JSON Processing API, specification, and TCK.</description> + <url>https://github.com/eclipse-ee4j/jsonp</url> + + <modules> + <module>api</module> + <module>spec</module> + <module>tck</module> + <module>tck-dist</module> + </modules> + + <scm> + <connection>scm:git:git://github.com/eclipse-ee4j/jsonp.git</connection> + <developerConnection>scm:git:git@github.com:eclipse-ee4j/jsonp.git</developerConnection> + <url>https://github.com/eclipse-ee4j/jsonp</url> + <tag>HEAD</tag> + </scm> + + <licenses> + <license> + <name>Eclipse Public License 2.0</name> + <url>https://projects.eclipse.org/license/epl-2.0</url> + <distribution>repo</distribution> + </license> + <license> + <name>GNU General Public License, version 2 with the GNU Classpath Exception</name> + <url>https://projects.eclipse.org/license/secondary-gpl-2.0-cp</url> + <distribution>repo</distribution> + </license> + </licenses> + + <developers> + <developer> + <id>m0mus</id> + <name>Dmitry Kornilov</name> + <organization>Oracle</organization> + <roles> + <role>project lead</role> + </roles> + </developer> + <developer> + <id>lukasj</id> + <name>Lukas Jungmann</name> + <organization>Oracle</organization> + <roles> + <role>dev lead</role> + </roles> + </developer> + </developers> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- Required by org.eclipse.ee4j:project parent POM for Nexus staging deployment --> + <nexus.staging.repository>jsonp-maven2-staging</nexus.staging.repository> + + <maven.compiler.release>17</maven.compiler.release> + + <site.output.dir>${project.build.directory}/staging</site.output.dir> + <maven.site.skip>true</maven.site.skip> + + <!-- status: DRAFT, BETA, etc., or blank for final --> + <status>DRAFT</status> + <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format> + <revisiondate>${maven.build.timestamp}</revisiondate> + + + <!-- Dependency versions --> + <junit.jupiter.version>5.14.4</junit.jupiter.version> + <sigtest.version>2.7</sigtest.version> + + <!-- Plugin versions --> + <buildnumber.maven.plugin.version>3.2.0</buildnumber.maven.plugin.version> + <build.helper.maven.plugin.version>3.6.0</build.helper.maven.plugin.version> + <glassfish.copyright.maven.plugin.version>2.4</glassfish.copyright.maven.plugin.version> + <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version> + <spec.version.maven.plugin.version>2.2</spec.version.maven.plugin.version> + <maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version> + <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version> + <maven.source.plugin.version>3.3.1</maven.source.plugin.version> + <maven.javadoc.plugin.version>3.7.0</maven.javadoc.plugin.version> + <maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version> + <spotbugs.version>4.7.3.5</spotbugs.version> + <asciidoctor.maven.plugin.version>3.2.0</asciidoctor.maven.plugin.version> + <asciidoctorj.pdf.version>2.3.23</asciidoctorj.pdf.version> + <maven.release.plugin.version>2.5.2</maven.release.plugin.version> + <maven.scm.provider.gitexe.version>1.9.4</maven.scm.provider.gitexe.version> + <maven.assembly.plugin.version>3.3.0</maven.assembly.plugin.version> + <maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version> + <exec.maven.plugin.version>3.6.3</exec.maven.plugin.version> + <maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version> + <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version> + + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj-pdf</artifactId> + <version>${asciidoctorj.pdf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>${maven.scm.provider.gitexe.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>${buildnumber.maven.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${build.helper.maven.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.glassfish.copyright</groupId> + <artifactId>glassfish-copyright-maven-plugin</artifactId> + <version>${glassfish.copyright.maven.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compiler.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.glassfish.build</groupId> + <artifactId>spec-version-maven-plugin</artifactId> + <version>${spec.version.maven.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>${maven.bundle.plugin.version}</version> + <configuration> + <instructions> + <_noextraheaders>true</_noextraheaders> + </instructions> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>${maven.jar.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>${maven.source.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${maven.javadoc.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>${maven.enforcer.plugin.version}</version> + </plugin> + <plugin> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> + <version>${spotbugs.version}</version> + <configuration> + <skip>${spotbugs.skip}</skip> + <threshold>${spotbugs.threshold}</threshold> + </configuration> + </plugin> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <version>${asciidoctor.maven.plugin.version}</version> + <dependencies> + <dependency> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctorj-pdf</artifactId> + <version>${asciidoctorj.pdf.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>${maven.release.plugin.version}</version> + <configuration> + <mavenExecutorId>forked-path</mavenExecutorId> + <useReleaseProfile>false</useReleaseProfile> + <arguments>${release.arguments}</arguments> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>${maven.scm.provider.gitexe.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>${maven.assembly.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>${maven.dependency.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${maven.surefire.plugin.version}</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/spec/pom.xml b/spec/pom.xml index 6dd03e6..06347a9 100644 --- a/spec/pom.xml +++ b/spec/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2017, 2026 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -16,84 +17,28 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.eclipse.ee4j</groupId> - <artifactId>project</artifactId> - <version>2.0.5</version> - <relativePath/> - </parent> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>jakarta.json</groupId> + + <parent> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>2.2.0-SNAPSHOT</version> + </parent> + <artifactId>jakarta.json-spec</artifactId> <packaging>pom</packaging> - <version>2.2-SNAPSHOT</version> + <name>Jakarta JSON Processing Specification</name> - <properties> - <site.output.dir>${project.build.directory}/staging</site.output.dir> - <maven.site.skip>true</maven.site.skip> - <asciidoctor.maven.plugin.version>2.0.0</asciidoctor.maven.plugin.version> - <asciidoctorj.pdf.version>1.5.3</asciidoctorj.pdf.version> - <!-- Required by org.eclipse.ee4j:project parent POM for Nexus staging deployment --> - <nexus.staging.repository>jsonp-maven2-staging</nexus.staging.repository> - <!-- 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.3</maven.enforcer.plugin.version> - <revisiondate>${maven.build.timestamp}</revisiondate> - </properties> - - <scm> - <connection>scm:git:git@github.com:eclipse-ee4j/jsonp.git</connection> - <developerConnection>scm:git:git@github.com:eclipse-ee4j/jsonp.git</developerConnection> - <url>https://github.com/eclipse-ee4j/jsonp</url> - <tag>HEAD</tag> - </scm> - - <distributionManagement> - <site> - <url>scm:git:git@github.com:eclipse-ee4j/jsonp.git</url> - </site> - </distributionManagement> - <build> <defaultGoal>package</defaultGoal> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${maven.enforcer.plugin.version}</version> - <executions> - <execution> - <id>enforce-versions</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> - <plugin> <groupId>org.asciidoctor</groupId> <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor.maven.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj-pdf</artifactId> - <version>${asciidoctorj.pdf.version}</version> - </dependency> - </dependencies> <executions> <execution> <id>asciidoc-to-html</id> @@ -147,7 +92,7 @@ </execution> </executions> <configuration> - <sourceDocumentName>jsonp-spec.adoc</sourceDocumentName> + <sourceDocumentName>jsonp-spec.adoc</sourceDocumentName> <attributes> <revnumber>${project.version}</revnumber> <revremark>${status}</revremark> @@ -155,24 +100,10 @@ <source-highlighter>coderay</source-highlighter> </attributes> </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.5.2</version> - <configuration> - <mavenExecutorId>forked-path</mavenExecutorId> - <useReleaseProfile>false</useReleaseProfile> - <arguments>${release.arguments}</arguments> - </configuration> - <dependencies> - <dependency> - <groupId>org.apache.maven.scm</groupId> - <artifactId>maven-scm-provider-gitexe</artifactId> - <version>1.9.4</version> - </dependency> - </dependencies> </plugin> <!-- @@ -181,7 +112,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.3.0</version> <inherited>false</inherited> <executions> <execution>
diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml new file mode 100644 index 0000000..5a577e1 --- /dev/null +++ b/tck-dist/pom.xml
@@ -0,0 +1,215 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>2.2.0-SNAPSHOT</version> + </parent> + + <artifactId>jakarta.json-tck-dist</artifactId> + <packaging>pom</packaging> + + <name>Jakarta JSON Processing TCK Distribution</name> + <description>Jakarta JSON Processing TCK distribution bundle</description> + + <dependencies> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-common</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-common</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-common</artifactId> + <version>${project.version}</version> + <classifier>sources</classifier> + <optional>true</optional> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests</artifactId> + <version>${project.version}</version> + <classifier>sources</classifier> + <optional>true</optional> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> + <version>${project.version}</version> + <classifier>sources</classifier> + <optional>true</optional> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>EFTL</id> + <properties> + <license>EFTL</license> + <bundle-name>jakarta-jsonp-tck</bundle-name> + </properties> + </profile> + <profile> + <id>EPL</id> + <properties> + <license>EPL</license> + <bundle-name>jsonp-tck</bundle-name> + </properties> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + </profile> + </profiles> + + <build> + <defaultGoal>package</defaultGoal> + <plugins> + <plugin> + <groupId>org.asciidoctor</groupId> + <artifactId>asciidoctor-maven-plugin</artifactId> + <executions> + <execution> + <id>asciidoc-to-html</id> + <phase>prepare-package</phase> + <goals> + <goal>process-asciidoc</goal> + </goals> + <configuration> + <outputFile>jsonp-tck-users-guide-${project.version}.html</outputFile> + <backend>html5</backend> + <attributes> + <data-uri/> + <toc>left</toc> + </attributes> + </configuration> + </execution> + <execution> + <id>asciidoc-to-pdf</id> + <phase>prepare-package</phase> + <goals> + <goal>process-asciidoc</goal> + </goals> + <configuration> + <outputFile>jsonp-tck-users-guide-${project.version}.pdf</outputFile> + <backend>pdf</backend> + <attributes> + <pdf-stylesdir>${project.basedir}/src/main/theme</pdf-stylesdir> + <pdf-style>jakartaee</pdf-style> + <pagenums/> + <toc/> + <embedAssets>true</embedAssets> + </attributes> + </configuration> + </execution> + </executions> + <configuration> + <sourceDirectory>src/main/asciidoc</sourceDirectory> + <sourceDocumentName>jsonp-tck-users-guide.adoc</sourceDocumentName> + <outputDirectory>${project.build.directory}/generated-docs</outputDirectory> + <attributes> + <doctype>book</doctype> + <status>${status}</status> + <icons>font</icons> + <sectanchors>true</sectanchors> + <idprefix/> + <idseparator>-</idseparator> + <docinfo1>true</docinfo1> + <revnumber>${project.version}</revnumber> + <revremark>${status}</revremark> + <revdate>${maven.build.timestamp}</revdate> + <source-highlighter>coderay</source-highlighter> + </attributes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>distribution</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + <escapeString>\</escapeString> + <appendAssemblyId>false</appendAssemblyId> + <finalName>${bundle-name}-${project.version}</finalName> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
diff --git a/tck/tck-docs/userguide/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png b/tck-dist/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png similarity index 100% rename from tck/tck-docs/userguide/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png rename to tck-dist/src/main/asciidoc/images/jakarta_ee_logo_schooner_color_stacked_default.png Binary files differ
diff --git a/tck/tck-docs/userguide/src/main/asciidoc/jsonp-tck-users-guide.adoc b/tck-dist/src/main/asciidoc/jsonp-tck-users-guide.adoc similarity index 95% rename from tck/tck-docs/userguide/src/main/asciidoc/jsonp-tck-users-guide.adoc rename to tck-dist/src/main/asciidoc/jsonp-tck-users-guide.adoc index 5c09e2f..dea90c4 100644 --- a/tck/tck-docs/userguide/src/main/asciidoc/jsonp-tck-users-guide.adoc +++ b/tck-dist/src/main/asciidoc/jsonp-tck-users-guide.adoc
@@ -1,4 +1,4 @@ -= Eclipse Foundation Technology Compatibility Kit User's Guide: Jakarta JSON Processing, Release {TechnologyVersion} += Jakarta JSON Processing TCK Reference Guide :TechnologyFullName: Jakarta JSON Processing :TechnologyShortName: JSON Processing :LegacyAcronym: JSONP @@ -15,7 +15,7 @@ :JakartaEEVersion: 12.0 :MavenVersion: 3.6.3+ :JunitVersion: 5.7.2+ -:excludeListFileName: tck-docs/TCK-Exclude-List.txt +:excludeListFileName: docs/TCK_Excludes.md :TCKPackageName: jakarta-jsonp-tck-2.2.0.zip :sigTestExample: ee/jakarta/tck/jsonp/signaturetest/jsonp/** :singleTestExample: ee/jakarta/tck/jsonp/api/jsoncoding/ClientTests @@ -42,13 +42,13 @@ test suite for verifying the compatibility of a vendor's implementation of the {TechnologyShortName} {TechnologyVersion} Specification (hereafter referred to as the vendor implementation or VI). -The {TechnologyShortName} TCK uses the Junit framework to run the test suite +The {TechnologyShortName} TCK uses the JUnit framework to run the test suite. [NOTE] ======================================================================= -Note All references to specific Web URLs are given for the sake of your +All references to specific Web URLs are given for the sake of your convenience in locating the resources quickly. These references are always subject to changes that are in many cases beyond the control of the authors of this guide. @@ -56,7 +56,7 @@ ======================================================================= Jakarta EE is a community sponsored and community run program. -Organizations contribute, along side individual contributors who use, evolve +Organizations contribute, alongside individual contributors who use, evolve and assist others. Commercial support is not available through the Eclipse Foundation resources. Please refer to the Eclipse EE4J project site @@ -79,7 +79,7 @@ === Before You Read This Book You should be familiar with the {TechnologyShortName} -{TechnologyVersion}, version {TechnologyVersion} Specification, +{TechnologyVersion} Specification, which can be found at {SpecificationURL}. [#typographic-conventions] @@ -172,9 +172,9 @@ Compatibility test development for a given feature relies on a complete specification and compatible implementation (CI) for that feature. Compatibility testing is not primarily concerned with robustness, -performance, nor ease of use. -[[why-compatibility-testing-is-important]] +performance, or ease of use. +[[why-compatibility-testing-is-important]] ==== Why Compatibility Testing is Important Jakarta platform compatibility is important to different groups involved @@ -262,7 +262,7 @@ is based on the {TechnologyShortName} Specification, Version {TechnologyVersion}. * Compatible Implementation: One {TechnologyShortName} -{TechnologyVersion} Compatible Implementation, {TechnologyRI} is +{TechnologyVersion} Compatible Implementation, {TechnologyRI}, is available from the Eclipse EE4J project (https://projects.eclipse.org/projects/ee4j). See the CI documentation page at {TechnologyRIURL} for more information. @@ -318,17 +318,17 @@ [[exclude-lists]] ==== Exclude Lists -Each version of a TCK includes an Exclude List contained in a `TCK-Exclude-List.txt` -file. +Each version of a TCK includes an Exclude List contained in a `TCK_Excludes.md` +file. This is a list of test file URLs that identify tests which do not -have to be run for the specific version of the TCK being used. -Whenever tests are run, the Junit framework automatically excludes -these tests from being executed as those are disabled using '@Disabled' tag in JUnit. +have to be run for the specific version of the TCK being used. +Whenever tests are run, the JUnit framework automatically excludes +these tests from being executed because they are disabled using the `@Disabled` annotation in JUnit. A vendor's compatible implementation is not required to pass or run any test on the Exclude List. The Exclude List file, +{excludeListFileName}+, is documented in the {TechnologyShortName} TCK. Please note this file is not parsed to exclude any test and is only -for documentation purpose. +for documentation purposes. [NOTE] @@ -367,7 +367,7 @@ Vendors are not permitted to alter or modify Exclude Lists. Changes to an Exclude List can only be made by using the procedure described in -<<CJAJEAEI,Section 2.3.1, "TCK Test Appeals Steps.">>. +<<CJAJEAEI,Section 2.3.3, "TCK Test Appeals Steps.">>. ======================================================================= @@ -379,19 +379,19 @@ and run the {TechnologyShortName} tests, as described in <<GBFVV,Chapter 4, "Setup and Configuration.">>. -[[GBFQW,getting-started-with-the-tck]] [NOTE] ==== -The Jakarta EE Specification Process support multiple compatible implementations. +The Jakarta EE Specification Process supports multiple compatible implementations. These instructions explain how to get started with the {TechnologyRI} CI. If you are using another compatible implementation, refer to material provided by that implementation for specific instructions and procedures. ==== +[[GBFQW,getting-started-with-the-tck]] === Getting Started With the TCK -This section provides an general overview of what needs to be done to +This section provides a general overview of what needs to be done to install, set up, test, and use the {TechnologyShortName} TCK. These steps are explained in more detail in subsequent chapters of this guide. @@ -723,7 +723,7 @@ * Claims the TCK is inadequate or missing assertions required by the specification. See the Improvement section, which is outside the scope of test challenges. * Challenges that do not represent a consensus of the implementing community will be closed until such time that the community does agree or agreement cannot be made. The test challenge process is not the place for implementations to initiate their own internal discussions. * Challenges to tests that are already excluded for any reason. -* Challenges that an excluded test should not have been excluded and should be re-added should be opened as a new enhancement request +* Challenges that an excluded test should not have been excluded and should be re-added should be opened as a new enhancement request. Test challenges must be made in writing via the {TechnologyShortName} specification project issue tracker as described in <<CJAJEAEI,Section 2.3.3, "TCK Test Appeals Steps.">>. @@ -756,13 +756,13 @@ A consensus that a test produces invalid results will result in the exclusion of that test from certification requirements, and an immediate update and release of an official distribution of the TCK including the new exclude list. The associated `challenge` issue must be closed with an `accepted` label to indicate it has been resolved. 4. Rejected Challenges and Remedy. + -When a`challenge` issue is rejected, it must be closed with a label of `invalid` to indicate it has been rejected. -There appeal process for challenges rejected on technical terms is outlined in Escalation Appeal. +When a `challenge` issue is rejected, it must be closed with a label of `invalid` to indicate it has been rejected. +The appeal process for challenges rejected on technical terms is outlined in Escalation Appeal. If, however, an implementer feels the TCK challenge process was not followed, an appeal issue should be filed with specification project's TCK issue tracker using the label `challenge-appeal`. A project lead should escalate the issue with the Jakarta EE Specification Committee via email (jakarta.ee-spec@eclipse.org). The committee will evaluate the matter purely in terms of due process. -If the appeal is accepted, the original TCK challenge issue will be reopened and a label of `appealed-challenge` added, along with a discussion of the appeal decision, and the `challenge-appeal` issue with be closed. -If the appeal is rejected, the `challenge-appeal` issue should closed with a label of `invalid`. +If the appeal is accepted, the original TCK challenge issue will be reopened and a label of `appealed-challenge` added, along with a discussion of the appeal decision, and the `challenge-appeal` issue will be closed. +If the appeal is rejected, the `challenge-appeal` issue should be closed with a label of `invalid`. 5. Escalation Appeal. + If there is a concern that a TCK process issue has not been resolved satisfactorily, the @@ -803,11 +803,11 @@ [NOTE] ======================================================================= -Although the {TechnologyShortName} {TechnologyVersion} TCK is not -depended on any particular build tool, it is convenient to install -Apache Maven {MavenVersion} for setup and execution of tests. -Any other build tools like Gradle and JUnit 5 Console Runner can also -be used that is Jupiter API compatible. +Although the {TechnologyShortName} {TechnologyVersion} TCK does not +depend on any particular build tool, it is convenient to install +Apache Maven {MavenVersion} for setup and execution of tests. +Any other Jupiter API compatible build tool, such as Gradle or the +JUnit 5 Console Launcher, can also be used. ======================================================================= @@ -817,7 +817,7 @@ Each compatible implementation (CI) will provide instructions for obtaining their implementation. {TechnologyRI} is a compatible implementation which may be obtained -from {TechnologyRIURL} +from {TechnologyRIURL}. [[installing-the-software]] === Installing the Software @@ -828,7 +828,7 @@ * Java SE {SEversion} * A CI for {TechnologyShortName} {TechnologyVersion}, one example is {TechnologyRI} * The {TechnologyShortName} {TechnologyVersion} Vendor Implementation (VI) -* Any Jupiter API compatible test runner (eg. Apache Maven {MavenVersion}) +* Any Jupiter API compatible test runner (e.g., Apache Maven {MavenVersion}) Follow these steps: @@ -839,8 +839,8 @@ additional information. . Install the build tool that will be used to run the TCK, if it is not already installed. + -It will be convenient to use Apache Maven {MavenVersion} for running the tests. The test kit -is not depended on Maven, any build tool compatible with Jupiter API is suffitient. +It will be convenient to use Apache Maven {MavenVersion} for running the tests. The test kit +does not depend on Maven; any build tool compatible with the Jupiter API is sufficient. . Install the {TechnologyShortName} TCK {TechnologyVersion} software. a. Copy or download the {TechnologyShortName} TCK software to your @@ -874,7 +874,7 @@ ==== -This chapter describes how to set up the {TechnologyShortName} TCK . +This chapter describes how to set up the {TechnologyShortName} TCK. Before proceeding with the instructions in this chapter, be sure to install all required software, as described in <<GBFTP,Chapter 3, "Installation.">>. @@ -885,11 +885,11 @@ [NOTE] ==== -The {TechnologyShortName} TCK is not depended on any particular build -tool to run the tests. It will be convenient and advisable to create a -Apache Maven project to setup and run the TCK. -This chapter will henceforth use instructions and steps to provide setup -with Apache Maven as a build tool. +The {TechnologyShortName} TCK does not depend on any particular build +tool to run the tests. It will be convenient and advisable to create an +Apache Maven project to set up and run the TCK. +This chapter will henceforth use instructions and steps to provide setup +with Apache Maven as a build tool. ==== [[GBFVU,configuring-your-environment-to-run-the-tck-against-the-reference-implementation]] @@ -1094,14 +1094,14 @@ [[GBFWO,executing-tests]] == Executing Tests -The {TechnologyShortName} TCK uses the Junit +The {TechnologyShortName} TCK uses the JUnit framework to execute the tests. This chapter includes the following topics: -* <<GBFUZ,Running All Tests>> +* <<GBFUZ,Starting the Tests>> * <<GBFWM,Running a Subset of the Tests>> -* <<GCLRR,Running the TCK Against your selected CI>> +* <<GCLRR,Running the TCK Against another CI>> * <<GCLRZ,Running the TCK Against a Vendor's Implementation>> * <<GBFVK,Test Reports>> @@ -1126,7 +1126,7 @@ [[GBFUZ,starting-javatest]] -=== Starting the tests +=== Starting the Tests The {TechnologyShortName} TCK can be run from the command line in your shell environment by executing tests from the TCK jar. @@ -1245,7 +1245,7 @@ A set of report files is created for every test run. These report files can be found in the target directory that the test is run. After a test run is -completed, the Junit framework writes reports for the test run. +completed, the JUnit framework writes reports for the test run. [[GBFUV,debugging-test-problems]] @@ -1267,13 +1267,13 @@ contains tests with errors or failing results, you must troubleshoot and correct the cause to satisfactorily complete the test run. -* Errors: Tests with errors could not be executed by the Junit +* Errors: Tests with errors could not be executed by the JUnit framework. These errors usually occur because the test environment is not properly configured. * Failures: Tests that fail were executed but had failing results. -For every test run, the Junit framework creates a set of report files +For every test run, the JUnit framework creates a set of report files in the target directory. @@ -1296,7 +1296,7 @@ * <<GBFYQ,Where do I start to debug a test failure?>> * <<GBFYR,How do I restart a crashed test run?>> -* <<GBFWU,What would cause tests be added to the exclude list?>> +* <<GBFWU,What would cause tests to be added to the exclude list?>> [[GBFYQ,a.1-where-do-i-start-to-debug-a-test-failure]] === Where do I start to debug a test failure? @@ -1320,7 +1320,7 @@ report to include results from all such partial runs. [[GBFWU,a.3-what-would-cause-tests-be-added-to-the-exclude-list]] -=== What would cause tests be added to the exclude list? +=== What would cause tests to be added to the exclude list? The JavaTest exclude file (+{excludeListFileName}+) contains all tests that are not required to be run. The following is a list of reasons for a test to be
diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml new file mode 100644 index 0000000..406b66a --- /dev/null +++ b/tck-dist/src/main/assembly/assembly.xml
@@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> + +<assembly xmlns="https://maven.apache.org/ASSEMBLY/2.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> + + <id>distribution</id> + + <formats> + <format>zip</format> + </formats> + + <files> + <!-- license --> + <file> + <source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source> + <destName>LICENSE.md</destName> + </file> + <!-- README.md --> + <file> + <source>${project.basedir}/src/main/resources/README.md</source> + <outputDirectory>docs</outputDirectory> + </file> + <!-- excludes --> + <file> + <source>${project.basedir}/src/main/resources/TCK_Excludes.md</source> + <outputDirectory>docs</outputDirectory> + </file> + </files> + + <fileSets> + <fileSet> + <directory>${project.basedir}/src/main/resources/assertions</directory> + <outputDirectory>docs/assertions</outputDirectory> + </fileSet> + <fileSet> + <directory>${project.build.directory}/generated-docs</directory> + <outputDirectory>docs/html-usersguide</outputDirectory> + <includes> + <include>jsonp-tck-users-guide-*.html</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/generated-docs</directory> + <outputDirectory>docs/pdf-usersguide</outputDirectory> + <includes> + <include>jsonp-tck-users-guide-*.pdf</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.build.scriptSourceDirectory}</directory> + <outputDirectory>artifacts</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>**/*.sh</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/tck-run</directory> + <outputDirectory>bin</outputDirectory> + <includes> + <include>**/*.xml</include> + </includes> + <filtered>true</filtered> + </fileSet> + </fileSets> + <dependencySets> + <dependencySet> + <includes> + <include>jakarta.json:jakarta.json-parent</include> + <include>jakarta.json:jakarta.json-api</include> + <include>jakarta.json:jakarta.json-tck</include> + <include>jakarta.json:jakarta.json-tck-common</include> + <include>jakarta.json:jakarta.json-tck-tests</include> + <include>jakarta.json:jakarta.json-tck-tests-pluggability</include> + </includes> + <useTransitiveDependencies>false</useTransitiveDependencies> + <outputDirectory>artifacts</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + </dependencySets> + +</assembly>
diff --git a/tck/tck-dist-eftl/src/main/resources/LICENSE.md b/tck-dist/src/main/resources/LICENSE_EFTL.md similarity index 100% rename from tck/tck-dist-eftl/src/main/resources/LICENSE.md rename to tck-dist/src/main/resources/LICENSE_EFTL.md
diff --git a/tck/tck-dist-epl/src/main/resources/LICENSE.md b/tck-dist/src/main/resources/LICENSE_EPL.md similarity index 100% rename from tck/tck-dist-epl/src/main/resources/LICENSE.md rename to tck-dist/src/main/resources/LICENSE_EPL.md
diff --git a/tck/tck-docs/resources/README.md b/tck-dist/src/main/resources/README.md similarity index 100% rename from tck/tck-docs/resources/README.md rename to tck-dist/src/main/resources/README.md
diff --git a/tck-dist/src/main/resources/TCK_Excludes.md b/tck-dist/src/main/resources/TCK_Excludes.md new file mode 100644 index 0000000..a4da8c8 --- /dev/null +++ b/tck-dist/src/main/resources/TCK_Excludes.md
@@ -0,0 +1,20 @@ +<!-- + + Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> + +
diff --git a/tck/tck-docs/resources/assertions/JavadocAssertions.md b/tck-dist/src/main/resources/assertions/JavadocAssertions.md similarity index 100% rename from tck/tck-docs/resources/assertions/JavadocAssertions.md rename to tck-dist/src/main/resources/assertions/JavadocAssertions.md
diff --git a/tck-dist/src/main/scripts/artifact-install.sh b/tck-dist/src/main/scripts/artifact-install.sh new file mode 100755 index 0000000..bf84f56 --- /dev/null +++ b/tck-dist/src/main/scripts/artifact-install.sh
@@ -0,0 +1,100 @@ +#!/usr/bin/env bash +# +# Copyright (c) 2021, 2025 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 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 +# http://www.eclipse.org/legal/epl-2.0. +# +# This Source Code may also be made available under the following Secondary +# Licenses when the conditions for such availability set forth in the +# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, +# version 2 with the GNU Classpath Exception, which is available at +# https://www.gnu.org/software/classpath/license.html. +# +# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 +# + +##script to install the artifact directory contents into a local maven repository + +# This script is distributed alongside the artifacts, so operate from its directory +cd "$(dirname "${BASH_SOURCE[0]}")" || exit 1 + +if [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then + VERSION="$1" +else + # Derive the version from the project parent pom file name: + # jakarta.json-parent-<version>.pom + VERSION="" + for f in jakarta.json-parent-*.pom; do + [[ -e $f ]] || continue + VERSION="${f#jakarta.json-parent-}" + VERSION="${VERSION%.pom}" + break + done + if [[ -z $VERSION ]]; then + echo "Unable to determine TCK version: no jakarta.json-parent-<version>.pom found in $(pwd)" >&2 + exit 1 + fi +fi + +# Project parent pom +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-parent-"$VERSION".pom -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-parent -Dversion="$VERSION" -Dpackaging=pom + +# Jakarta JSON API jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-api-"$VERSION".jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-api -Dversion="$VERSION" -Dpackaging=jar + +# TCK parent pom +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-"$VERSION".pom -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck -Dversion="$VERSION" -Dpackaging=pom + +# TCK common pom +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-common-"$VERSION".pom -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-common -Dversion="$VERSION" -Dpackaging=pom + +# TCK common jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-common-"$VERSION".jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-common -Dversion="$VERSION" -Dpackaging=jar + +# TCK common sources jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-common-"$VERSION"-sources.jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-common-sources -Dversion="$VERSION" -Dpackaging=jar + +# TCK tests pom +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-tests-"$VERSION".pom -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-tests -Dversion="$VERSION" -Dpackaging=pom + +# TCK tests jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-tests-"$VERSION".jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-tests -Dversion="$VERSION" -Dpackaging=jar + +# TCK tests sources jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-tests-"$VERSION"-sources.jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-tests-sources -Dversion="$VERSION" -Dpackaging=jar + +# TCK tests pluggability pom +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-tests-pluggability-"$VERSION".pom -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-tests-pluggability -Dversion="$VERSION" -Dpackaging=pom + +# TCK tests pluggability jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-tests-pluggability-"$VERSION".jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-tests-pluggability -Dversion="$VERSION" -Dpackaging=jar + +# TCK tests pluggability sources jar +mvn org.apache.maven.plugins:maven-install-plugin:3.2.0:install-file \ +-Dfile=jakarta.json-tck-tests-pluggability-"$VERSION"-sources.jar -DgroupId=jakarta.json \ +-DartifactId=jakarta.json-tck-tests-pluggability-sources -Dversion="$VERSION" -Dpackaging=jar
diff --git a/tck/tck-dist-eftl/src/main/bin/pom.xml b/tck-dist/src/main/tck-run/pom.xml similarity index 67% rename from tck/tck-dist-eftl/src/main/bin/pom.xml rename to tck-dist/src/main/tck-run/pom.xml index 3522567..5242d2c 100644 --- a/tck/tck-dist-eftl/src/main/bin/pom.xml +++ b/tck-dist/src/main/tck-run/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2022, 2025 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -16,56 +17,57 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> - <groupId>org.eclipse.ee4j</groupId> - <artifactId>project</artifactId> - <version>1.0.7</version> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>${project.version}</version> <relativePath/> </parent> - <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-impl</artifactId> - <version>${project.version}</version> <packaging>pom</packaging> + <properties> - <!-- Vendor Implementation (VI) --> - <jsonp-api.groupId>jakarta.json</jsonp-api.groupId> - <jsonp-api.artifactId>jakarta.json-api</jsonp-api.artifactId> - <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> <jsonp-impl.version>1.1.8</jsonp-impl.version> - <!-- TCK --> - <jakarta.json-tck.version>${project.version}</jakarta.json-tck.version> - <!-- properties --> + + <!-- project properties --> <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.2.0</jakarta.json-api.version> - <impl.alltests>true</impl.alltests> + </properties> + <dependencyManagement> <dependencies> <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck</artifactId> - <version>\${jakarta.json-tck.version}</version> + <version>${project.version}</version> <type>pom</type> <scope>import</scope> </dependency> </dependencies> </dependencyManagement> + <modules> <module>tck-tests</module> <module>tck-tests-pluggability</module> </modules> + <dependencies> <dependency> - <groupId>\${jsonp-api.groupId}</groupId> - <artifactId>\${jsonp-api.artifactId}</artifactId> - <version>\${jsonp-api.version}</version> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> @@ -79,6 +81,7 @@ <scope>test</scope> </dependency> </dependencies> + <build> <defaultGoal>verify</defaultGoal> <pluginManagement> @@ -86,13 +89,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.2.0</version> <configuration> <artifactItems> <artifactItem> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> - <version>\${jakarta.json-api.version}</version> + <version>${project.version}</version> <type>jar</type> <overWrite>true</overWrite> <outputDirectory>\${project.build.directory}/signaturedirectory</outputDirectory> @@ -104,16 +106,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.0.0-M5</version> <configuration> <useModulePath>false</useModulePath> <trimStackTrace>false</trimStackTrace> - <failIfNoTests>\${impl.alltests}</failIfNoTests> + <failIfNoTests>true</failIfNoTests> <forkCount>1</forkCount> <reuseForks>false</reuseForks> <systemPropertyVariables> <jimage.dir>\${jimage.dir}</jimage.dir> - <signature.sigTestClasspath>\${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming + <signature.sigTestClasspath> + \${project.build.directory}/signaturedirectory/jakarta.json-api.jar:\${jimage.dir}/java.base:\${jimage.dir}/java.rmi:\${jimage.dir}/java.sql:\${jimage.dir}/java.naming </signature.sigTestClasspath> </systemPropertyVariables> </configuration> @@ -121,17 +123,4 @@ </plugins> </pluginManagement> </build> - <profiles> - <profile> - <id>single-test</id> - <activation> - <property> - <name>test</name> - </property> - </activation> - <properties> - <impl.alltests>false</impl.alltests> - </properties> - </profile> - </profiles> </project> \ No newline at end of file
diff --git a/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml b/tck-dist/src/main/tck-run/tck-tests-pluggability/pom.xml similarity index 92% rename from tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml rename to tck-dist/src/main/tck-run/tck-tests-pluggability/pom.xml index 80a0d74..0b14770 100644 --- a/tck/tck-dist-eftl/src/main/bin/tck-tests-pluggability/pom.xml +++ b/tck-dist/src/main/tck-run/tck-tests-pluggability/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -22,9 +23,10 @@ <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-impl</artifactId> <version>${project.version}</version> - <relativePath>../pom.xml</relativePath> </parent> - <artifactId>tck-tests-pluggability</artifactId> + + <artifactId>jakarta.json-tck-impl-tests-pluggability</artifactId> + <dependencies> <dependency> <groupId>jakarta.json</groupId> @@ -32,6 +34,7 @@ <scope>test</scope> </dependency> </dependencies> + <build> <plugins> <plugin>
diff --git a/tck/tck-dist-eftl/src/main/bin/tck-tests/pom.xml b/tck-dist/src/main/tck-run/tck-tests/pom.xml similarity index 92% rename from tck/tck-dist-eftl/src/main/bin/tck-tests/pom.xml rename to tck-dist/src/main/tck-run/tck-tests/pom.xml index f913b3f..ca44aad 100644 --- a/tck/tck-dist-eftl/src/main/bin/tck-tests/pom.xml +++ b/tck-dist/src/main/tck-run/tck-tests/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -26,10 +27,9 @@ <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-impl</artifactId> <version>${project.version}</version> - <relativePath>../pom.xml</relativePath> </parent> - <artifactId>tck-tests</artifactId> + <artifactId>jakarta.json-tck-impl-tests</artifactId> <dependencies> <dependency> @@ -44,8 +44,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.netbeans.tools</groupId> + <groupId>jakarta.tck</groupId> <artifactId>sigtest-maven-plugin</artifactId> + <version>${sigtest.version}</version> <scope>test</scope> </dependency> </dependencies>
diff --git a/tck/tck-docs/userguide/src/theme/jakartaee-theme.yml b/tck-dist/src/main/theme/jakartaee-theme.yml similarity index 100% rename from tck/tck-docs/userguide/src/theme/jakartaee-theme.yml rename to tck-dist/src/main/theme/jakartaee-theme.yml
diff --git a/tck/pom.xml b/tck/pom.xml index adc13ba..5c87af8 100644 --- a/tck/pom.xml +++ b/tck/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2020, 2026 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -16,65 +17,38 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.eclipse.ee4j</groupId> - <artifactId>project</artifactId> - <version>2.0.5</version> - <relativePath/> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-parent</artifactId> + <version>2.2.0-SNAPSHOT</version> </parent> - <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck</artifactId> - <version>2.2.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Jakarta JSON Processing TCK</name> - <description>Jakarta JSON Processing TCK</description> + + <name>Jakarta JSON Processing TCK Parent</name> + <description>Jakarta JSON Processing TCK Parent</description> <modules> <module>tck-common</module> <module>tck-tests</module> <module>tck-tests-pluggability</module> - <module>tck-docs</module> - <module>tck-dist-eftl</module> - <module>tck-dist-epl</module> </modules> - <licenses> - <license> - <name>Eclipse Public License 2.0</name> - <url>https://projects.eclipse.org/license/epl-2.0</url> - <distribution>repo</distribution> - </license> - <license> - <name>GNU General Public License, version 2 with the GNU Classpath Exception</name> - <url>https://projects.eclipse.org/license/secondary-gpl-2.0-cp</url> - <distribution>repo</distribution> - </license> - </licenses> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- Required by org.eclipse.ee4j:project parent POM for Nexus staging deployment --> - <nexus.staging.repository>jsonp-maven2-staging</nexus.staging.repository> - <maven.compiler.release>17</maven.compiler.release> - <junit.jupiter.version>5.14.4</junit.jupiter.version> - - <jakarta.json-api.version>2.2.0</jakarta.json-api.version> - <asciidoctor.maven.plugin.version>3.2.0</asciidoctor.maven.plugin.version> - <asciidoctorj.pdf.version>2.3.23</asciidoctorj.pdf.version> - - <!-- Plugin versions for signature generation --> - <sigtest.version>2.3</sigtest.version> - <maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version> - </properties> - <dependencyManagement> <dependencies> <dependency> <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-common</artifactId> <version>${project.version}</version> </dependency> @@ -89,22 +63,12 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-ug</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.netbeans.tools</groupId> <artifactId>sigtest-maven-plugin</artifactId> <version>1.6</version> </dependency> <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-api</artifactId> - <version>${jakarta.json-api.version}</version> - </dependency> - <dependency> <groupId>org.junit</groupId> <artifactId>junit-bom</artifactId> <version>${junit.jupiter.version}</version> @@ -114,77 +78,23 @@ </dependencies> </dependencyManagement> - <dependencies> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - </dependency> - </dependencies> - <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.8.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>3.7.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>3.5.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>3.7.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> <profiles> - <profile> - <!--This profile can be used to (re)generate signatures of th JSON Processing - API, note that they differ based on JDK used to build them --> - <!--All .sig files should be included in the generated jar files! --> + <profile> + <!-- + ~ This profile can be used to (re)generate signatures of Jakarta JSON Processing API. + ~ Note that they differ based on JDK used to build them + ~ All .sig files should be included in the generated jar files! + --> <id>signature-generation</id> <activation> <property> @@ -193,37 +103,42 @@ </activation> <properties> <!--Default assumed JDK version, can be overridden via -Djdk.major.version=X --> - <jdk.major.version>17</jdk.major.version> + <jdk.major.version>${maven.compiler.release}</jdk.major.version> </properties> + <dependencies> + <!-- API classes are picked up by sigtest-maven-plugin from the project classpath --> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <build> <plugins> + <!-- Extract JDK modules into output directory for use by signature plugin --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>${exec.maven.plugin.version}</version> <executions> <execution> - <id>unpack</id> + <id>extractModules</id> <phase>generate-sources</phase> <goals> - <goal>unpack</goal> + <goal>exec</goal> </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-api</artifactId> - <version>${jakarta.json-api.version}</version> - <type>jar</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/json-api</outputDirectory> - <includes>**/*.class,**/*.xml</includes> - </artifactItem> - </artifactItems> - </configuration> </execution> </executions> + <configuration> + <executable>jimage</executable> + <arguments> + <argument>extract</argument> + <argument>--dir=${project.build.directory}/jimage</argument> + <argument>${java.home}/lib/modules</argument> + </arguments> + </configuration> </plugin> - + <!-- Run signature plugin to generate signature file --> <plugin> <groupId>jakarta.tck</groupId> @@ -239,17 +154,19 @@ </execution> </executions> <configuration> - <classes>${project.build.directory}/json-api</classes> + <!-- Only a single directory is supported; the API jar is added via the provided dependency --> + <classes>${project.build.directory}/jimage/java.base</classes> <packages> jakarta.json, jakarta.json.spi, - jakarta.json.stream, + jakarta.json.stream </packages> + <version>${project.version}</version> <attach>false</attach> <sigfile>${project.build.directory}/jakarta.json.sig_${jdk.major.version}</sigfile> </configuration> </plugin> - + <!-- Copy signature file to tck resources with major java version --> <plugin> <groupId>org.apache.maven.plugins</groupId>
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml index c1bf844..7836319 100644 --- a/tck/tck-common/pom.xml +++ b/tck/tck-common/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2021, 2025 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -16,19 +17,29 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck</artifactId> <version>2.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> - <artifactId>jakarta.json-tck-common</artifactId> + <name>Jakarta JSON Processing TCK Common</name> + + <dependencies> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + </dependency> + </dependencies> + <build> <plugins> <plugin>
diff --git a/tck/tck-dist-eftl/pom.xml b/tck/tck-dist-eftl/pom.xml deleted file mode 100644 index 6f1b55c..0000000 --- a/tck/tck-dist-eftl/pom.xml +++ /dev/null
@@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> - <version>2.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-dist-eftl</artifactId> - <packaging>pom</packaging> - <name>JSONP TCK EFTL Distribution</name> - - <licenses> - <license> - <name>Eclipse Foundation Technology Compatibility Kit License - v 1.0</name> - <distribution>manual</distribution> - <url>https://www.eclipse.org/legal/tck.php</url> - </license> - </licenses> - - <properties> - <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo> - <maven.deploy.skip>true</maven.deploy.skip> - <maven.install.skip>true</maven.install.skip> - </properties> - - <dependencies> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-ug</artifactId> - <version>${project.version}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-common</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-common</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-common</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <optional>true</optional> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <optional>true</optional> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-pluggability</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-pluggability</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-pluggability</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <optional>true</optional> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <escapeString>\</escapeString> - <appendAssemblyId>false</appendAssemblyId> - <finalName>jakarta-jsonp-tck-${project.version}</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/tck/tck-dist-eftl/src/main/assembly/assembly.xml b/tck/tck-dist-eftl/src/main/assembly/assembly.xml deleted file mode 100644 index fc16642..0000000 --- a/tck/tck-dist-eftl/src/main/assembly/assembly.xml +++ /dev/null
@@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (c) 2021, 2022 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> - -<assembly xmlns="https://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - <id>distribution</id> - <baseDirectory>jsonp-tck</baseDirectory> - <formats> - <format>zip</format> - </formats> - - <fileSets> - <fileSet> - <!-- license --> - <directory>${project.basedir}/src/main/resources</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.build.scriptSourceDirectory}</directory> - <outputDirectory>artifacts</outputDirectory> - <fileMode>0755</fileMode> - <includes> - <include>**/*.sh</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/bin</directory> - <outputDirectory>bin</outputDirectory> - <includes> - <include>**/*.xml</include> - </includes> - <filtered>true</filtered> - </fileSet> - </fileSets> - <dependencySets> - <dependencySet> - <includes> - <include>jakarta.json:jakarta.json-tck</include> - <include>jakarta.json:jakarta.json-tck-common</include> - <include>jakarta.json:jakarta.json-tck-tests</include> - <include>jakarta.json:jakarta.json-tck-tests-pluggability</include> - </includes> - <useTransitiveDependencies>false</useTransitiveDependencies> - <outputDirectory>artifacts</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - <dependencySet> - <includes> - <include>jakarta.json:jakarta.json-tck-ug</include> - </includes> - <unpack>true</unpack> - <outputDirectory>docs/</outputDirectory> - </dependencySet> - </dependencySets> - -</assembly>
diff --git a/tck/tck-dist-eftl/src/main/scripts/artifact-install.sh b/tck/tck-dist-eftl/src/main/scripts/artifact-install.sh deleted file mode 100755 index bd5fe5c..0000000 --- a/tck/tck-dist-eftl/src/main/scripts/artifact-install.sh +++ /dev/null
@@ -1,74 +0,0 @@ -#!/usr/bin/env bash -# -# 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 -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -##script to install the artifact directory contents into a local maven repository - -if [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then - VERSION="$1" -else - VERSION="2.2.0-SNAPSHOT" -fi - -# Parent pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-"$VERSION".pom -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck -Dversion="$VERSION" -Dpackaging=pom - -# pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-common-"$VERSION".pom -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-common -Dversion="$VERSION" -Dpackaging=pom - -# jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-common-"$VERSION".jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-common -Dversion="$VERSION" -Dpackaging=jar - -# sources jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-common-"$VERSION"-sources.jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-common-sources -Dversion="$VERSION" -Dpackaging=jar - -# pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-"$VERSION".pom -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests -Dversion="$VERSION" -Dpackaging=pom - -# jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-"$VERSION".jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests -Dversion="$VERSION" -Dpackaging=jar - -# sources jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-"$VERSION"-sources.jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-sources -Dversion="$VERSION" -Dpackaging=jar - -# pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-pluggability-"$VERSION".pom -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-pluggability -Dversion="$VERSION" -Dpackaging=pom - -# jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-pluggability-"$VERSION".jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-pluggability -Dversion="$VERSION" -Dpackaging=jar - -# sources jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-pluggability-"$VERSION"-sources.jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-pluggability-sources -Dversion="$VERSION" -Dpackaging=jar
diff --git a/tck/tck-dist-epl/pom.xml b/tck/tck-dist-epl/pom.xml deleted file mode 100644 index a33a62f..0000000 --- a/tck/tck-dist-epl/pom.xml +++ /dev/null
@@ -1,166 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> - <version>2.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-dist-epl</artifactId> - <packaging>pom</packaging> - <name>JSONP TCK EPL Distribution</name> - - <licenses> - <license> - <name>Eclipse Public License - v 2.0</name> - <distribution>repo</distribution> - <url>https://www.eclipse.org/legal/epl-2.0/</url> - </license> - </licenses> - - <dependencies> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-ug</artifactId> - <version>${project.version}</version> - <type>zip</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-common</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-common</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-common</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <optional>true</optional> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <optional>true</optional> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-pluggability</artifactId> - <version>${project.version}</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-pluggability</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-pluggability</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <optional>true</optional> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <id>unpack</id> - <phase>package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-dist-eftl</artifactId> - <version>${project.version}</version> - <type>zip</type> - <overWrite>true</overWrite> - <excludes>**/LICENSE.md</excludes> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.directory}/generated</outputDirectory> - <overWriteSnapshots>true</overWriteSnapshots> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - <finalName>jsonp-tck-${project.version}</finalName> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project>
diff --git a/tck/tck-dist-epl/src/main/assembly/assembly.xml b/tck/tck-dist-epl/src/main/assembly/assembly.xml deleted file mode 100644 index fa4d322..0000000 --- a/tck/tck-dist-epl/src/main/assembly/assembly.xml +++ /dev/null
@@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (c) 2022 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> - -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - <id>distribution</id> - <baseDirectory>jsonp-tck</baseDirectory> - <formats> - <format>zip</format> - </formats> - - <fileSets> - <fileSet> - <!-- license --> - <directory>${project.basedir}/src/main/resources</directory> - <outputDirectory>.</outputDirectory> - <includes> - <include>*</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.build.directory}/generated/jsonp-tck</directory> - <outputDirectory>.</outputDirectory> - </fileSet> - </fileSets> -</assembly>
diff --git a/tck/tck-docs/TCK-Exclude-List.txt b/tck/tck-docs/TCK-Exclude-List.txt deleted file mode 100644 index 9989db2..0000000 --- a/tck/tck-docs/TCK-Exclude-List.txt +++ /dev/null
@@ -1,17 +0,0 @@ -# -# Copyright (c) 2021 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 -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -
diff --git a/tck/tck-docs/pom.xml b/tck/tck-docs/pom.xml deleted file mode 100644 index e0a8a36..0000000 --- a/tck/tck-docs/pom.xml +++ /dev/null
@@ -1,157 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> - <version>2.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>jakarta.json-tck-ug</artifactId> - <packaging>pom</packaging> - <name>JSONP TCK Docs</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- status: DRAFT, BETA, etc., or blank for final --> - <status>DRAFT</status> - <maven.build.timestamp.format>MMMM dd, yyyy</maven.build.timestamp.format> - <technology.version>2.2</technology.version> - <maven-enforcer-plugin.version>3.0.0-M3</maven-enforcer-plugin.version> - <maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version> - <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version> - </properties> - - <build> - <defaultGoal>package</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${maven-enforcer-plugin.version}</version> - <executions> - <execution> - <id>enforce-versions</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> - <plugin> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctor-maven-plugin</artifactId> - <version>${asciidoctor.maven.plugin.version}</version> - <dependencies> - <dependency> - <groupId>org.asciidoctor</groupId> - <artifactId>asciidoctorj-pdf</artifactId> - <version>${asciidoctorj.pdf.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>asciidoc-to-html</id> - <phase>prepare-package</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - <configuration> - <outputFile>jsonp-tck-users-guide-${project.version}.html</outputFile> - <backend>html5</backend> - <attributes> - <data-uri/> - <toc>left</toc> - </attributes> - </configuration> - </execution> - <execution> - <id>asciidoc-to-pdf</id> - <phase>prepare-package</phase> - <goals> - <goal>process-asciidoc</goal> - </goals> - <configuration> - <outputFile>jsonp-tck-users-guide-${project.version}.pdf</outputFile> - <backend>pdf</backend> - <attributes> - <pdf-stylesdir>${project.basedir}/userguide/src/theme</pdf-stylesdir> - <pdf-style>jakartaee</pdf-style> - <pagenums/> - <toc/> - <embedAssets>true</embedAssets> - </attributes> - </configuration> - </execution> - </executions> - <configuration> - <sourceDirectory>userguide/src/main/asciidoc</sourceDirectory> - <sourceDocumentName>jsonp-tck-users-guide.adoc</sourceDocumentName> - <outputDirectory>${project.build.directory}/generated-docs</outputDirectory> - <attributes> - <doctype>book</doctype> - <status>${status}</status> - <icons>font</icons> - <sectanchors>true</sectanchors> - <idprefix/> - <idseparator>-</idseparator> - <docinfo1>true</docinfo1> - <revnumber>${project.version}</revnumber> - <revremark>${status}</revremark> - <revdate>${maven.build.timestamp}</revdate> - <source-highlighter>coderay</source-highlighter> - </attributes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <executions> - <execution> - <id>distribution</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>userguide/src/main/assembly/assembly.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - - </build> -</project>
diff --git a/tck/tck-docs/userguide/src/main/assembly/assembly.xml b/tck/tck-docs/userguide/src/main/assembly/assembly.xml deleted file mode 100644 index ea2e3ef..0000000 --- a/tck/tck-docs/userguide/src/main/assembly/assembly.xml +++ /dev/null
@@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Copyright (c) 2022 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 - http://www.eclipse.org/legal/epl-2.0. - - This Source Code may also be made available under the following Secondary - Licenses when the conditions for such availability set forth in the - Eclipse Public License v. 2.0 are satisfied: GNU General Public License, - version 2 with the GNU Classpath Exception, which is available at - https://www.gnu.org/software/classpath/license.html. - - SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ---> - -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - <id>userguides</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>zip</format> - </formats> - - <fileSets> - <fileSet> - <directory>${project.build.directory}/generated-docs</directory> - <outputDirectory>html-usersguide/</outputDirectory> - <includes> - <include>jsonp-tck-users-guide-*.html</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.build.directory}/generated-docs</directory> - <outputDirectory>pdf-usersguide/</outputDirectory> - <includes> - <include>jsonp-tck-users-guide-*.pdf</include> - </includes> - </fileSet> - <fileSet> - <directory>resources/assertions</directory> - <outputDirectory>assertions/</outputDirectory> - <includes> - <include>JavadocAssertions.md</include> - </includes> - </fileSet> - <fileSet> - <directory>resources</directory> - <outputDirectory>./</outputDirectory> - <includes> - <include>README.md</include> - </includes> - </fileSet> - <fileSet> - <directory>./</directory> - <outputDirectory>./</outputDirectory> - <includes> - <include>TCK-Exclude-List.txt</include> - </includes> - </fileSet> - </fileSets> -</assembly>
diff --git a/tck/tck-tests-pluggability/pom.xml b/tck/tck-tests-pluggability/pom.xml index f771d34..cb5d0e5 100644 --- a/tck/tck-tests-pluggability/pom.xml +++ b/tck/tck-tests-pluggability/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2021, 2025 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -16,24 +17,32 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck</artifactId> <version>2.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jakarta.json-tck-tests-pluggability</artifactId> <packaging>jar</packaging> + <name>Jakarta JSON Processing TCK Tests Pluggability</name> + <dependencies> <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-common</artifactId> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> </dependencies> <build>
diff --git a/tck/tck-tests/pom.xml b/tck/tck-tests/pom.xml index b14b85c..9b99979 100644 --- a/tck/tck-tests/pom.xml +++ b/tck/tck-tests/pom.xml
@@ -2,6 +2,7 @@ <!-- Copyright (c) 2020, 2025 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 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 @@ -16,25 +17,33 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck</artifactId> <version>2.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> <artifactId>jakarta.json-tck-tests</artifactId> <packaging>jar</packaging> + <name>Jakarta JSON Processing TCK Tests</name> + <dependencies> <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-common</artifactId> </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + </dependency> </dependencies> <build> @@ -62,6 +71,7 @@ </build> <profiles> + <!-- TODO is this appropriate to have in the spec? --> <profile> <id>tck-tests-ci</id> <dependencies> @@ -95,7 +105,7 @@ <artifactItem> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> - <version>${jakarta.json-api.version}</version> + <version>${project.version}</version> <type>jar</type> <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory>