Integrate latest jakarta dependencies (#1441)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
eclipse-ee4j · Feb 24, 2022 · f96df31 · f96df31
1 parent 3ee42ca
commit f96df31
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 26 deletions.
diff --git a/bundles/tests/pom.xml b/bundles/tests/pom.xml
@@ -109,6 +109,14 @@
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <!-- do not bring in 5.0.0 yet,
+                     it does not work with hibernate-validator -->
+                <exclusion>
+                    <groupId>jakarta.el</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--Hibernate validator and it's dependencies-->
         <dependency>

diff --git a/foundation/org.eclipse.persistence.nosql/pom.xml b/foundation/org.eclipse.persistence.nosql/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -40,6 +40,11 @@
             <groupId>jakarta.resource</groupId>
             <artifactId>jakarta.resource-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>jakarta.jms</groupId>
             <artifactId>jakarta.jms-api</artifactId>

diff --git a/foundation/org.eclipse.persistence.nosql/src/main/java/module-info.java b/foundation/org.eclipse.persistence.nosql/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,6 +14,7 @@
 
     requires jakarta.transaction;
     requires jakarta.annotation;
+    requires static jakarta.cdi;
 
     requires transitive org.eclipse.persistence.core;
 

diff --git a/jpa/org.eclipse.persistence.jpa/pom.xml b/jpa/org.eclipse.persistence.jpa/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -49,6 +49,11 @@
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>

diff --git a/jpa/org.eclipse.persistence.jpa/src/main/java/module-info.java b/jpa/org.eclipse.persistence.jpa/src/main/java/module-info.java
@@ -23,6 +23,7 @@
     requires static jakarta.transaction;
     requires static jakarta.validation;
     requires static jakarta.xml.bind;
+    requires static jakarta.cdi;
 
     exports org.eclipse.persistence.jpa;
     exports org.eclipse.persistence.jpa.config;

diff --git a/pom.xml b/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.6</version>
+        <version>1.0.7</version>
         <relativePath/>
     </parent>
 
@@ -112,7 +112,7 @@
         <spotbugs.exclude/>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Normal</spotbugs.threshold>
-        <spotbugs.version>4.4.1</spotbugs.version>
+        <spotbugs.version>4.5.3</spotbugs.version>
 
         <!-- PROJECT Properties -->
         <build.type>SNAPSHOT</build.type>
@@ -181,15 +181,17 @@
         <activation-api.version>2.1.0</activation-api.version>
         <angus-activation.version>1.0.0</angus-activation.version>
         <annotation.version>2.1.0</annotation.version>
-        <cdi.version>3.0.0</cdi.version>
+        <cdi.version>4.0.0</cdi.version>
         <ejb.version>4.0.0</ejb.version>
+        <!-- there's no version of hibernate-validator working with new EL APIs available yet -->
+<!--        <el-api.version>5.0.0</el-api.version>-->
         <el.version>4.0.2</el.version>
-        <glassfish.version>6.2.3</glassfish.version>
-        <jaxwsrt.version>4.0.0-M1</jaxwsrt.version>
-        <jaxb.version>4.0.0-M2</jaxb.version>
-        <jaxb.api.version>4.0.0-RC3</jaxb.api.version>
-        <soap.api.version>3.0.0-RC2</soap.api.version>
-        <jersey.version>3.0.3</jersey.version>
+        <glassfish.version>7.0.0-M1</glassfish.version>
+        <jaxwsrt.version>4.0.0-M3</jaxwsrt.version>
+        <jaxb.version>4.0.0-M3</jaxb.version>
+        <jaxb.api.version>4.0.0</jaxb.api.version>
+        <soap.api.version>3.0.0</soap.api.version>
+        <jersey.version>3.1.0-M2</jersey.version>
         <jms.version>3.0.0</jms.version>
         <json.version>2.1.0</json.version>
         <jpa.api.version>3.1.0-RC2</jpa.api.version>
@@ -198,33 +200,33 @@
         <oracle.ddlparser.version>3.0.0</oracle.ddlparser.version>
         <org.glassfish.corba.version>4.2.4</org.glassfish.corba.version>
         <parsson.version>1.1.0</parsson.version>
-        <resource.version>2.0.0</resource.version>
-        <servlet.version>5.0.0</servlet.version>
-        <transaction.version>2.0.0</transaction.version>
+        <resource.version>2.1.0-RC1</resource.version>
+        <servlet.version>6.0.0</servlet.version>
+        <transaction.version>2.0.1-RC1</transaction.version>
         <validation.version>3.0.1</validation.version>
-        <ws-api.version>4.0.0-RC2</ws-api.version>
+        <ws-api.version>4.0.0</ws-api.version>
         <ws-rs.version>3.1.0</ws-rs.version>
 
         <!--Third-Party Dependencies version-->
         <!-- CQ #23046 -->
-        <apache.felix.framework.version>7.0.0</apache.felix.framework.version>
+        <apache.felix.framework.version>7.0.3</apache.felix.framework.version>
         <!-- CQ #21133 -->
-        <ant.version>1.10.11</ant.version>
+        <ant.version>1.10.12</ant.version>
         <commonj.sdo.version>2.1.1</commonj.sdo.version>
         <derby.version>10.14.2.0</derby.version>
         <!-- CQ #21134, 21135, 21136, 21137 -->
         <exam.version>4.13.2</exam.version>
         <hamcrest.version>1.3</hamcrest.version>
         <!-- CQ #23048 -->
-        <hibernate.version>7.0.1.Final</hibernate.version>
+        <hibernate.version>7.0.2.Final</hibernate.version>
         <checkstyle.version>8.40</checkstyle.version>
         <!-- CQ #23049 -->
         <jgroups.version>4.2.11.Final</jgroups.version>
         <jmh.version>1.27</jmh.version>
         <junit.version>4.13.2</junit.version>
         <!-- CQ #21138 -->
         <mongodb.version>3.12.7</mongodb.version>
-        <mysql.version>8.0.27</mysql.version>
+        <mysql.version>8.0.28</mysql.version>
         <mssql.version>9.2.0.jre8</mssql.version>
         <pgsql.version>42.3.3</pgsql.version>
         <!-- CQ #21139, 21140 -->
@@ -242,7 +244,7 @@
         <!-- CQ #23051, 23052, 23053, 53054, 53055 -->
         <springframework.version>5.3.4</springframework.version>
         <!-- CQ #23233 -->
-        <weld-se.version>4.0.2.Final</weld-se.version>
+        <weld-se.version>5.0.0.CR1</weld-se.version>
         <weblogic.version>12.2.1-3</weblogic.version>
         <wildfly.version>18.0.0.Final</wildfly.version>
         <wsdl4j.version>1.6.3</wsdl4j.version>
@@ -657,11 +659,6 @@
                 <artifactId>jakarta.persistence-api</artifactId>
                 <version>${jpa.api.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.mail</groupId>
-                <artifactId>jakarta.mail-api</artifactId>
-                <version>${mail.version}</version>
-            </dependency>
             <dependency>
                 <groupId>jakarta.resource</groupId>
                 <artifactId>jakarta.resource-api</artifactId>
@@ -869,6 +866,11 @@
                 <version>${hamcrest.version}</version>
             </dependency>
             <!--APIs and other libs used in test classes-->
+<!--            <dependency>-->
+<!--                <groupId>jakarta.el</groupId>-->
+<!--                <artifactId>jakarta.el-api</artifactId>-->
+<!--                <version>${el-api.version}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.jboss.weld.se</groupId>
                 <artifactId>weld-se-core</artifactId>