You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/11/21 13:35:30 UTC
(tomee) 02/02: Merge latest changes from main
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-4159_Concurrency_TCK
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 46ad6472de80d0ec48e465468e9999c8139a79e5
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Nov 21 14:35:16 2023 +0100
Merge latest changes from main
---
tck/concurrency-signature-test/pom.xml | 72 +---------------------------------
tck/concurrency-standalone/pom.xml | 2 +-
2 files changed, 3 insertions(+), 71 deletions(-)
diff --git a/tck/concurrency-signature-test/pom.xml b/tck/concurrency-signature-test/pom.xml
index 447cc11695..decb8b67a3 100644
--- a/tck/concurrency-signature-test/pom.xml
+++ b/tck/concurrency-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>
@@ -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>
@@ -88,50 +55,15 @@
<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>
diff --git a/tck/concurrency-standalone/pom.xml b/tck/concurrency-standalone/pom.xml
index 678bd6fb2d..94b3d3aefe 100644
--- a/tck/concurrency-standalone/pom.xml
+++ b/tck/concurrency-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>