diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 8c1fa66b705..55d7251b870 100644 --- 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 index 059050943dd..de0da33dee4 100644 --- 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 index 51f7ef03a79..8e422ff9161 100644 --- 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 index f42f72bb4f9..549beda3076 100644 --- a/buildsystem/compdeps/pom.xml +++ b/buildsystem/compdeps/pom.xml @@ -64,13 +64,13 @@ 9.6.0 - 1.2.3 - 2.3.8 - 1.5.1 - 1.5.7 - 2.7.6 - 2.3.2 - 1.2.1 + 1.2.13 + 2.3.9 + 1.5.3 + 1.5.10 + 2.7.10 + 2.3.7 + 1.2.2 1.3.5 3.2.6 3.0.3 @@ -80,46 +80,46 @@ 2.0.3 1.1.6 1.1.1 - 1.6.4 + 1.6.7 2.2.3 1.7.4 - 4.0.3 + 4.0.4 1.3.3 2.0.2 2.1.6 - 2.3.2 - 1.4.1 - 2.3.2 + 2.3.3 + 1.4.2 + 2.3.3 - 1.10.7_1 + 1.10.13_1 5.1.0 - 4.2.1 - 4.0.0 + 4.2.5 + 4.0.3 2.6.1 - 2.29.1 - 3.2.2 + 2.41 + 3.2.3 4.1.0 3.11.2 4.3.1 - 1.7.30 - 1.9.11 - 1.8.1 - 4.1 + 1.7.36 + 1.9.15 + 1.8.3 + 4.2.2 1.6.3 - 4.1.8.Final + 4.1.10.Final 23.3.0.23.09 23.2.0.0 18.3.10 - 1.2.4.Final + 1.2.5.Final - 3.4.1.Final + 3.4.3.Final 3.1.SP4 diff --git a/dbws/eclipselink.dbws.test/src/dbws/testing/DBWSTestHelper.java b/dbws/eclipselink.dbws.test/src/dbws/testing/DBWSTestHelper.java index 8833fa42aa1..bca8743f292 100644 --- 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 index b401913114d..016a63c8270 100644 --- 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 index f96cceccbf2..1a02356caa9 100755 --- 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 diff --git a/etc/jenkins/pr_verify.groovy b/etc/jenkins/pr_verify.groovy index d2ff2466b17..b3ebf9a4a28 100644 --- a/etc/jenkins/pr_verify.groovy +++ b/etc/jenkins/pr_verify.groovy @@ -1,4 +1,4 @@ -// Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved. +// Copyright (c) 2021, 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 @@ -90,7 +90,8 @@ spec: } } environment { - ANT_HOME="${env.HOME}/apache-ant-1.10.7" + ANT_HOME="${env.HOME}/apache-ant-1.10.14" + bind_address='0.0.0.0' } tools { maven 'apache-maven-latest' @@ -102,19 +103,19 @@ spec: steps { container('el-build') { sh """ - export bind_address=0.0.0.0 + export bind_address='0.0.0.0' /opt/bin/mysql-start.sh 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.14-bin.tar.gz -O $HOME/extension.lib.external/apache-ant-1.10.14-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.14-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 """ withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) { @@ -127,7 +128,7 @@ spec: } sh """ 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/ecltests?allowPublicKeyRetrieval=true' >> $HOME/build.properties @@ -158,6 +159,7 @@ spec: container('el-build') { sh """ echo '-[ EclipseLink Core LRG ]-----------------------------------------------------------' + export bind_address='0.0.0.0' $ANT_HOME/bin/ant -f antbuild.xml -Dfail.on.error=true test-core """ } @@ -179,6 +181,7 @@ spec: steps { container('el-build') { sh """ + export bind_address='0.0.0.0' $ANT_HOME/bin/ant -f antbuild.xml -Dfail.on.error=true test-jpa22 """ } @@ -188,6 +191,7 @@ spec: steps { container('el-build') { sh """ + export bind_address='0.0.0.0' $ANT_HOME/bin/ant -f antbuild.xml -Dfail.on.error=true test-sdo """ } @@ -197,6 +201,7 @@ spec: steps { container('el-build') { sh """ + export bind_address='0.0.0.0' $ANT_HOME/bin/ant -f antbuild.xml -Dfail.on.error=true test-jpa-jse test-ext test-jpql test-wdf test-jpars test-dbws test-dbws-builder test-osgi """ } diff --git a/etc/jenkins/promote.groovy b/etc/jenkins/promote.groovy index 7721d8f0f17..c6ca9a76189 100644 --- a/etc/jenkins/promote.groovy +++ b/etc/jenkins/promote.groovy @@ -102,6 +102,9 @@ spec: """ } } + environment { + bind_address='0.0.0.0' + } tools { jdk 'adoptopenjdk-hotspot-jdk11-latest' } diff --git a/foundation/eclipselink.core.test/antbuild.xml b/foundation/eclipselink.core.test/antbuild.xml index fa85ecc2b95..9eaeaaf9fa7 100644 --- a/foundation/eclipselink.core.test/antbuild.xml +++ b/foundation/eclipselink.core.test/antbuild.xml @@ -674,7 +674,7 @@ eclipselink.perfdb.user - performance DB user name (ex. root) eclipselink.perfdb.pwd - performance DB user password (ex. password) - eclipselink.perfdb.driver - database driver (ex. com.mysql.jdbc.Driver) + eclipselink.perfdb.driver - database driver (ex. com.mysql.cj.jdbc.Driver) eclipselink.perfdb.uri - database URI (ex. jdbc:mysql://localhost:3306/perfdb) eclipselink.perfdb.platform - database platform (ex. org.eclipse.persistence.platform.database.MySQLPlatform) eclipselink.perfdb.driver.jar - database driver jar location (ex. /opt/jdk/mysql-connector-java-5.1.30-bin.jar) diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/LoadBuildProject.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/LoadBuildProject.java index af59c6ae8b5..4500d9a0a41 100644 --- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/LoadBuildProject.java +++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/LoadBuildProject.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 @@ -34,7 +34,7 @@ public class LoadBuildProject extends org.eclipse.persistence.sessions.Project { // DB connection defaults public final static String DFLT_PERFDB_USER = "root"; public final static String DFLT_PERFDB_PWD = "password"; - public final static String DFLT_PERFDB_DRIVER = "com.mysql.jdbc.Driver"; + public final static String DFLT_PERFDB_DRIVER = "com.mysql.cj.jdbc.Driver"; public final static String DFLT_PERFDB_URI = "jdbc:mysql://localhost:3306/perfdb"; public final static String DFLT_PERFDB_PLATFORM = "org.eclipse.persistence.platform.database.MySQLPlatform"; diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/TestSystem.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/TestSystem.java index f3ccbb194eb..fe6189165e7 100644 --- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/TestSystem.java +++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/TestSystem.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 @@ -333,7 +333,7 @@ public void useMySQL(String userName) { DatabaseLogin login = new DatabaseLogin(); login.useMySQL(); - login.setDriverClassName("com.mysql.jdbc.Driver"); + login.setDriverClassName("com.mysql.cj.jdbc.Driver"); login.setDriverURLHeader("jdbc:mysql:"); login.useStreamsForBinding(); login.setUserName(userName); diff --git a/foundation/eclipselink.core.test/src/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java b/foundation/eclipselink.core.test/src/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java index 6d964c98316..a9bbffb202c 100644 --- a/foundation/eclipselink.core.test/src/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java +++ b/foundation/eclipselink.core.test/src/org/eclipse/persistence/tools/sessionconsole/LoginEditorPanel.java @@ -3031,7 +3031,7 @@ public void resetLogin() { getDriverChoice().addItem("com.oracle.ias.jdbc.sqlserver.SQLServerDriver"); getDriverChoice().addItem("com.microsoft.jdbc.sqlserver.SQLServerDriver"); getDriverChoice().addItem("weblogic.jdbc.mssqlserver4.Driver"); - getDriverChoice().addItem("com.mysql.jdbc.Driver"); + getDriverChoice().addItem("com.mysql.cj.jdbc.Driver"); getDriverChoice().addItem("sun.jdbc.odbc.JdbcOdbcDriver"); getDriverChoice().addItem("com.fujitsu.symfoware.jdbc.SYMDriver"); diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java index b13537c346c..0c673fe8aef 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/EntityManagerProperties.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 @@ -313,7 +313,7 @@ public class EntityManagerProperties { *  ("memberPu2" {@literal ->} (
*    "javax.persistence.jdbc.user" {@literal ->} "user2",
*    "javax.persistence.jdbc.password" {@literal ->} "password2"
- *    "javax.persistence.jdbc.driver" {@literal ->} "com.mysql.jdbc.Driver",
+ *    "javax.persistence.jdbc.driver" {@literal ->} "com.mysql.cj.jdbc.Driver",
*    "javax.persistence.jdbc.url" {@literal ->} "jdbc:mysql://my_sql_db_url:3306/user2",
*   )
* ) diff --git a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java index 9b900a215c7..27ae1f4008b 100644 --- a/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java +++ b/foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/config/PersistenceUnitProperties.java @@ -178,7 +178,7 @@ public class PersistenceUnitProperties { * *

* Persistence XML example:

-     * {@code }
+ * {@code } *

* The previous value for this property "eclipselink.jdbc.driver" is now deprecated * and should be replaced with this new name. @@ -3771,7 +3771,7 @@ public class PersistenceUnitProperties { * ("memberPu2" -> ( * "javax.persistence.jdbc.user" -> "user2", * "javax.persistence.jdbc.password" -> "password2", - * "javax.persistence.jdbc.driver" -> "com.mysql.jdbc.Driver", + * "javax.persistence.jdbc.driver" -> "com.mysql.cj.jdbc.Driver", * "javax.persistence.jdbc.url" -> "jdbc:mysql://my_sql_db_url:3306/user2" * ) * )} diff --git a/jpa/eclipselink.jaxrs.test/test.properties b/jpa/eclipselink.jaxrs.test/test.properties index 082429b0fb4..b9e06a8e594 100644 --- a/jpa/eclipselink.jaxrs.test/test.properties +++ b/jpa/eclipselink.jaxrs.test/test.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 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 @@ -18,7 +18,7 @@ extensions.depend.dir=../../../extension.lib.external extensions.depend.dir.oracle=../../../extension.oracle.lib.external # jdbc.driver.jar=/opt/jdk/jdbc/mysql-connector-java-5.0.8-bin.jar -# db.driver=com.mysql.jdbc.Driver +# db.driver=com.mysql.cj.jdbc.Driver # db.url=jdbc:mysql://localhost/eclipselink # db.user=root # db.pwd=password diff --git a/jpa/eclipselink.jpa.test.jse/test.properties b/jpa/eclipselink.jpa.test.jse/test.properties index 7d68bddb646..ba525fe53c5 100644 --- a/jpa/eclipselink.jpa.test.jse/test.properties +++ b/jpa/eclipselink.jpa.test.jse/test.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 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 @@ -17,7 +17,7 @@ extensions.depend.dir=../../../../extension.lib.external # Enter Database Connection Info jdbc.driver.jar=${extensions.depend.dir}/mysql-connector-java-5.1.18-bin.jar -db.driver=com.mysql.jdbc.Driver +db.driver=com.mysql.cj.jdbc.Driver db.url=jdbc:mysql://localhost/user db.user=user db.pwd=password diff --git a/jpa/eclipselink.jpa.test/antbuild.properties b/jpa/eclipselink.jpa.test/antbuild.properties index 7caa22b0527..77405ea6436 100644 --- a/jpa/eclipselink.jpa.test/antbuild.properties +++ b/jpa/eclipselink.jpa.test/antbuild.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 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 @@ -177,6 +177,6 @@ eclipselink.jpa.spring.test=../eclipselink.jpa.spring.test javax.validation.jar=jakarta.validation-api.jar validation-impl.jar=org.glassfish.bean-validator.jar # Hibernate-validator dependencies. -jboss-logging.jar=jboss-logging-3.4.1.Final.jar -javax.el.jar=javax.el-3.0.1-b08.jar -classmate.jar=classmate-1.5.1.jar +jboss-logging.jar=jboss-logging-3.4.3.Final.jar +javax.el.jar=javax.el-3.0.1-b12.jar +classmate.jar=classmate-1.6.0.jar diff --git a/jpa/eclipselink.jpa.test/netweaver.properties b/jpa/eclipselink.jpa.test/netweaver.properties index 75b17b79d88..a903ee82ded 100644 --- a/jpa/eclipselink.jpa.test/netweaver.properties +++ b/jpa/eclipselink.jpa.test/netweaver.properties @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2018, 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 @@ -36,7 +36,7 @@ netweaver.datasource.driver.deployname=mysql_driver # configure the data source to use for testing netweaver.datasource.name=LOCAL_MYSQL_DS -netweaver.datasource.driver.class=com.mysql.jdbc.Driver +netweaver.datasource.driver.class=com.mysql.cj.jdbc.Driver netweaver.datasource.url=jdbc:mysql://localhost/el netweaver.datasource.user=me netweaver.datasource.password=abcd1234 diff --git a/jpa/eclipselink.jpa.test/resource/eclipselink-composite-advanced-model-member_3/persistence.xml b/jpa/eclipselink.jpa.test/resource/eclipselink-composite-advanced-model-member_3/persistence.xml index 940017dbece..a06725834c0 100644 --- a/jpa/eclipselink.jpa.test/resource/eclipselink-composite-advanced-model-member_3/persistence.xml +++ b/jpa/eclipselink.jpa.test/resource/eclipselink-composite-advanced-model-member_3/persistence.xml @@ -1,6 +1,6 @@