This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push: new a350763b15 TOMEE-4331 - BatchEE 2.0.0 a350763b15 is described below commit a350763b15047deb4d5a9008fdb8c6d0656865e8 Author: Richard Zowalla <r...@apache.org> AuthorDate: Tue May 7 11:19:40 2024 +0200 TOMEE-4331 - BatchEE 2.0.0 --- boms/tomee-plume/pom.xml | 3 +-- boms/tomee-plus/pom.xml | 3 +-- container/openejb-core/pom.xml | 9 ++------- pom.xml | 3 +-- tomee/tomee-plume-webapp/pom.xml | 9 ++------- tomee/tomee-plus-webapp/pom.xml | 9 ++------- 6 files changed, 9 insertions(+), 27 deletions(-) diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml index 0aa8412d51..ef5f508bb7 100644 --- a/boms/tomee-plume/pom.xml +++ b/boms/tomee-plume/pom.xml @@ -642,8 +642,7 @@ <dependency> <groupId>org.apache.batchee</groupId> <artifactId>batchee-jbatch</artifactId> - <version>1.0.4</version> - <classifier>jakarta</classifier> + <version>2.0.0-SNAPSHOT</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml index d649bda549..1cc6f83058 100644 --- a/boms/tomee-plus/pom.xml +++ b/boms/tomee-plus/pom.xml @@ -642,8 +642,7 @@ <dependency> <groupId>org.apache.batchee</groupId> <artifactId>batchee-jbatch</artifactId> - <version>1.0.4</version> - <classifier>jakarta</classifier> + <version>2.0.0-SNAPSHOT</version> <exclusions> <exclusion> <artifactId>*</artifactId> diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml index c7e23ac4f8..da324a1d2e 100644 --- a/container/openejb-core/pom.xml +++ b/container/openejb-core/pom.xml @@ -706,15 +706,10 @@ <artifactId>batchee-jbatch</artifactId> <version>${version.batchee}</version> <scope>provided</scope> - <classifier>jakarta</classifier> <exclusions> <exclusion> - <groupId>org.apache.batchee</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </exclusion> </exclusions> </dependency> diff --git a/pom.xml b/pom.xml index f3038514c4..39c1e41e72 100644 --- a/pom.xml +++ b/pom.xml @@ -213,8 +213,7 @@ <version.impl.saaj>2.0.1</version.impl.saaj> <!-- org.apache --> <version.activemq>6.1.2</version.activemq> - <!-- downgrade to avoid a henn egg issue with batchee --> - <version.batchee>1.0.4</version.batchee> + <version.batchee>2.0.0</version.batchee> <version.bval>3.0.0</version.bval> <version.cxf>4.1.0-SNAPSHOT</version.cxf> <version.geronimo.components>4.0.0</version.geronimo.components> diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml index 46149cdd1f..9bfc6df706 100644 --- a/tomee/tomee-plume-webapp/pom.xml +++ b/tomee/tomee-plume-webapp/pom.xml @@ -349,15 +349,10 @@ <artifactId>batchee-jbatch</artifactId> <version>${version.batchee}</version> <scope>runtime</scope> - <classifier>jakarta</classifier> <exclusions> <exclusion> - <groupId>org.apache.batchee</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </exclusion> </exclusions> </dependency> diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml index 713d4294dc..431dc8c8fd 100644 --- a/tomee/tomee-plus-webapp/pom.xml +++ b/tomee/tomee-plus-webapp/pom.xml @@ -349,15 +349,10 @@ <artifactId>batchee-jbatch</artifactId> <version>${version.batchee}</version> <scope>runtime</scope> - <classifier>jakarta</classifier> <exclusions> <exclusion> - <groupId>org.apache.batchee</groupId> - <artifactId>*</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> </exclusion> </exclusions> </dependency>