tweak project IDs, fix the typo in plugability

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
jakartaee · Jan 11, 2022 · 1dd8b14 · 1dd8b14
1 parent a58c466
commit 1dd8b14
Show file tree

Hide file tree

Showing 24 changed files with 58 additions and 60 deletions.
diff --git 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 → impl-tck/tck-tests-pluggability/pom.xml b/impl-tck/tck-tests-plugability/pom.xml → 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
@@ -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
@@ -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>
@@ -132,21 +132,11 @@
     <build>
         <pluginManagement>
             <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
@@ -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
@@ -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
@@ -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 → ...k-dist/src/main/resources/LICENSE_EFTL.md b/tck/tck-dist/LICENSE_EFTL.md → ...k-dist/src/main/resources/LICENSE_EFTL.md
diff --git a/tck/tck-dist/LICENSE_EPL.md → ...ck-dist/src/main/resources/LICENSE_EPL.md b/tck/tck-dist/LICENSE_EPL.md → ...ck-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 → ...dist/src/main/scripts/artifact-install.sh b/tck/tck-dist/artifact-install.sh → ...dist/src/main/scripts/artifact-install.sh
@@ -11,7 +11,7 @@ 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
+-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 @@ mvn org.apache.maven.plugins:maven-install-plugin:3.0.0-M1:install-file \
 
 # 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
@@ -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 → tck/tck-tests-pluggability/pom.xml b/tck/tck-tests-plugability/pom.xml → 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/...bility/jsonprovidertests/ClientTests.java → ...bility/jsonprovidertests/ClientTests.java b/...bility/jsonprovidertests/ClientTests.java → ...bility/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/...a/jsonp/tck/provider/MyJsonGenerator.java → ...a/jsonp/tck/provider/MyJsonGenerator.java b/...a/jsonp/tck/provider/MyJsonGenerator.java → ...a/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/provider/MyJsonGeneratorFactory.java → .../tck/provider/MyJsonGeneratorFactory.java b/.../tck/provider/MyJsonGeneratorFactory.java → .../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/...arta/jsonp/tck/provider/MyJsonParser.java → ...arta/jsonp/tck/provider/MyJsonParser.java b/...arta/jsonp/tck/provider/MyJsonParser.java → ...arta/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/...onp/tck/provider/MyJsonParserFactory.java → ...onp/tck/provider/MyJsonParserFactory.java b/...onp/tck/provider/MyJsonParserFactory.java → ...onp/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/...ta/jsonp/tck/provider/MyJsonProvider.java → ...ta/jsonp/tck/provider/MyJsonProvider.java b/...ta/jsonp/tck/provider/MyJsonProvider.java → ...ta/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/...arta/jsonp/tck/provider/MyJsonReader.java → ...arta/jsonp/tck/provider/MyJsonReader.java b/...arta/jsonp/tck/provider/MyJsonReader.java → ...arta/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/...onp/tck/provider/MyJsonReaderFactory.java → ...onp/tck/provider/MyJsonReaderFactory.java b/...onp/tck/provider/MyJsonReaderFactory.java → ...onp/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/...arta/jsonp/tck/provider/MyJsonWriter.java → ...arta/jsonp/tck/provider/MyJsonWriter.java b/...arta/jsonp/tck/provider/MyJsonWriter.java → ...arta/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/...onp/tck/provider/MyJsonWriterFactory.java → ...onp/tck/provider/MyJsonWriterFactory.java b/...onp/tck/provider/MyJsonWriterFactory.java → ...onp/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/...NF/services/jakarta.json.spi.JsonProvider → ...NF/services/jakarta.json.spi.JsonProvider b/...NF/services/jakarta.json.spi.JsonProvider → ...NF/services/jakarta.json.spi.JsonProvider
diff --git 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>