This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
The following commit(s) were added to refs/heads/master by this push: new 98ddd1a [MEECROWAVE-254][MEECROWAVE-255][MEECROWAVE-256][MEECROWAVE-257] cxf 3.4.0, johnzon 1.2.8, openjpa 3.1.2, h2 1.4.200, xbean 4.17 upgrades 98ddd1a is described below commit 98ddd1aeb2675dac4e747f73631b65a8980d5cd7 Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Tue Aug 25 08:55:27 2020 +0200 [MEECROWAVE-254][MEECROWAVE-255][MEECROWAVE-256][MEECROWAVE-257] cxf 3.4.0, johnzon 1.2.8, openjpa 3.1.2, h2 1.4.200, xbean 4.17 upgrades --- integration-tests/dispatch-jsp/pom.xml | 2 +- meecrowave-core/pom.xml | 18 +++++++++++++----- meecrowave-jpa/pom.xml | 2 +- pom.xml | 10 +++++----- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/integration-tests/dispatch-jsp/pom.xml b/integration-tests/dispatch-jsp/pom.xml index 97eec7f..22f48f7 100644 --- a/integration-tests/dispatch-jsp/pom.xml +++ b/integration-tests/dispatch-jsp/pom.xml @@ -43,7 +43,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml index 380bdc6..d92c43f 100644 --- a/meecrowave-core/pom.xml +++ b/meecrowave-core/pom.xml @@ -56,7 +56,7 @@ </dependency> <dependency> <groupId>org.apache.xbean</groupId> - <artifactId>xbean-asm7-shaded</artifactId> + <artifactId>xbean-asm8-shaded</artifactId> <version>${xbean.version}</version> </dependency> <dependency> @@ -100,6 +100,10 @@ <version>${cxf.version}</version> <exclusions> <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + <exclusion> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> </exclusion> @@ -135,12 +139,16 @@ <version>${cxf.version}</version> <exclusions> <exclusion> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.inject</groupId> + <artifactId>jakarta.inject-api</artifactId> </exclusion> <exclusion> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> + <groupId>jakarta.enterprise</groupId> + <artifactId>jakarta.enterprise.cdi-api</artifactId> </exclusion> </exclusions> </dependency> diff --git a/meecrowave-jpa/pom.xml b/meecrowave-jpa/pom.xml index abf9bbf..0c002a3 100644 --- a/meecrowave-jpa/pom.xml +++ b/meecrowave-jpa/pom.xml @@ -71,7 +71,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>${junit.version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index f74aa9d..2941594 100644 --- a/pom.xml +++ b/pom.xml @@ -53,17 +53,17 @@ <junit.version>4.13</junit.version> <tomcat.version>9.0.37</tomcat.version> <openwebbeans.version>2.0.17</openwebbeans.version> - <cxf.version>3.3.7</cxf.version> - <johnzon.version>1.2.7</johnzon.version> + <cxf.version>3.4.0</cxf.version> + <johnzon.version>1.2.8</johnzon.version> <log4j2.version>2.13.3</log4j2.version> <deltaspike.version>1.8.2</deltaspike.version> <jaxb.version>2.2.11</jaxb.version> - <openjpa.version>3.1.1</openjpa.version> + <openjpa.version>3.1.2</openjpa.version> <jpa-spec.version>1.0-alpha-1</jpa-spec.version> - <h2.version>1.4.196</h2.version> + <h2.version>1.4.200</h2.version> <dbcp2.version>2.7.0</dbcp2.version> <commons-cli.version>1.4</commons-cli.version> - <xbean.version>4.16</xbean.version> + <xbean.version>4.17</xbean.version> <java11.jaxb.version>2.3.0</java11.jaxb.version> </properties>