fix: tck-dist missing poms
diff --git a/tck-dist/pom.xml b/tck-dist/pom.xml index 9aa429f..5a577e1 100644 --- a/tck-dist/pom.xml +++ b/tck-dist/pom.xml
@@ -34,6 +34,18 @@ <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>
diff --git a/tck-dist/src/main/assembly/assembly.xml b/tck-dist/src/main/assembly/assembly.xml index 0848f67..406b66a 100644 --- a/tck-dist/src/main/assembly/assembly.xml +++ b/tck-dist/src/main/assembly/assembly.xml
@@ -74,7 +74,7 @@ </includes> </fileSet> <fileSet> - <directory>${project.basedir}/src/main/bin</directory> + <directory>${project.basedir}/src/main/tck-run</directory> <outputDirectory>bin</outputDirectory> <includes> <include>**/*.xml</include> @@ -85,6 +85,8 @@ <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>
diff --git a/tck-dist/src/main/scripts/artifact-install.sh b/tck-dist/src/main/scripts/artifact-install.sh index bd5fe5c..bf84f56 100755 --- a/tck-dist/src/main/scripts/artifact-install.sh +++ b/tck-dist/src/main/scripts/artifact-install.sh
@@ -1,6 +1,7 @@ #!/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 @@ -17,58 +18,83 @@ ##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 - VERSION="2.2.0-SNAPSHOT" + # 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 -# Parent pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# sources jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# sources jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# pom -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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 -# sources jar -mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ +# 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-dist/src/main/tck-run/pom.xml b/tck-dist/src/main/tck-run/pom.xml new file mode 100644 index 0000000..5242d2c --- /dev/null +++ b/tck-dist/src/main/tck-run/pom.xml
@@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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 + 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>${project.version}</version> + <relativePath/> + </parent> + + <artifactId>jakarta.json-tck-impl</artifactId> + <packaging>pom</packaging> + + <properties> + + <!-- 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> + + <!-- project properties --> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <jimage.dir>\${project.build.directory}/jdk-bundle</jimage.dir> + + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck</artifactId> + <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>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <defaultGoal>verify</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <configuration> + <artifactItems> + <artifactItem> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>${project.version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>\${project.build.directory}/signaturedirectory</outputDirectory> + <destFileName>jakarta.json-api.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <useModulePath>false</useModulePath> + <trimStackTrace>false</trimStackTrace> + <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> + </systemPropertyVariables> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> \ No newline at end of file
diff --git a/tck-dist/src/main/tck-run/tck-tests-pluggability/pom.xml b/tck-dist/src/main/tck-run/tck-tests-pluggability/pom.xml new file mode 100644 index 0000000..0b14770 --- /dev/null +++ b/tck-dist/src/main/tck-run/tck-tests-pluggability/pom.xml
@@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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 + 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-tck-impl</artifactId> + <version>${project.version}</version> + </parent> + + <artifactId>jakarta.json-tck-impl-tests-pluggability</artifactId> + + <dependencies> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <dependenciesToScan> + <dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency> + </dependenciesToScan> + <useModulePath>false</useModulePath> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file
diff --git a/tck-dist/src/main/tck-run/tck-tests/pom.xml b/tck-dist/src/main/tck-run/tck-tests/pom.xml new file mode 100644 index 0000000..ca44aad --- /dev/null +++ b/tck-dist/src/main/tck-run/tck-tests/pom.xml
@@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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 + 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-tck-impl</artifactId> + <version>${project.version}</version> + </parent> + + <artifactId>jakarta.json-tck-impl-tests</artifactId> + + <dependencies> + <dependency> + <groupId>\${jsonp-impl.groupId}</groupId> + <artifactId>\${jsonp-impl.artifactId}</artifactId> + <version>\${jsonp-impl.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-tests</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jakarta.tck</groupId> + <artifactId>sigtest-maven-plugin</artifactId> + <version>${sigtest.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <dependenciesToScan> + <dependency>jakarta.json:jakarta.json-tck-tests</dependency> + </dependenciesToScan> + </configuration> + </plugin> + </plugins> + </build> +</project>