From f4b359b689773ff427b04eeaaacc3724bf80ecf5 Mon Sep 17 00:00:00 2001
From: Richard Zowalla <rzo1@apache.org>
Date: Tue, 21 Nov 2023 11:27:28 +0100
Subject: [PATCH] Merge latest changes fron main

---
 tck/jsonp-signature-test/pom.xml |  61 +++++---------
 tck/jsonp-standalone/pom.xml     | 134 ++++++++++---------------------
 tck/pom.xml                      |   2 +-
 3 files changed, 63 insertions(+), 134 deletions(-)

diff --git a/tck/jsonp-signature-test/pom.xml b/tck/jsonp-signature-test/pom.xml
index 96befc4d8cb..c36256a045b 100644
--- a/tck/jsonp-signature-test/pom.xml
+++ b/tck/jsonp-signature-test/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -36,57 +36,24 @@
     <dependency>
       <groupId>jakarta.json</groupId>
       <artifactId>jakarta.json-tck-tests</artifactId>
-      <version>2.1.1</version>
+      <version>${jsonp-tck.version}</version>
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.openwebbeans</groupId>
-      <artifactId>openwebbeans-se</artifactId>
-      <version>2.0.27</version>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-impl</artifactId>
-      <version>2.0.27</version>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-spi</artifactId>
-      <version>2.0.27</version>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.netbeans.tools</groupId>
+      <artifactId>sigtest-maven-plugin</artifactId>
+      <version>1.6</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -98,6 +65,11 @@
       </testResource>
     </testResources>
     <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -105,6 +77,10 @@
         <configuration>
           <reuseForks>false</reuseForks>
           <forkCount>1</forkCount>
+          <systemProperties>
+            <jimage.dir>${project.build.directory}/jimage</jimage.dir>
+            <signature.sigTestClasspath>${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jimage/java.base:${project.build.directory}/jimage/java.rmi:${project.build.directory}/jimage/java.sql:${project.build.directory}/jimage/java.naming</signature.sigTestClasspath>
+          </systemProperties>
           <dependenciesToScan>
             <dependency>jakarta.json:jakarta.json-tck-tests</dependency>
           </dependenciesToScan>
@@ -112,6 +88,7 @@
             <include>**/JSONPSigTest</include>
           </includes>
         </configuration>
+
       </plugin>
     </plugins>
   </build>
diff --git a/tck/jsonp-standalone/pom.xml b/tck/jsonp-standalone/pom.xml
index 0046700030a..50b7b0341aa 100644
--- a/tck/jsonp-standalone/pom.xml
+++ b/tck/jsonp-standalone/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.tomee</groupId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>10.0.0-M1-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -30,47 +30,6 @@
     <dependency>
       <groupId>org.apache.johnzon</groupId>
       <artifactId>johnzon-core</artifactId>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.johnzon</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-mapper</artifactId>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.johnzon</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.johnzon</groupId>
-      <artifactId>johnzon-jsonp-strict</artifactId>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.johnzon</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <dependency>
@@ -81,64 +40,33 @@
     <dependency>
       <groupId>jakarta.json</groupId>
       <artifactId>jakarta.json-tck-tests</artifactId>
-      <version>2.1.1</version>
+      <version>${jsonp-tck.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>jakarta.json</groupId>
       <artifactId>jakarta.json-tck-tests-pluggability</artifactId>
-      <version>2.1.1</version>
+      <version>${jsonp-tck.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-se</artifactId>
-      <version>2.0.27</version>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
+      <version>${version.openwebbeans}</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-impl</artifactId>
-      <version>2.0.27</version>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
     <dependency>
       <groupId>org.apache.openwebbeans</groupId>
       <artifactId>openwebbeans-spi</artifactId>
-      <version>2.0.27</version>
-      <classifier>jakarta</classifier>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.openwebbeans</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
+
   </dependencies>
 
   <build>
@@ -149,6 +77,10 @@
       </testResource>
     </testResources>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -156,19 +88,39 @@
         <configuration>
           <reuseForks>false</reuseForks>
           <forkCount>1</forkCount>
-          <dependenciesToScan>
-            <dependency>jakarta.json:jakarta.json-tck-tests</dependency>
-            <dependency>jakarta.json:jakarta.json-tck-tests-pluggability</dependency>
-          </dependenciesToScan>
-          <includes>
-            <include>ee.jakarta.tck.jsonp.**</include>
-          </includes>
-          <excludes>
-            <exclude>**/JSONPSigTest</exclude>
-          </excludes>
         </configuration>
+        <!-- Pluggability tests need to be run separately from normal TCKs as they bring their
+            own JsonProvider implementation which would break other TCK tests -->
+        <executions>
+          <execution>
+            <id>tck</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <dependenciesToScan>jakarta.json:jakarta.json-tck-tests</dependenciesToScan>
+              <excludes>
+                <exclude>**/JSONPSigTest</exclude>
+              </excludes>
+              <classpathDependencyExcludes>
+                <classpathDependencyExclude>jakarta.json:jakarta.json-tck-tests-pluggability</classpathDependencyExclude>
+              </classpathDependencyExcludes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tck-pluggability</id>
+            <goals>
+              <goal>test</goal>
+            </goals>
+            <configuration>
+              <dependenciesToScan>jakarta.json:jakarta.json-tck-tests-pluggability</dependenciesToScan>
+              <classpathDependencyExcludes>
+                <classpathDependencyExclude>jakarta.json:jakarta.json-tck-tests</classpathDependencyExclude>
+              </classpathDependencyExcludes>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
-
 </project>
\ No newline at end of file
diff --git a/tck/pom.xml b/tck/pom.xml
index fdcb7602b6d..7bc3dc6c0b3 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <cdi-tck.version>4.0.11</cdi-tck.version>
     <bval-tck.version>3.0.1</bval-tck.version>
-
+    <jsonp-tck.version>2.1.1</jsonp-tck.version>
     <validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
   </properties>