Dependencies update (eclipse-ee4j#2018)

Dependencies update in the build files and Jenkins, GitHub environments MySQL driver name change from com.mysql.jdbc.Driver -> com.mysql.cj.jdbc.Driver to remove warning messages pr_verify job "bind_address='0.0.0.0'" env variable to bind MySQL daemon to IPv4 to avoid issues with ci.eclipse.org environment.
rfelcman · Dec 6, 2023 · b95fd8c · b95fd8c
1 parent 3689e62
commit b95fd8c
Show file tree

Hide file tree

Showing 43 changed files with 150 additions and 133 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -59,19 +59,19 @@ jobs:
       - name: Init
         run: |
           mkdir $HOME/extension.lib.external
-          wget -nc https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar -O $HOME/extension.lib.external/junit-4.12.jar
+          wget -nc https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar -O $HOME/extension.lib.external/junit-4.13.2.jar
           wget -nc https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -O $HOME/extension.lib.external/hamcrest-core-1.3.jar
           wget -nc https://repo1.maven.org/maven2/org/jmockit/jmockit/1.35/jmockit-1.35.jar -O $HOME/extension.lib.external/jmockit-1.35.jar
-          wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar -O $HOME/extension.lib.external/jboss-logging-3.4.1.Final.jar
-          wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b08/javax.el-3.0.1-b08.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b08.jar
-          wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar -O $HOME/extension.lib.external/classmate-1.5.1.jar
-          wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
+          wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar -O $HOME/extension.lib.external/jboss-logging-3.4.3.Final.jar
+          wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b12/javax.el-3.0.1-b12.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b12.jar
+          wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.6.0/classmate-1.6.0.jar -O $HOME/extension.lib.external/classmate-1.6.0.jar
+          wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.9-bin.tar.gz
           wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz
-          wget -nc https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar -O $HOME/extension.lib.external/mysql-connector-java.jar
-          tar -x -z -C $HOME -f $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
+          wget -nc https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.2.0/mysql-connector-j-8.2.0.jar -O $HOME/extension.lib.external/mysql-connector-java.jar
+          tar -x -z -C $HOME -f $HOME/extension.lib.external/apache-ant-1.10.9-bin.tar.gz
           tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz
           echo "extensions.depend.dir=$HOME/extension.lib.external" >> $HOME/build.properties
-          echo "junit.lib=$HOME/extension.lib.external/junit-4.12.jar:$HOME/extension.lib.external/hamcrest-core-1.3.jar" >> $HOME/build.properties
+          echo "junit.lib=$HOME/extension.lib.external/junit-4.13.2.jar:$HOME/extension.lib.external/hamcrest-core-1.3.jar" >> $HOME/build.properties
           echo "jdbc.driver.jar=$HOME/extension.lib.external/mysql-connector-java.jar" >> $HOME/build.properties
           echo 'db.driver=com.mysql.cj.jdbc.Driver' >> $HOME/build.properties
           echo 'db.url=jdbc:mysql://localhost:3306/ecltests?allowPublicKeyRetrieval=true' >> $HOME/build.properties

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -72,19 +72,19 @@ jobs:
       - name: Build
         run: |
           mkdir $HOME/extension.lib.external
-          wget -nc https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar -O $HOME/extension.lib.external/junit-4.12.jar
+          wget -nc https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar -O $HOME/extension.lib.external/junit-4.13.2.jar
           wget -nc https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -O $HOME/extension.lib.external/hamcrest-core-1.3.jar
           wget -nc https://repo1.maven.org/maven2/org/jmockit/jmockit/1.35/jmockit-1.35.jar -O $HOME/extension.lib.external/jmockit-1.35.jar
-          wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar -O $HOME/extension.lib.external/jboss-logging-3.4.1.Final.jar
-          wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b08/javax.el-3.0.1-b08.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b08.jar
-          wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar -O $HOME/extension.lib.external/classmate-1.5.1.jar
-          wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
+          wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar -O $HOME/extension.lib.external/jboss-logging-3.4.3.Final.jar
+          wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b12/javax.el-3.0.1-b12.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b12.jar
+          wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.6.0/classmate-1.6.0.jar -O $HOME/extension.lib.external/classmate-1.6.0.jar
+          wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.9-bin.tar.gz
           wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz
-          wget -nc https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar -O $HOME/extension.lib.external/mysql-connector-java.jar
-          tar -x -z -C $HOME -f $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
+          wget -nc https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.2.0/mysql-connector-j-8.2.0.jar -O $HOME/extension.lib.external/mysql-connector-java.jar
+          tar -x -z -C $HOME -f $HOME/extension.lib.external/apache-ant-1.10.9-bin.tar.gz
           tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz
           echo "extensions.depend.dir=$HOME/extension.lib.external" >> $HOME/build.properties
-          echo "junit.lib=$HOME/extension.lib.external/junit-4.12.jar:$HOME/extension.lib.external/hamcrest-core-1.3.jar" >> $HOME/build.properties
+          echo "junit.lib=$HOME/extension.lib.external/junit-4.13.2.jar:$HOME/extension.lib.external/hamcrest-core-1.3.jar" >> $HOME/build.properties
           echo "jdbc.driver.jar=$HOME/extension.lib.external/mysql-connector-java.jar" >> $HOME/build.properties
           echo 'db.driver=com.mysql.cj.jdbc.Driver' >> $HOME/build.properties
           echo 'db.url=jdbc:mysql://localhost:3306/ecltests?allowPublicKeyRetrieval=true' >> $HOME/build.properties

diff --git a/autobuild.properties b/autobuild.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2023 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
@@ -62,7 +62,7 @@ eclipselink.extension.oracle.test.trunk=.
 # db.user, db.pwd and db.url need to be defined in ${env.HOME_DIR}/db.dat
 # db.url left in here for documentation purposes
 jdbc.driver.jar=${jdbc.driver.lib}
-db.driver=com.mysql.jdbc.Driver
+db.driver=com.mysql.cj.jdbc.Driver
 db.url=jdbc:mysql://build.eclipse.org/eclipselink?autoReconnect=true&failOverReadOnly=false&maxReconnects=10
 db.user=
 db.pwd=

diff --git a/buildsystem/compdeps/pom.xml b/buildsystem/compdeps/pom.xml
@@ -64,13 +64,13 @@
         <!-- DEPENDENCY Versions -->
         <eclipselink.asm.version>9.6.0</eclipselink.asm.version>
         <!-- CQ #21139, 21140 -->
-        <ch.qos.logback.version>1.2.3</ch.qos.logback.version>
-        <com.sun.xml.bind.version>2.3.8</com.sun.xml.bind.version>
-        <com.sun.xml.messaging.version>1.5.1</com.sun.xml.messaging.version>
-        <com.sun.xml.streambuffer.version>1.5.7</com.sun.xml.streambuffer.version>
-        <com.sun.xml.ws.policy.version>2.7.6</com.sun.xml.ws.policy.version>
-        <com.sun.xml.ws.version>2.3.2</com.sun.xml.ws.version>
-        <jakarta.activation.version>1.2.1</jakarta.activation.version>
+        <ch.qos.logback.version>1.2.13</ch.qos.logback.version>
+        <com.sun.xml.bind.version>2.3.9</com.sun.xml.bind.version>
+        <com.sun.xml.messaging.version>1.5.3</com.sun.xml.messaging.version>
+        <com.sun.xml.streambuffer.version>1.5.10</com.sun.xml.streambuffer.version>
+        <com.sun.xml.ws.policy.version>2.7.10</com.sun.xml.ws.policy.version>
+        <com.sun.xml.ws.version>2.3.7</com.sun.xml.ws.version>
+        <jakarta.activation.version>1.2.2</jakarta.activation.version>
         <jakarta.annotation.version>1.3.5</jakarta.annotation.version>
         <jakarta.ejb.version>3.2.6</jakarta.ejb.version>
         <jakarta.el.version>3.0.3</jakarta.el.version>
@@ -80,46 +80,46 @@
         <jakarta.jms.version>2.0.3</jakarta.jms.version>
         <jakarta.json.version>1.1.6</jakarta.json.version>
         <jakarta.jws.version>1.1.1</jakarta.jws.version>
-        <jakarta.mail.version>1.6.4</jakarta.mail.version>
+        <jakarta.mail.version>1.6.7</jakarta.mail.version>
         <jakarta.persistence.version>2.2.3</jakarta.persistence.version>
         <jakarta.resource.version>1.7.4</jakarta.resource.version>
-        <jakarta.servlet.version>4.0.3</jakarta.servlet.version>
+        <jakarta.servlet.version>4.0.4</jakarta.servlet.version>
         <jakarta.transaction.version>1.3.3</jakarta.transaction.version>
         <jakarta.validation.version>2.0.2</jakarta.validation.version>
         <jakarta.ws.rs.version>2.1.6</jakarta.ws.rs.version>
-        <jakarta.xml.bind.version>2.3.2</jakarta.xml.bind.version>
-        <jakarta.xml.soap.version>1.4.1</jakarta.xml.soap.version>
-        <jakarta.xml.ws-api.version>2.3.2</jakarta.xml.ws-api.version>
+        <jakarta.xml.bind.version>2.3.3</jakarta.xml.bind.version>
+        <jakarta.xml.soap.version>1.4.2</jakarta.xml.soap.version>
+        <jakarta.xml.ws-api.version>2.3.3</jakarta.xml.ws-api.version>
         <!-- CQ #21133 -->
-        <org.apache.ant.version>1.10.7_1</org.apache.ant.version>
+        <org.apache.ant.version>1.10.13_1</org.apache.ant.version>
         <org.glassfish.bean-validator.version>5.1.0</org.glassfish.bean-validator.version>
-        <org.glassfish.corba.version>4.2.1</org.glassfish.corba.version>
-        <org.glassfish.gmbal.version>4.0.0</org.glassfish.gmbal.version>
+        <org.glassfish.corba.version>4.2.5</org.glassfish.corba.version>
+        <org.glassfish.gmbal.version>4.0.3</org.glassfish.gmbal.version>
         <org.glassfish.hk2.version>2.6.1</org.glassfish.hk2.version>
-        <org.glassfish.jersey.version>2.29.1</org.glassfish.jersey.version>
-        <org.glassfish.management-api.version>3.2.2</org.glassfish.management-api.version>
+        <org.glassfish.jersey.version>2.41</org.glassfish.jersey.version>
+        <org.glassfish.management-api.version>3.2.3</org.glassfish.management-api.version>
         <org.glassfish.pfl.version>4.1.0</org.glassfish.pfl.version>
         <!-- CQ #21138 -->
         <org.mongodb.version>3.11.2</org.mongodb.version>
         <!-- CQ #21142 -->
         <org.osgi.version>4.3.1</org.osgi.version>
         <!-- CQ #21339 -->
-        <org.slf4j.version>1.7.30</org.slf4j.version>
-        <org.jvnet.mimepull.version>1.9.11</org.jvnet.mimepull.version>
-        <stax-ex.version>1.8.1</stax-ex.version>
-        <stax2-api.version>4.1</stax2-api.version>
+        <org.slf4j.version>1.7.36</org.slf4j.version>
+        <org.jvnet.mimepull.version>1.9.15</org.jvnet.mimepull.version>
+        <stax-ex.version>1.8.3</stax-ex.version>
+        <stax2-api.version>4.2.2</stax2-api.version>
         <wsdl4j.version>1.6.3</wsdl4j.version>
         <!-- CQ #21122 -->
-        <org.jgroups.version>4.1.8.Final</org.jgroups.version>
+        <org.jgroups.version>4.1.10.Final</org.jgroups.version>
         <!-- CQ #21154 -->
         <oracle.jdbc.version>23.3.0.23.09</oracle.jdbc.version>
         <oracle.apapi.version>23.2.0.0</oracle.apapi.version>
         <!-- CQ #21141 -->
         <oracle.nosql.version>18.3.10</oracle.nosql.version>
         <!-- CQ #22994 -->
-        <jboss.classfilewriter.version>1.2.4.Final</jboss.classfilewriter.version>
+        <jboss.classfilewriter.version>1.2.5.Final</jboss.classfilewriter.version>
         <!-- CQ #22995 -->
-        <jboss.logging.version>3.4.1.Final</jboss.logging.version>
+        <jboss.logging.version>3.4.3.Final</jboss.logging.version>
         <!-- CQ #22996 API, #22997 SPI-->
         <jboss.weld.api.version>3.1.SP4</jboss.weld.api.version>
         <!-- CQ #22998 weld-environment-common, #22999 weld-se-core,  #23000 weld-core-impl -->

diff --git a/dbws/eclipselink.dbws.test/src/dbws/testing/DBWSTestHelper.java b/dbws/eclipselink.dbws.test/src/dbws/testing/DBWSTestHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2023 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
@@ -38,7 +38,7 @@ public class DBWSTestHelper {
     public final static String DEFAULT_DATABASE_PASSWORD = "password";
     public final static String DEFAULT_DATABASE_URL = "jdbc:mysql://localhost:3306/test" +
         DEFAULT_DATABASE_USERNAME;
-    public final static String DEFAULT_DATABASE_DRIVER = "com.mysql.jdbc.Driver";
+    public final static String DEFAULT_DATABASE_DRIVER = "com.mysql.cj.jdbc.Driver";
     public final static String DEFAULT_DATABASE_PLATFORM =
         "org.eclipse.persistence.platform.database.MySQLPlatform";
     public final static String DATABASE_DDL_CREATE_KEY = "db.ddl.create";

diff --git a/etc/jenkins/build.groovy b/etc/jenkins/build.groovy
@@ -102,6 +102,9 @@ spec:
 """
         }
     }
+    environment {
+        bind_address='0.0.0.0'
+    }
     tools {
         jdk 'adoptopenjdk-hotspot-jdk11-latest'
     }

diff --git a/etc/jenkins/init.sh b/etc/jenkins/init.sh
@@ -17,15 +17,15 @@ echo '-[ EclipseLink Init ]-----------------------------------------------------
 mkdir -p $HOME/extension.lib.external/mavenant
 
 #DOWNLOAD SOME DEPENDENCIES
-wget -nc https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar -O $HOME/extension.lib.external/junit-4.12.jar
+wget -nc https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar -O $HOME/extension.lib.external/junit-4.13.2.jar
 wget -nc https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar -O $HOME/extension.lib.external/hamcrest-core-1.3.jar
 wget -nc https://repo1.maven.org/maven2/org/jmockit/jmockit/1.35/jmockit-1.35.jar -O $HOME/extension.lib.external/jmockit-1.35.jar
-wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.1.Final/jboss-logging-3.4.1.Final.jar -O $HOME/extension.lib.external/jboss-logging-3.4.1.Final.jar
-wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b08/javax.el-3.0.1-b08.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b08.jar
-wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar -O $HOME/extension.lib.external/classmate-1.5.1.jar
-wget -nc https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.28/mysql-connector-java-8.0.28.jar -O $HOME/extension.lib.external/mysql-connector-java-8.0.28.jar
+wget -nc https://repo1.maven.org/maven2/org/jboss/logging/jboss-logging/3.4.3.Final/jboss-logging-3.4.3.Final.jar -O $HOME/extension.lib.external/jboss-logging-3.4.3.Final.jar
+wget -nc https://repo1.maven.org/maven2/org/glassfish/javax.el/3.0.1-b12/javax.el-3.0.1-b12.jar -O $HOME/extension.lib.external/javax.el-3.0.1-b12.jar
+wget -nc https://repo1.maven.org/maven2/com/fasterxml/classmate/1.6.0/classmate-1.6.0.jar -O $HOME/extension.lib.external/classmate-1.6.0.jar
+wget -nc https://repo1.maven.org/maven2/com/mysql/mysql-connector-j/8.2.0/mysql-connector-j-8.2.0.jar -O $HOME/extension.lib.external/mysql-connector-j-8.2.0.jar
 wget -nc https://repo1.maven.org/maven2/org/jgroups/jgroups/4.1.8.Final/jgroups-4.1.8.Final.jar -O $HOME/extension.lib.external/jgroups.jar
-wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.7-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.7-bin.tar.gz
+wget -nc https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.9-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.9-bin.tar.gz
 wget -nc https://archive.apache.org/dist/maven/ant-tasks/2.1.3/binaries/maven-ant-tasks-2.1.3.jar -O $HOME/extension.lib.external/mavenant/maven-ant-tasks-2.1.3.jar
 wget -nc https://download.jboss.org/wildfly/15.0.1.Final/wildfly-15.0.1.Final.tar.gz -O $HOME/extension.lib.external/wildfly-15.0.1.Final.tar.gz
 wget -nc https://download.eclipse.org/eclipse/downloads/drops4/R-4.10-201812060815/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz -O $HOME/extension.lib.external/eclipse-SDK-4.10-linux-gtk-x86_64.tar.gz
@@ -38,8 +38,8 @@ tar -x -z -C $HOME/extension.lib.external -f $HOME/extension.lib.external/apache
 
 #PREPARE build.properties FILE
 echo "extensions.depend.dir=$HOME/extension.lib.external" >> $HOME/build.properties
-echo "junit.lib=$HOME/extension.lib.external/junit-4.12.jar:$HOME/extension.lib.external/hamcrest-core-1.3.jar" >> $HOME/build.properties
-echo "jdbc.driver.jar=$HOME/extension.lib.external/mysql-connector-java-8.0.28.jar" >> $HOME/build.properties
+echo "junit.lib=$HOME/extension.lib.external/junit-4.13.2.jar:$HOME/extension.lib.external/hamcrest-core-1.3.jar" >> $HOME/build.properties
+echo "jdbc.driver.jar=$HOME/extension.lib.external/mysql-connector-j-8.2.0.jar" >> $HOME/build.properties
 echo 'db.driver=com.mysql.cj.jdbc.Driver' >> $HOME/build.properties
 echo "db.url=$TEST_DB_URL" >> $HOME/build.properties
 echo "db.user=$TEST_DB_USERNAME" >> $HOME/build.properties