Skip to content

Commit

Permalink
Merge with latest changes from main
Browse files Browse the repository at this point in the history
  • Loading branch information
@rzo1
rzo1 committed Nov 21, 2023
1 parent 989f256 commit b9becb2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 151 deletions.
77 changes: 2 additions & 75 deletions tck/jsonb-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 @@ -30,47 +30,14 @@
<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-jsonb</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,57 +48,17 @@
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-tck</artifactId>
<version>3.0.0</version>
<version>${jsonb-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>
</dependencies>

Expand Down
78 changes: 2 additions & 76 deletions tck/jsonb-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,14 @@
<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-jsonb</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,57 +48,16 @@
<dependency>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-tck</artifactId>
<version>3.0.0</version>
<version>${jsonb-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>
</dependencies>

Expand Down
1 change: 1 addition & 0 deletions tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<properties>
<cdi-tck.version>4.0.11</cdi-tck.version>
<bval-tck.version>3.0.1</bval-tck.version>
<jsonb-tck.version>3.0.0</jsonb-tck.version>

<validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>
</properties>
Expand Down

0 comments on commit b9becb2

Please sign in to comment.