diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 321e00b01..92a7a8a54 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -35,8 +35,9 @@ jobs: name: ${{ matrix.cloud }} JDBC ${{ matrix.category }} on ${{ matrix.image }} runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - image: [ 'jdbc-centos6-default' ] + image: [ 'jdbc-centos6-default', 'jdbc-centos7-openjdk8', 'jdbc-centos7-openjdk11', 'jdbc-centos7-openjdk17' ] cloud: [ 'AWS' ] category: ['TestCategoryResultSet,TestCategoryOthers,TestCategoryLoader', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryArrow,TestCategoryCore', 'TestCategoryFips'] steps: @@ -54,6 +55,7 @@ jobs: name: Old JDBC ${{ matrix.category }} on ${{ matrix.image }} runs-on: ubuntu-latest strategy: + fail-fast: false matrix: image: [ 'jdbc-centos6-default' ] cloud: [ 'AWS' ] diff --git a/FIPS/pom.xml b/FIPS/pom.xml index 174bfc791..f98d95ced 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -973,6 +973,46 @@ + + java-9 + + (9,) + + + + + maven-failsafe-plugin + + + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.lang.reflect=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-exports=java.base/sun.nio.ch=ALL-UNNAMED + --add-exports=java.base/sun.security.internal.spec=ALL-UNNAMED + --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED + + + + + maven-surefire-plugin + + + --add-opens=java.base/java.io=ALL-UNNAMED + --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.lang=ALL-UNNAMED + --add-opens=java.base/java.lang.reflect=ALL-UNNAMED + --add-opens=java.base/java.util=ALL-UNNAMED + --add-exports=java.base/sun.nio.ch=ALL-UNNAMED + --add-exports=java.base/sun.security.internal.spec=ALL-UNNAMED + --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED + + + + + + jenkinsIT diff --git a/ci/image/Dockerfile.jdbc-centos7-openjdk-test b/ci/image/Dockerfile.jdbc-centos7-openjdk-test index 0c0073827..15e351530 100644 --- a/ci/image/Dockerfile.jdbc-centos7-openjdk-test +++ b/ci/image/Dockerfile.jdbc-centos7-openjdk-test @@ -63,7 +63,7 @@ FROM jdbc-centos7-openjdk-base AS jdbc-centos7-openjdk-yum # Java RUN yum -y install $JDK_PACKAGE -RUN echo export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which javac))))) >> /home/user/.bashrc +RUN sed -i /usr/local/bin/entrypoint.sh -e '/^exec/i export JAVA_HOME='$(dirname $(dirname $(readlink $(readlink $(which javac))))) RUN cd /root && \ mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ @@ -79,8 +79,8 @@ FROM jdbc-centos7-openjdk-base AS jdbc-centos7-openjdk17 RUN curl -o - https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz | tar xfz - -C /opt && \ ln -s /opt/jdk-17.0.2 /opt/jdk-17 -RUN echo export JAVA_HOME=/opt/jdk-17 >> /home/user/.bashrc -RUN echo export PATH=\$JAVA_HOME/bin:\$PATH >> /home/user/.bashrc +RUN sed -i /usr/local/bin/entrypoint.sh -e '/^exec/i export JAVA_HOME=/opt/jdk-17' +RUN sed -i /usr/local/bin/entrypoint.sh -e '/^exec/i export PATH=$JAVA_HOME/bin:$PATH' RUN export JAVA_HOME=/opt/jdk-17 && \ cd /root && \ diff --git a/ci/test.sh b/ci/test.sh index de0a3ab2e..273d236b2 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -2,9 +2,6 @@ # # Test JDBC # - -echo JAVA_HOME=$JAVA_HOME - set -o pipefail THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" JDBC_ROOT="$(cd "${THIS_DIR}/.." && pwd)" diff --git a/pom.xml b/pom.xml index 67995a0da..eb8286ded 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ true 5.13.0 1.15.3 - 3.5.6 + 4.11.0 UTF-8 UTF-8 net/snowflake/client/jdbc/internal @@ -502,7 +502,7 @@ org.mockito mockito-core - 3.5.6 + ${mockito.version} test @@ -1396,13 +1396,13 @@ maven-failsafe-plugin - --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED maven-surefire-plugin - --add-opens=java.base/java.nio=ALL-UNNAMED + --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED @@ -1732,4 +1732,4 @@ - + \ No newline at end of file diff --git a/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java b/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java index 2da471f48..14d697371 100644 --- a/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java +++ b/src/test/java/net/snowflake/client/core/SessionUtilLatestIT.java @@ -171,7 +171,7 @@ public void testForwardedHeaders() throws Throwable { // After login, the only invocation to http should have been with the new // headers. // No calls should have happened without additional headers. - mockedHttpUtil.verify(times(1), httpCalledWithHeaders); + mockedHttpUtil.verify(httpCalledWithHeaders, times(1)); } } @@ -226,7 +226,7 @@ public void testForwardInflightCtx() throws Throwable { // After login, the only invocation to http should have been with the new // headers. // No calls should have happened without additional headers. - mockedHttpUtil.verify(times(1), httpCalledWithHeaders); + mockedHttpUtil.verify(httpCalledWithHeaders, times(1)); } } diff --git a/src/test/java/net/snowflake/client/core/StmtUtilTest.java b/src/test/java/net/snowflake/client/core/StmtUtilTest.java index e59920206..5b7e2703b 100644 --- a/src/test/java/net/snowflake/client/core/StmtUtilTest.java +++ b/src/test/java/net/snowflake/client/core/StmtUtilTest.java @@ -88,7 +88,7 @@ public void testForwardedHeaders() throws Throwable { // After login, the only invocation to http should have been with the new // headers. // No calls should have happened without additional headers. - mockedHttpUtil.verify(times(1), httpCalledWithHeaders); + mockedHttpUtil.verify(httpCalledWithHeaders, times(1)); } } diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java index 29561d16a..03a58517f 100644 --- a/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java +++ b/src/test/java/net/snowflake/client/jdbc/ConnectionWithOCSPModeIT.java @@ -23,6 +23,7 @@ import net.snowflake.client.core.SFTrustManager; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -392,6 +393,8 @@ public void testOCSPResponder403FailClosed() { /** Test Certificate Expired. Will fail in both FAIL_OPEN and FAIL_CLOSED. */ @Test + @Ignore("Issuer of root CA expired") + // https://support.sectigo.com/articles/Knowledge/Sectigo-AddTrust-External-CA-Root-Expiring-May-30-2020 public void testExpiredCert() { try { DriverManager.getConnection(