This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new a17e008 TOMEE-3871 - TomEE Plume is missing BatchEE / JCS Cache
a17e008 is described below
commit a17e008de1e6e2b392aaed41af2bf5e6dd81e66f
Author: Swell <[email protected]>
AuthorDate: Sat Mar 26 02:41:56 2022 +0100
TOMEE-3871 - TomEE Plume is missing BatchEE / JCS Cache
---
boms/tomee-microprofile/pom.xml | 11 -----------
boms/tomee-plume/pom.xml | 22 +++++++++++-----------
container/openejb-core/pom.xml | 5 -----
pom.xml | 6 ------
.../tomee-microprofile-webapp/pom.xml | 5 -----
tomee/tomee-plume-webapp/pom.xml | 17 ++++++++++++-----
6 files changed, 23 insertions(+), 43 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index e044c69..aee61da 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -1983,17 +1983,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 6a675fb..097f8b9 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -335,6 +335,17 @@
<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>
+ <version>1.0.2-SNAPSHOT</version>
<classifier>jakarta</classifier>
<exclusions>
<exclusion>
@@ -2105,17 +2116,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 8e81de0..a7135df 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -654,11 +654,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-confluence</artifactId>
<version>1.1</version>
diff --git a/pom.xml b/pom.xml
index 788e9be..3d986c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1531,12 +1531,6 @@
<version>${osgi.framework.version}</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>3.0.3</version>
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 944ef64..efe285c 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -443,11 +443,6 @@
<version>3.2</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>runtime</scope><!-- transitive from xerces but in test scope in
parent so needed here -->
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 1560083..e5a6ef6 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -368,6 +368,18 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.apache.batchee</groupId>
+ <artifactId>batchee-jbatch</artifactId>
+ <version>${batchee.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jcs-jcache</artifactId>
+ <version>${jcs.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
<classifier>jakarta</classifier>
@@ -579,11 +591,6 @@
<artifactId>jakarta.faces</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
