tweak project IDs, fix the typo in plugability Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/impl-tck/pom.xml b/impl-tck/pom.xml index 9bf1177..26380df 100644 --- a/impl-tck/pom.xml +++ b/impl-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 @@ -23,13 +23,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.jsonp</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>tck-tests</module> - <module>tck-tests-plugability</module> + <module>tck-tests-pluggability</module> </modules> <properties>
diff --git a/impl-tck/tck-tests-plugability/pom.xml b/impl-tck/tck-tests-pluggability/pom.xml similarity index 88% rename from impl-tck/tck-tests-plugability/pom.xml rename to impl-tck/tck-tests-pluggability/pom.xml index cc48ed7..a6f31cb 100644 --- a/impl-tck/tck-tests-plugability/pom.xml +++ b/impl-tck/tck-tests-pluggability/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 @@ -24,16 +24,16 @@ <parent> <groupId>org.eclipse.jsonp</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> </parent> - <artifactId>jakarta.json-tck-tests-plugability</artifactId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> <dependencies> <dependency> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-plugability</artifactId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> <version>${jsonp-tck.version}</version> <scope>test</scope> </dependency> @@ -52,7 +52,7 @@ <version>3.0.0-M4</version> <configuration> <dependenciesToScan> - <dependency>jakarta.json:jakarta.json-tck-tests-plugability</dependency> + <dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency> </dependenciesToScan> <trimStackTrace>false</trimStackTrace> <failIfNoTests>true</failIfNoTests>
diff --git a/impl-tck/tck-tests/pom.xml b/impl-tck/tck-tests/pom.xml index e2508ed..81d9bf2 100644 --- a/impl-tck/tck-tests/pom.xml +++ b/impl-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 @@ -24,7 +24,7 @@ <parent> <groupId>org.eclipse.jsonp</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> </parent>
diff --git a/tck/pom.xml b/tck/pom.xml index 4f69a0c..fbcdc10 100644 --- a/tck/pom.xml +++ b/tck/pom.xml
@@ -27,14 +27,14 @@ </parent> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>jakarta.json-tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>tck-common</module> <module>tck-tests</module> - <module>tck-tests-plugability</module> + <module>tck-tests-pluggability</module> <module>tck-docs/userguide</module> <module>tck-dist</module> </modules> @@ -134,19 +134,9 @@ <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 aba58bb..49765c4 100644 --- a/tck/tck-common/pom.xml +++ b/tck/tck-common/pom.xml
@@ -21,8 +21,9 @@ <parent> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>jakarta.json-tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent>
diff --git a/tck/tck-dist/pom.xml b/tck/tck-dist/pom.xml index 8a09004..c8d241b 100644 --- a/tck/tck-dist/pom.xml +++ b/tck/tck-dist/pom.xml
@@ -21,13 +21,13 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> - <version>2.1.0-SNAPSHOT</version> + <artifactId>jakarta.json-tck-project</artifactId> + <version>2.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <groupId>jakarta.json</groupId> - <artifactId>jsonp-tck-dist</artifactId> + <artifactId>jakarta.json-tck</artifactId> <packaging>pom</packaging> <name>JSONP TCK Distribution</name> @@ -40,7 +40,7 @@ </dependency> <dependency> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>jakarta.json-tck-project</artifactId> <version>${project.version}</version> <type>pom</type> </dependency> @@ -84,19 +84,19 @@ </dependency> <dependency> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck-tests-plugability</artifactId> + <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-plugability</artifactId> + <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-plugability</artifactId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> <version>${project.version}</version> <classifier>sources</classifier> <optional>true</optional>
diff --git a/tck/tck-dist/src/main/assembly/assembly.xml b/tck/tck-dist/src/main/assembly/assembly.xml index 55d41f8..288e2dc 100644 --- a/tck/tck-dist/src/main/assembly/assembly.xml +++ b/tck/tck-dist/src/main/assembly/assembly.xml
@@ -28,22 +28,27 @@ <files> <!-- license --> <file> - <source>LICENSE_${license}.md</source> + <source>${project.basedir}/src/main/resources/LICENSE_${license}.md</source> <destName>LICENSE.md</destName> </file> - <file> - <source>artifact-install.sh</source> - <outputDirectory>artifacts</outputDirectory> - </file> </files> - + <fileSets> + <fileSet> + <directory>${project.build.scriptSourceDirectory}</directory> + <outputDirectory>artifacts</outputDirectory> + <fileMode>755</fileMode> + <includes> + <include>**/*.sh</include> + </includes> + </fileSet> + </fileSets> <dependencySets> <dependencySet> <includes> - <include>jakarta.json:jakarta.json-tck</include> + <include>jakarta.json:jakarta.json-tck-project</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> + <include>jakarta.json:jakarta.json-tck-tests-pluggability</include> </includes> <useTransitiveDependencies>true</useTransitiveDependencies> <outputDirectory>artifacts</outputDirectory>
diff --git a/tck/tck-dist/LICENSE_EFTL.md b/tck/tck-dist/src/main/resources/LICENSE_EFTL.md similarity index 100% rename from tck/tck-dist/LICENSE_EFTL.md rename to tck/tck-dist/src/main/resources/LICENSE_EFTL.md
diff --git a/tck/tck-dist/LICENSE_EPL.md b/tck/tck-dist/src/main/resources/LICENSE_EPL.md similarity index 99% rename from tck/tck-dist/LICENSE_EPL.md rename to tck/tck-dist/src/main/resources/LICENSE_EPL.md index 5de3d1b..1d428ed 100644 --- a/tck/tck-dist/LICENSE_EPL.md +++ b/tck/tck-dist/src/main/resources/LICENSE_EPL.md
@@ -280,7 +280,7 @@ ## The GNU General Public License (GPL) Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. + Copyright (C) 1989, 2022 Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor Boston, MA 02110-1335 USA
diff --git a/tck/tck-dist/artifact-install.sh b/tck/tck-dist/src/main/scripts/artifact-install.sh similarity index 76% rename from tck/tck-dist/artifact-install.sh rename to tck/tck-dist/src/main/scripts/artifact-install.sh index dc43a0e..8810023 100755 --- a/tck/tck-dist/artifact-install.sh +++ b/tck/tck-dist/src/main/scripts/artifact-install.sh
@@ -11,7 +11,7 @@ # 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 +-DartifactId=jakarta.json-tck-project -Dversion="$VERSION" -Dpackaging=pom # pom mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ @@ -45,15 +45,15 @@ # pom mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \ --Dfile=jakarta.json-tck-tests-plugability-"$VERSION".pom -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-plugability -Dversion="$VERSION" -Dpackaging=pom +-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-plugability-"$VERSION".jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-plugability -Dversion="$VERSION" -Dpackaging=jar +-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-plugability-"$VERSION"-sources.jar -DgroupId=jakarta.json \ --DartifactId=jakarta.json-tck-tests-plugability-sources -Dversion="$VERSION" -Dpackaging=jar +-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-docs/userguide/pom.xml b/tck/tck-docs/userguide/pom.xml index 7fc9d48..d52dc4d 100644 --- a/tck/tck-docs/userguide/pom.xml +++ b/tck/tck-docs/userguide/pom.xml
@@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>jakarta.json-tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent>
diff --git a/tck/tck-tests-plugability/pom.xml b/tck/tck-tests-pluggability/pom.xml similarity index 92% rename from tck/tck-tests-plugability/pom.xml rename to tck/tck-tests-pluggability/pom.xml index 65278d2..2ed0a79 100644 --- a/tck/tck-tests-plugability/pom.xml +++ b/tck/tck-tests-pluggability/pom.xml
@@ -21,11 +21,12 @@ <parent> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>jakarta.json-tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <artifactId>jakarta.json-tck-tests-plugability</artifactId> + <artifactId>jakarta.json-tck-tests-pluggability</artifactId> <packaging>jar</packaging> <dependencies>
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java similarity index 99% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java index b201a76..9cff878 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGenerator.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGenerator.java similarity index 98% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGenerator.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGenerator.java index aebe497..d7407c6 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGenerator.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGenerator.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGeneratorFactory.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGeneratorFactory.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGeneratorFactory.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGeneratorFactory.java index d3e1365..3392f2e 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGeneratorFactory.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonGeneratorFactory.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParser.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParser.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParser.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParser.java index c75800a..9d1c02d 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParser.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParser.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParserFactory.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParserFactory.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParserFactory.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParserFactory.java index c83f24a..44da00b 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParserFactory.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonParserFactory.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonProvider.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonProvider.java similarity index 98% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonProvider.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonProvider.java index 9752652..1e303b0 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonProvider.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonProvider.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReader.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReader.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReader.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReader.java index 52c31b1..f397d94 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReader.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReader.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReaderFactory.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReaderFactory.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReaderFactory.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReaderFactory.java index e1eefa6..ca6e6ab 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReaderFactory.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonReaderFactory.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriter.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriter.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriter.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriter.java index d7d1206..44640bb 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriter.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriter.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriterFactory.java b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriterFactory.java similarity index 97% rename from tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriterFactory.java rename to tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriterFactory.java index 7d8409e..1ab07af 100644 --- a/tck/tck-tests-plugability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriterFactory.java +++ b/tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/provider/MyJsonWriterFactory.java
@@ -1,5 +1,5 @@ /* - * 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
diff --git a/tck/tck-tests-plugability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider b/tck/tck-tests-pluggability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider similarity index 100% rename from tck/tck-tests-plugability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider rename to tck/tck-tests-pluggability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
diff --git a/tck/tck-tests/pom.xml b/tck/tck-tests/pom.xml index 266f5bd..e35bb61 100644 --- a/tck/tck-tests/pom.xml +++ b/tck/tck-tests/pom.xml
@@ -21,8 +21,9 @@ <parent> <groupId>jakarta.json</groupId> - <artifactId>jakarta.json-tck</artifactId> + <artifactId>jakarta.json-tck-project</artifactId> <version>2.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent>