Skip to content

Commit

Permalink
Merge latest changes fron main
Browse files Browse the repository at this point in the history
  • Loading branch information
@rzo1
rzo1 committed Nov 21, 2023
1 parent 21f2754 commit f4b359b
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 134 deletions.
61 changes: 19 additions & 42 deletions tck/jsonp-signature-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand All @@ -98,20 +65,30 @@
</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>
<version>${surefire.version}</version>
<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>
<includes>
<include>**/JSONPSigTest</include>
</includes>
</configuration>

</plugin>
</plugins>
</build>
Expand Down
134 changes: 43 additions & 91 deletions tck/jsonp-standalone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -149,26 +77,50 @@
</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>
<version>${surefire.version}</version>
<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>
2 changes: 1 addition & 1 deletion tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit f4b359b

Please sign in to comment.