This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit efeee67bb5b013044aac8c3866f8e9a367864317
Author: Jean-Louis Monteiro <[email protected]>
AuthorDate: Wed Apr 13 12:35:38 2022 +0200

    Don't carry on the jakarta and the non jakarta version of batchee
---
 boms/tomee-plume/pom.xml         | 11 -----------
 container/openejb-core/pom.xml   |  6 ++++++
 tomee/tomee-plume-webapp/pom.xml | 18 ++++++------------
 tomee/tomee-plus-webapp/pom.xml  |  6 ++++++
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 3b2cf5d009..cdcca63528 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -551,17 +551,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.apache.batchee</groupId>
-      <artifactId>batchee-jbatch</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>*</artifactId>
-          <groupId>*</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.batchee</groupId>
       <artifactId>batchee-jbatch</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index dfbd28b517..817ea1b26a 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -734,6 +734,12 @@
       <version>${batchee.version}</version>
       <scope>provided</scope>
       <classifier>jakarta</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.batchee</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index e5a6ef6252..9e5f5e0623 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -360,18 +360,12 @@
       <version>${batchee.version}</version>
       <scope>runtime</scope>
       <classifier>jakarta</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-jcs-jcache</artifactId>
-      <version>${jcs.version}</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.batchee</groupId>
-      <artifactId>batchee-jbatch</artifactId>
-      <version>${batchee.version}</version>
-      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.batchee</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 3955646df3..052cac4130 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -364,6 +364,12 @@
       <version>${batchee.version}</version>
       <scope>runtime</scope>
       <classifier>jakarta</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.batchee</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

Reply via email to