cleanup tck dist build Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/tck/pom.xml b/tck/pom.xml index b7fb0a8..4f69a0c 100644 --- a/tck/pom.xml +++ b/tck/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2020, 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 @@ -22,7 +22,8 @@ <parent> <groupId>org.eclipse.ee4j</groupId> <artifactId>project</artifactId> - <version>1.0.6</version> + <version>1.0.7</version> + <relativePath/> </parent> <groupId>jakarta.json</groupId> @@ -62,33 +63,69 @@ <arquillian.junit5.version>1.7.0.Alpha5</arquillian.junit5.version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-ug</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-api</artifactId> + <version>2.1.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-api</artifactId> + <version>${junit.jupiter.version}</version> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <version>${junit.jupiter.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit5</groupId> + <artifactId>arquillian-junit5-container</artifactId> + <version>${arquillian.junit5.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-api</artifactId> - <version>2.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>jakarta.inject</groupId> <artifactId>jakarta.inject-api</artifactId> - <version>1.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> - <version>${junit.jupiter.version}</version> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.jupiter.version}</version> </dependency> <dependency> <groupId>org.jboss.arquillian.junit5</groupId> <artifactId>arquillian-junit5-container</artifactId> - <version>${arquillian.junit5.version}</version> </dependency> </dependencies> @@ -97,9 +134,19 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <version>3.3.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>3.3.1</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>3.2.0</version> + </plugin> </plugins> </pluginManagement> </build>
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml index 87edde3..aba58bb 100644 --- a/tck/tck-common/pom.xml +++ b/tck/tck-common/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + 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 @@ -27,7 +27,6 @@ <artifactId>jakarta.json-tck-common</artifactId> - <packaging>jar</packaging> <build> <plugins> @@ -45,7 +44,7 @@ <execution> <id>attach-sources</id> <goals> - <goal>jar</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions>
diff --git a/tck/tck-dist/pom.xml b/tck/tck-dist/pom.xml index dc1189f..8a09004 100644 --- a/tck/tck-dist/pom.xml +++ b/tck/tck-dist/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + 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 @@ -23,6 +23,7 @@ <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck</artifactId> <version>2.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>jakarta.json</groupId> @@ -33,6 +34,12 @@ <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> @@ -131,6 +138,7 @@ <descriptors> <descriptor>src/main/assembly/assembly.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> <finalName>${bundle-name}-${project.version}</finalName> </configuration> </execution>
diff --git a/tck/tck-dist/src/main/assembly/assembly.xml b/tck/tck-dist/src/main/assembly/assembly.xml index 67411d9..55d41f8 100644 --- a/tck/tck-dist/src/main/assembly/assembly.xml +++ b/tck/tck-dist/src/main/assembly/assembly.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + 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 @@ -19,68 +19,43 @@ <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"> - <baseDirectory>jsonp-tck</baseDirectory> - <formats> - <format>zip</format> - </formats> + <id>distribution</id> + <baseDirectory>jsonp-tck</baseDirectory> + <formats> + <format>zip</format> + </formats> - <files> - <!-- license --> - <file> - <source>LICENSE_${license}.md</source> - <destName>LICENSE.md</destName> - </file> - <file> - <source>artifact-install.sh</source> - <outputDirectory>artifacts</outputDirectory> - </file> - </files> - <fileSets> - <fileSet> - <directory>../tck-docs/</directory> - <outputDirectory>docs/</outputDirectory> + <files> + <!-- license --> + <file> + <source>LICENSE_${license}.md</source> + <destName>LICENSE.md</destName> + </file> + <file> + <source>artifact-install.sh</source> + <outputDirectory>artifacts</outputDirectory> + </file> + </files> + + <dependencySets> + <dependencySet> <includes> - <include>*.*</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-plugability</include> </includes> - </fileSet> - <fileSet> - <directory>../tck-docs/userguide/target/generated-docs</directory> - <outputDirectory>docs/pdf-usersguide</outputDirectory> + <useTransitiveDependencies>true</useTransitiveDependencies> + <outputDirectory>artifacts</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + <dependencySet> <includes> - <include>**/*.pdf</include> + <include>jakarta.json:jakarta.json-tck-ug</include> </includes> - </fileSet> - <fileSet> - <directory>../tck-docs/assertions</directory> - <outputDirectory>/docs/assertions</outputDirectory> - <includes> - <include>*Assertions.html</include> - </includes> - </fileSet> - <fileSet> - <directory>../tck-docs/userguide/target/staging</directory> - <outputDirectory>docs/html-usersguide</outputDirectory> - <excludes> - <exclude>*.inc</exclude> - <exclude>*.conf</exclude> - <exclude>*.yml</exclude> - <exclude>*.md</exclude> - <exclude>README</exclude> - </excludes> - </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-plugability</include> - </includes> - <useTransitiveDependencies>true</useTransitiveDependencies> - <outputDirectory>artifacts</outputDirectory> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - </dependencySets> + <unpack>true</unpack> + <outputDirectory>.</outputDirectory> + </dependencySet> + </dependencySets> </assembly>
diff --git a/tck/tck-docs/userguide/pom.xml b/tck/tck-docs/userguide/pom.xml index 3244c08..7fc9d48 100644 --- a/tck/tck-docs/userguide/pom.xml +++ b/tck/tck-docs/userguide/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2017, 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 @@ -20,14 +20,15 @@ <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>org.eclipse.ee4j</groupId> - <artifactId>project</artifactId> - <version>1.0.5</version> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck</artifactId> + <version>2.1.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.glassfish</groupId> - <artifactId>tck_jsonp</artifactId> + <groupId>jakarta.json</groupId> + <artifactId>jakarta.json-tck-ug</artifactId> <packaging>pom</packaging> - <version>2.1.0</version> + <version>2.1.0-SNAPSHOT</version> <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta JSON Processing for Jakarta EE, Release 2.1</name> <properties> @@ -41,7 +42,7 @@ <jbake.maven.plugin.version>0.3.3</jbake.maven.plugin.version> <freemarker.version>2.3.30</freemarker.version> <!-- status: DRAFT, BETA, etc., or blank for final --> - <status></status> + <status>DRAFT</status> <doc.pdf>Jakarta-JSON-Processing-TCK-Users-Guide.pdf</doc.pdf> <maven.deploy.skip>true</maven.deploy.skip> </properties> @@ -172,6 +173,24 @@ </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> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-scm-publish-plugin</artifactId> <executions>
diff --git a/tck/tck-docs/userguide/src/main/assembly/assembly.xml b/tck/tck-docs/userguide/src/main/assembly/assembly.xml new file mode 100644 index 0000000..c057b81 --- /dev/null +++ b/tck/tck-docs/userguide/src/main/assembly/assembly.xml
@@ -0,0 +1,62 @@ +<?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>docs/pdf-usersguide</outputDirectory> + <includes> + <include>**/*.pdf</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.build.directory}/staging</directory> + <outputDirectory>docs/html-usersguide</outputDirectory> + <excludes> + <exclude>*.inc</exclude> + <exclude>*.conf</exclude> + <exclude>*.yml</exclude> + <exclude>*.md</exclude> + <exclude>README</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../assertions</directory> + <outputDirectory>docs/assertions</outputDirectory> + <includes> + <include>*Assertions.html</include> + </includes> + </fileSet> + <fileSet> + <directory>../</directory> + <outputDirectory>docs/</outputDirectory> + <includes> + <include>*.*</include> + </includes> + </fileSet> + </fileSets> +</assembly>
diff --git a/tck/tck-tests-plugability/pom.xml b/tck/tck-tests-plugability/pom.xml index c5ab659..65278d2 100644 --- a/tck/tck-tests-plugability/pom.xml +++ b/tck/tck-tests-plugability/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. + 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 @@ -32,7 +32,6 @@ <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-common</artifactId> - <version>2.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> @@ -53,7 +52,7 @@ <execution> <id>attach-sources</id> <goals> - <goal>jar</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions>
diff --git a/tck/tck-tests/pom.xml b/tck/tck-tests/pom.xml index 4079f3f..266f5bd 100644 --- a/tck/tck-tests/pom.xml +++ b/tck/tck-tests/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2020, 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 @@ -33,7 +33,6 @@ <dependency> <groupId>jakarta.json</groupId> <artifactId>jakarta.json-tck-common</artifactId> - <version>2.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> </dependencies> @@ -54,7 +53,7 @@ <execution> <id>attach-sources</id> <goals> - <goal>jar</goal> + <goal>jar-no-fork</goal> </goals> </execution> </executions>