Fixes #4416 - Move JSON Binding TCK to coreprofile-tck module (#4428)

piranhacloud · Dec 24, 2024 · 29c006f · 29c006f
1 parent f8758e4
commit 29c006f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/tck-coreprofile.yml b/.github/workflows/tck-coreprofile.yml
@@ -129,12 +129,12 @@ jobs:
       run: mvn -B -DskipTests=true -ntp install
     - name: Run TCK
       run: |
-        cd external/tck/jsonb
+        cd external/coreprofile-tck/jsonb
         mvn -B -ntp verify
     - name: Test Summary
       uses: test-summary/action@v2
       with:
-        paths: "external/tck/jsonb/installer/target/tck/bin/target/surefire-reports/TEST-*.xml"
+        paths: "external/coreprofile-tck/jsonb/installer/target/tck/bin/target/surefire-reports/TEST-*.xml"
       if: always()
   jsonp:
     if: github.repository == 'piranhacloud/piranha'

diff --git a/external/tck/jsonb/installer/pom.xml → ...l/coreprofile-tck/jsonb/installer/pom.xml b/external/tck/jsonb/installer/pom.xml → ...l/coreprofile-tck/jsonb/installer/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck.jsonb</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck.jsonb</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-external-tck-jsonb-installer</artifactId>
+    <artifactId>piranha-external-coreprofiletck-jsonb-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - JSON Binding - Installer</name>
+    <name>Piranha - External - Core Profile TCK - JSON Binding - Installer</name>
 
     <properties>
         <tck.home>${project.build.directory}/tck</tck.home>

diff --git a/external/tck/jsonb/pom.xml → external/coreprofile-tck/jsonb/pom.xml b/external/tck/jsonb/pom.xml → external/coreprofile-tck/jsonb/pom.xml
@@ -4,16 +4,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>cloud.piranha.external.tck.jsonb</groupId>
+    <groupId>cloud.piranha.external.coreprofiletck.jsonb</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - JSON Binding - Project</name>
+    <name>Piranha - External - Core Profile TCK - JSON Binding - Project</name>
 
     <properties>
         <jsonb.tck.version>3.0.0</jsonb.tck.version>

diff --git a/external/tck/jsonb/runner/pom.xml → ...rnal/coreprofile-tck/jsonb/runner/pom.xml b/external/tck/jsonb/runner/pom.xml → ...rnal/coreprofile-tck/jsonb/runner/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck.jsonb</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck.jsonb</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-external-tck-jsonb-runner</artifactId>
+    <artifactId>piranha-external-coreprofiletck-jsonb-runner</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - JSON Binding - Runner</name>
+    <name>Piranha - External - Core Profile TCK - JSON Binding - Runner</name>
 
     <properties>
         <tck.home>${project.build.directory}/../../installer/target/tck</tck.home>
@@ -31,8 +31,8 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>cloud.piranha.external.tck.jsonb</groupId>
-            <artifactId>piranha-external-tck-jsonb-installer</artifactId>
+            <groupId>cloud.piranha.external.coreprofiletck.jsonb</groupId>
+            <artifactId>piranha-external-coreprofiletck-jsonb-installer</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>

diff --git a/external/coreprofile-tck/pom.xml b/external/coreprofile-tck/pom.xml
@@ -26,6 +26,7 @@
     <modules>
         <module>annotations</module>
         <module>inject</module>
+	<module>jsonb</module>
 	<module>rest</module>
     </modules>
 </project>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
@@ -19,7 +19,6 @@
         <module>cdi</module>
         <module>coreprofile</module>
         <module>el</module>
-        <module>jsonb</module>
         <module>jsonp</module>
         <module>jwt</module>
         <module>server</module>