diff --git a/FIPS/pom.xml b/FIPS/pom.xml index 4499a012b..216c68f0d 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -188,9 +188,9 @@ lib - - *.jar - + + *.jar + @@ -339,7 +339,7 @@ self-contained-jar - + !not-self-contained-jar @@ -351,21 +351,21 @@ ${version.plugin.buildnumber} - package - - create-timestamp - + package + + create-timestamp + - - - yyyyMMddHHmmss - buildNumber.timestamp - false - - false - - + + + yyyyMMddHHmmss + buildNumber.timestamp + false + + false + + org.apache.maven.plugins @@ -380,208 +380,215 @@ shade - - - net.snowflake.common - ${shadeBase}.snowflake.common - - - org.apache - ${shadeBase}.apache - - - com.amazonaws - ${shadeBase}.amazonaws - - - software.amazon.ion - ${shadeBase}.software.amazon.ion - - - com.microsoft.azure - ${shadeBase}.microsoft.azure - - - com.fasterxml - ${shadeBase}.fasterxml - - - com.google - ${shadeBase}.google - - - google.geo - ${shadeBase}.google.geo - - - org.joda - ${shadeBase}.joda - - - com.yammer - ${shadeBase}.yammer - - - javax.servlet - ${shadeBase}.javax.servlet - - - org.jsoup - ${shadeBase}.org.jsoup - - - com.nimbusds - ${shadeBase}.com.nimbusds - - - javax.annotation - ${shadeBase}.javax.annotation - - - net.jcip - ${shadeBase}.net.jcip - - - net.minidev - ${shadeBase}.net.minidev - - - org.objectweb - ${shadeBase}.org.objectweb - - - io.netty - ${shadeBase}.io.netty - - - com.carrotsearch - ${shadeBase}.com.carrotsearch - - - google.type - ${shadeBase}.google.type - - - google.rpc - ${shadeBase}.google.rpc - - - google.iam - ${shadeBase}.google.iam - - - io.opencensus - ${shadeBase}.opencensus - - - org.threeten - ${shadeBase}.threeten - - - google.protobuf - ${shadeBase}.google.protobuf - - - google.api - ${shadeBase}.google.api - - - google.storage - ${shadeBase}.google.storage - - - io.grpc - ${shadeBase}.grpc - - - google.longrunning - ${shadeBase}.google.longrunning - - - google.cloud - ${shadeBase}.google.cloud - - - google.logging - ${shadeBase}.google.logging - - - org.checkerframework - ${shadeBase}.org.checkerframework - - - org.codehaus - ${shadeBase}.org.codehaus - - - io.perfmark - ${shadeBase}.io.perfmark - - - org.conscrypt - ${shadeBase}.org.conscrypt - - - opencensus - ${shadeBase}.opencensus - - - grpc - ${shadeBase}.grpc - - - android.annotation - ${shadeBase}.android.annotation - - - - - *:* - - META-INF/LICENSE* - META-INF/NOTICE* - META-INF/DEPENDENCIES - META-INF/maven/** - META-INF/services/com.fasterxml.* - META-INF/versions/9/module-info.* - META-INF/*.xml - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - .netbeans_automatic_build - git.properties - arrow-git.properties - google-http-client.properties - pipes-fork-server-default-log4j2.xml - dependencies.properties - - - - org.apache.arrow:arrow-vector - - - codegen/** - - - - com.google.guava:guava - - com/google/common/io/** - com/google/common/base/** - com/google/common/hash/** - com/google/common/collect/** - com/google/common/graph/** - com/google/common/math/** - com/google/common/util/concurrent/** - - - - commons-logging:commons-logging - - org/apache/commons/logging/impl/AvalonLogger.class - - - + + + net.snowflake.common + ${shadeBase}.snowflake.common + + + org.apache + ${shadeBase}.apache + + + com.amazonaws + ${shadeBase}.amazonaws + + + software.amazon.ion + ${shadeBase}.software.amazon.ion + + + com.microsoft.azure + ${shadeBase}.microsoft.azure + + + com.fasterxml + ${shadeBase}.fasterxml + + + com.google + ${shadeBase}.google + + + google.geo + ${shadeBase}.google.geo + + + org.joda + ${shadeBase}.joda + + + com.yammer + ${shadeBase}.yammer + + + javax.servlet + ${shadeBase}.javax.servlet + + + org.jsoup + ${shadeBase}.org.jsoup + + + com.nimbusds + ${shadeBase}.com.nimbusds + + + javax.annotation + ${shadeBase}.javax.annotation + + + net.jcip + ${shadeBase}.net.jcip + + + net.minidev + ${shadeBase}.net.minidev + + + org.objectweb + ${shadeBase}.org.objectweb + + + io.netty + ${shadeBase}.io.netty + + + com.carrotsearch + ${shadeBase}.com.carrotsearch + + + google.type + ${shadeBase}.google.type + + + google.rpc + ${shadeBase}.google.rpc + + + google.iam + ${shadeBase}.google.iam + + + io.opencensus + ${shadeBase}.opencensus + + + org.threeten + ${shadeBase}.threeten + + + google.protobuf + ${shadeBase}.google.protobuf + + + google.api + ${shadeBase}.google.api + + + google.storage + ${shadeBase}.google.storage + + + io.grpc + ${shadeBase}.grpc + + + org.eclipse.collections + ${shadeBase}org.eclipse.collections + + + google.longrunning + ${shadeBase}.google.longrunning + + + google.cloud + ${shadeBase}.google.cloud + + + google.logging + ${shadeBase}.google.logging + + + org.checkerframework + ${shadeBase}.org.checkerframework + + + org.codehaus + ${shadeBase}.org.codehaus + + + io.perfmark + ${shadeBase}.io.perfmark + + + org.conscrypt + ${shadeBase}.org.conscrypt + + + opencensus + ${shadeBase}.opencensus + + + grpc + ${shadeBase}.grpc + + + android.annotation + ${shadeBase}.android.annotation + + + + + *:* + + META-INF/LICENSE* + META-INF/NOTICE* + META-INF/DEPENDENCIES + META-INF/maven/** + META-INF/services/com.fasterxml.* + META-INF/versions/9/module-info.* + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + about.html + LICENSE-EDL-1.0.txt + LICENSE-EPL-1.0.txt + .netbeans_automatic_build + git.properties + arrow-git.properties + google-http-client.properties + pipes-fork-server-default-log4j2.xml + dependencies.properties + + + + org.apache.arrow:arrow-vector + + + codegen/** + + + + com.google.guava:guava + + com/google/common/io/** + com/google/common/base/** + com/google/common/hash/** + com/google/common/collect/** + com/google/common/graph/** + com/google/common/math/** + com/google/common/util/concurrent/** + + + + commons-logging:commons-logging + + org/apache/commons/logging/impl/AvalonLogger.class + + + @@ -653,7 +660,7 @@ - + org.codehaus.mojo exec-maven-plugin diff --git a/TestOnly/pom.xml b/TestOnly/pom.xml index d8a594471..f97abbf33 100644 --- a/TestOnly/pom.xml +++ b/TestOnly/pom.xml @@ -12,9 +12,9 @@ UTF-8 UTF-8 - 10.0.1 + 15.0.2 4.2.0 - 2.13.4.2 + 2.16.0 0.8.4 true 5.13.0 @@ -27,12 +27,12 @@ io.netty netty-common - 4.1.77.Final + 4.1.111.Final io.netty netty-buffer - 4.1.77.Final + 4.1.111.Final org.apache.maven.plugins diff --git a/dependencies/arrow-format-10.0.1.jar b/dependencies/arrow-format-10.0.1.jar deleted file mode 100644 index 26b30d66b..000000000 Binary files a/dependencies/arrow-format-10.0.1.jar and /dev/null differ diff --git a/dependencies/arrow-format-15.0.2.jar b/dependencies/arrow-format-15.0.2.jar new file mode 100644 index 000000000..f3bbe0d18 Binary files /dev/null and b/dependencies/arrow-format-15.0.2.jar differ diff --git a/dependencies/arrow-memory-10.0.1.pom b/dependencies/arrow-memory-10.0.1.pom deleted file mode 100644 index f2d890f81..000000000 --- a/dependencies/arrow-memory-10.0.1.pom +++ /dev/null @@ -1,29 +0,0 @@ - - - - 4.0.0 - - org.apache.arrow - arrow-java-root - 10.0.1 - - arrow-memory - Arrow Memory - pom - - - memory-core - memory-unsafe - memory-netty - - - diff --git a/dependencies/arrow-memory-15.0.2.pom b/dependencies/arrow-memory-15.0.2.pom new file mode 100644 index 000000000..e112505f5 --- /dev/null +++ b/dependencies/arrow-memory-15.0.2.pom @@ -0,0 +1,36 @@ + + + + 4.0.0 + + org.apache.arrow + arrow-java-root + 15.0.2 + + arrow-memory + pom + Arrow Memory + + + memory-core + memory-unsafe + memory-netty + + diff --git a/dependencies/arrow-memory-core-10.0.1.jar b/dependencies/arrow-memory-core-10.0.1.jar deleted file mode 100644 index 264c9e373..000000000 Binary files a/dependencies/arrow-memory-core-10.0.1.jar and /dev/null differ diff --git a/dependencies/arrow-memory-core-15.0.2.jar b/dependencies/arrow-memory-core-15.0.2.jar new file mode 100644 index 000000000..61cce04dd Binary files /dev/null and b/dependencies/arrow-memory-core-15.0.2.jar differ diff --git a/dependencies/arrow-memory-netty-10.0.1.jar b/dependencies/arrow-memory-netty-15.0.2.jar similarity index 50% rename from dependencies/arrow-memory-netty-10.0.1.jar rename to dependencies/arrow-memory-netty-15.0.2.jar index fa3ff089d..81b7aa8d5 100644 Binary files a/dependencies/arrow-memory-netty-10.0.1.jar and b/dependencies/arrow-memory-netty-15.0.2.jar differ diff --git a/dependencies/arrow-memory-unsafe-10.0.1.jar b/dependencies/arrow-memory-unsafe-15.0.2.jar similarity index 55% rename from dependencies/arrow-memory-unsafe-10.0.1.jar rename to dependencies/arrow-memory-unsafe-15.0.2.jar index 45868d0e7..c79309e81 100644 Binary files a/dependencies/arrow-memory-unsafe-10.0.1.jar and b/dependencies/arrow-memory-unsafe-15.0.2.jar differ diff --git a/dependencies/arrow-vector-10.0.1.jar b/dependencies/arrow-vector-15.0.2.jar similarity index 58% rename from dependencies/arrow-vector-10.0.1.jar rename to dependencies/arrow-vector-15.0.2.jar index fcc53e3f6..e3a27da60 100644 Binary files a/dependencies/arrow-vector-10.0.1.jar and b/dependencies/arrow-vector-15.0.2.jar differ diff --git a/parent-pom.xml b/parent-pom.xml index 121d4673c..b369bb180 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 net.snowflake @@ -19,11 +19,11 @@ 1.10.0 4.5.14 4.4.16 - 10.0.1 + 15.0.2 9.3 1.8.1 4.2.0 - 1.12.501 + 1.12.655 5.0.0 1.74 1.0.2.4 @@ -38,13 +38,14 @@ 1.2 1.5.4 0.9.5.4 + 11.1.0 2.22.0 1.19.0 2.21.0 2.22.6 2.10.1 2.18.0 - 1.12.0 + 23.5.26 2.31.0 32.1.1-jre 1.43.3 @@ -53,7 +54,7 @@ 1.60.0 2.2 2.4.3 - 2.15.3 + 2.16.0 true 3.1.0 5.13.0 @@ -73,7 +74,7 @@ UTF-8 net/snowflake/client/jdbc/internal net.snowflake.client.jdbc.internal - 2.0.6 + 2.0.9 5.1.4 net.snowflake.client.category.AllTestCategory 1.6.8 @@ -98,7 +99,7 @@ 3.3.0 3.5.0 3.4.2 - 3.4.1 + 3.5.0 3.0.1 3.2.1 3.0.0 @@ -120,6 +121,12 @@ pom import + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + pom + runtime + com.google.http-client google-http-client-bom @@ -393,6 +400,18 @@ ${google.flatbuffers.version} runtime + + org.eclipse.collections + eclipse-collections + ${eclipse.collections.version} + runtime + + + org.eclipse.collections + eclipse-collections-api + ${eclipse.collections.version} + runtime + org.apache.arrow arrow-format @@ -613,7 +632,7 @@ runtime - io.netty + io.netty netty-buffer runtime @@ -667,6 +686,14 @@ com.google.flatbuffers flatbuffers-java + + org.eclipse.collections + eclipse-collections + + + org.eclipse.collections + eclipse-collections-api + org.apache.arrow arrow-format diff --git a/pom.xml b/pom.xml index a6ee94f35..5747c5736 100644 --- a/pom.xml +++ b/pom.xml @@ -1,1417 +1,1428 @@ - - - 4.0.0 - - - net.snowflake - snowflake-jdbc-parent - 3.18.1-SNAPSHOT - ./parent-pom.xml - - - - ${artifactId} - 3.18.1-SNAPSHOT - jar - - ${artifactId} - https://github.com/snowflakedb/snowflake-jdbc - - - scm:git:https://github.com/snowflakedb/snowflake-jdbc.git - https://github.com/snowflakedb/snowflake-jdbc - - - - snowflake-jdbc - - - - - org.bouncycastle - bcpkix-jdk18on - - - org.bouncycastle - bcprov-jdk18on - - - - - ${project.artifactId} - - - true - src/main/resources - - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - ${version.plugin.sortpom} - - - com.github.siom79.japicmp - japicmp-maven-plugin - ${version.plugin.japicmp} - - - com.spotify.fmt - fmt-maven-plugin - ${version.plugin.fmt} - - - org.apache.maven.plugins - maven-antrun-plugin - ${version.plugin.antrun} - - - org.apache.maven.plugins - maven-checkstyle-plugin - ${version.plugin.checkstyle} - - - org.apache.maven.plugins - maven-clean-plugin - ${version.plugin.clean} - - - org.apache.maven.plugins - maven-compiler-plugin - ${version.plugin.compiler} - - - org.apache.maven.plugins - maven-dependency-plugin - ${version.plugin.dependency} - - - org.apache.maven.plugins - maven-deploy-plugin - ${version.plugin.deploy} - - - org.apache.maven.plugins - maven-enforcer-plugin - ${version.plugin.enforcer} - - - org.apache.maven.plugins - maven-failsafe-plugin - ${version.plugin.failsafe} - - - org.apache.maven.plugins - maven-gpg-plugin - ${version.plugin.gpg} - - - org.apache.maven.plugins - maven-install-plugin - ${version.plugin.install} - - - org.apache.maven.plugins - maven-jar-plugin - ${version.plugin.jar} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${version.plugin.javadoc} - - - org.apache.maven.plugins - maven-project-info-reports-plugin - ${version.plugin.projectinforeports} - - - org.apache.maven.plugins - maven-shade-plugin - ${version.plugin.shade} - - - org.apache.maven.plugins - maven-source-plugin - ${version.plugin.source} - - - org.apache.maven.plugins - maven-surefire-plugin - ${version.plugin.surefire} - - - org.codehaus.mojo - buildnumber-maven-plugin - ${version.plugin.buildnumber} - - - org.codehaus.mojo - exec-maven-plugin - ${version.plugin.exec} - - - org.jacoco - jacoco-maven-plugin - ${version.plugin.jacoco} - - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - - false - false - true - scope,groupId,artifactId - groupId,artifactId - true - true - true - stop - strict - - - - - verify - - validate - - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - - true - false - \d+\.\d+\.\d+ - - com.snowflake - net.snowflake - - - @net.snowflake.client.core.SnowflakeJdbcInternalApi - ${shadeBase} - - - - - - japicmp - - cmp - - verify - - - - - org.apache.maven.plugins - maven-clean-plugin - - - - - lib - - *.jar - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - true - true - javac - true - 8 - 8 - - -Xlint:all,-path - - - - - default-testCompile - - testCompile - - test-compile - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - analyze - - analyze-only - - - true - true - - javax.servlet:javax.servlet-api - - - - - install-jar - - copy - - install - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - - - lib - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - com.google.cloud.tools - linkage-checker-enforcer-rules - 1.5.13 - - - org.codehaus.mojo - extra-enforcer-rules - 1.3 - - - org.eclipse.aether - aether-util - - - - - - - enforce-best-practices - - enforce - - - - - true - true - - - arrow-memory-unsafe - - org.apache.arrow.memory.DefaultAllocationManagerFactory - - - - - - - - - - - - - enforce-maven - - enforce - - - - - ${version.maven} - - - - - - enforce-linkage-checker - - enforce - - verify - - - - true - linkage-checker-exclusion-rules.xml - - - - - - - - org.apache.maven.plugins - maven-install-plugin - - - install-arrow-format - - install-file - - validate - - ${project.basedir}/dependencies/arrow-format-${arrow.version}.jar - org.apache.arrow - arrow-format - ${arrow.version} - jar - true - - - - install-arrow-memory-core - - install-file - - validate - - ${project.basedir}/dependencies/arrow-memory-core-${arrow.version}.jar - org.apache.arrow - arrow-memory-core - ${arrow.version} - jar - true - - - - install-arrow-memory-netty - - install-file - - validate - - ${project.basedir}/dependencies/arrow-memory-netty-${arrow.version}.jar - org.apache.arrow - arrow-memory-netty - ${arrow.version} - jar - true - - - - install-arrow-memory-pom - - install-file - - validate - - ${project.basedir}/dependencies/arrow-memory-${arrow.version}.pom - org.apache.arrow - arrow-memory - ${arrow.version} - pom - true - - - - - install-arrow-memory-unsafe - - install-file - - validate - - ${project.basedir}/dependencies/arrow-memory-unsafe-${arrow.version}.jar - org.apache.arrow - arrow-memory-unsafe - ${arrow.version} - jar - true - - - - - install-arrow-vector - - install-file - - validate - - ${project.basedir}/dependencies/arrow-vector-${arrow.version}.jar - org.apache.arrow - arrow-vector - ${arrow.version} - jar - true - - - - install-tika-core - - install-file - - validate - - ${project.basedir}/dependencies/tika-core-${tika.version}.jar - org.apache.tika - tika-core - ${tika.version} - jar - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - net.snowflake.client.jdbc.SnowflakeDriver - true - - - - - - - test-jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 8 - ${project.basedir}/src/main/javadoc/overview.html - java - ${project.basedir}/src/main/javadoc/licenses.html - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - org.jacoco - jacoco-maven-plugin - - ${jacoco.skip.instrument} - - - - pre-unit-test - - prepare-agent - - - target/jacoco-ut.exec - - - - post-unit-test - - report - - test - - target/jacoco-ut.exec - target/jacoco-ut - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - - check-style - - - - com.spotify.fmt - fmt-maven-plugin - - - fmt - - check - - validate - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - - - - - - - - true - true - true - warning - - - - checkstyle - - check - - validate - - - - - - - - thin-jar - - - thin-jar - - - - snowflake-jdbc-thin - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-linkage-checker - - enforce - - none - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - - shade - - package - - - - net.snowflake:snowflake-common - org.apache.arrow:* - org.apache.tika:tika-core - io.netty:* - - - - - - net.snowflake.common - ${shadeBase}.snowflake.common - - - mozilla - ${shadeBase}.mozilla - - - org.apache.arrow - ${shadeBase}.apache.arrow - - - org.apache.tika - ${shadeBase}.apache.tika - - - - io.netty - ${shadeBase}.io.netty - - - - - *:* - - META-INF/LICENSE* - META-INF/NOTICE* - META-INF/DEPENDENCIES - META-INF/maven/** - META-INF/*.xml - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - .netbeans_automatic_build - git.properties - arrow-git.properties - google-http-client.properties - storage.v1.json - - pipes-fork-server-default-log4j2.xml - dependencies.properties - pipes-fork-server-default-log4j2.xml - - - - org.apache.arrow:arrow-vector - - - codegen/** - - - - - - - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - - yyyyMMddHHmmss - buildNumber.timestamp - false - - false - - - - - - create-timestamp - - package - - - - - - - - self-contained-jar - - - !not-self-contained-jar - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-linkage-checker - - enforce - - none - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - - shade - - package - - - - mozilla - ${shadeBase}.mozilla - - - net.snowflake.common - ${shadeBase}.snowflake.common - - - org.apache - ${shadeBase}.apache - - org.apache.log4j.* - - - - com.amazonaws - ${shadeBase}.amazonaws - - - software.amazon.ion - ${shadeBase}.software.amazon.ion - - - com.microsoft.azure - ${shadeBase}.microsoft.azure - - - com.fasterxml - ${shadeBase}.fasterxml - - - com.google - ${shadeBase}.google - - - google.geo - ${shadeBase}.google.geo - - - google.storage - ${shadeBase}.google.storage - - - org.joda - ${shadeBase}.joda - - - com.yammer - ${shadeBase}.yammer - - - javax.servlet - ${shadeBase}.javax.servlet - - - org.jsoup - ${shadeBase}.org.jsoup - - - org.bouncycastle - ${shadeBase}.org.bouncycastle - - - com.nimbusds - ${shadeBase}.com.nimbusds - - - javax.annotation - ${shadeBase}.javax.annotation - - - net.jcip - ${shadeBase}.net.jcip - - - net.minidev - ${shadeBase}.net.minidev - - - org.objectweb - ${shadeBase}.org.objectweb - - - io.netty - ${shadeBase}.io.netty - - - com.carrotsearch - ${shadeBase}.com.carrotsearch - - - google.type - ${shadeBase}.google.type - - - google.rpc - ${shadeBase}.google.rpc - - - google.iam - ${shadeBase}.google.iam - - - io.opencensus - ${shadeBase}.opencensus - - - org.threeten - ${shadeBase}.threeten - - - google.protobuf - ${shadeBase}.google.protobuf - - - google.api - ${shadeBase}.google.api - - - io.grpc - ${shadeBase}.grpc - - - google.longrunning - ${shadeBase}.google.longrunning - - - google.cloud - ${shadeBase}.google.cloud - - - google.logging - ${shadeBase}.google.logging - - - org.checkerframework - ${shadeBase}.org.checkerframework - - - org.codehaus - ${shadeBase}.org.codehaus - - - io.perfmark - ${shadeBase}.io.perfmark - - - org.conscrypt - ${shadeBase}.org.conscrypt - - - opencensus - ${shadeBase}.opencensus - - - grpc - ${shadeBase}.grpc - - - android.annotation - ${shadeBase}.android.annotation - - - - - *:* - - META-INF/LICENSE* - META-INF/NOTICE* - META-INF/DEPENDENCIES - META-INF/maven/** - META-INF/services/com.fasterxml.* - META-INF/versions/9/module-info.* - META-INF/*.xml - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - .netbeans_automatic_build - git.properties - arrow-git.properties - google-http-client.properties - storage.v1.json - - pipes-fork-server-default-log4j2.xml - dependencies.properties - pipes-fork-server-default-log4j2.xml - - - - org.apache.arrow:arrow-vector - - - codegen/** - - - - com.google.guava:guava - - com/google/common/io/** - com/google/common/base/** - com/google/common/hash/** - com/google/common/collect/** - com/google/common/graph/** - com/google/common/math/** - com/google/common/util/concurrent/** - - - - commons-logging:commons-logging - - org/apache/commons/logging/impl/AvalonLogger.class - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - repack - - run - - package - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - - yyyyMMddHHmmss - buildNumber.timestamp - false - - false - - - - - - create-timestamp - - package - - - - - - - - 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-opens=java.base/sun.util.calendar=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.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-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED - - - - - - - jenkinsIT - - - jenkinsIT - - - - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - - japicmp - - cmp - - none - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - analyze - - analyze-only - - none - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - ${testCategory} - - - - - verify - - - - DefaultIT - - integration-test - - - - **/DellBoomiCloudIT.java - - - net.snowflake.client.log.JDK14Logger - ${basedir}/src/test/resources/logging.properties - - - - - - - org.jacoco - jacoco-maven-plugin - - ${jacoco.skip.instrument} - - - - pre-integration-test - - prepare-agent - - pre-integration-test - - target/jacoco-it.exec - - - - post-integration-test - - report - - post-integration-test - - target/jacoco-it.exec - target/jacoco-it - - - - - - - - - - check-content - - - !windows - - - !thin-jar - - - - - - org.codehaus.mojo - exec-maven-plugin - ${version.plugin.exec} - - - check-shaded-content - - exec - - verify - - ${basedir}/ci/scripts/check_content.sh - - - - - - - - - - check-content-thin - - - !windows - - - thin-jar - - - - - - org.codehaus.mojo - exec-maven-plugin - ${version.plugin.exec} - - - check-shaded-content - - exec - - verify - - ${basedir}/ci/scripts/check_content.sh - - -thin - - - - - - - - - - qa1IT - - - qa1IT - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - verify - - - - ClientTelemetryIT - - integration-test - - - - **/ConnectionIT.java - **/SFTrustManagerIT.java - - - ${basedir}/src/test/resources/logback-test.xml - - - - - - - - - - DellBoomi - - - dellBoomiIT - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - verify - - - - DellBoomiIT - - integration-test - - - DellBoomiCloudIT.java - - - - - - - - - preprod3IT - - - preprod3IT - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - verify - - - - ClientTelemetryIT - - integration-test - - - - **/ConnectionIT.java - **/SFTrustManagerIT.java - - - ${basedir}/src/test/resources/logback-test.xml - - - - - - - - - - ossrh-deploy - - - ossrhDeploy - - - - - - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-gpg-plugin - - - - sign-and-deploy-file - - deploy - - target/${project.artifactId}.jar - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2 - generated_public_pom.xml - target/${project.artifactId}-javadoc.jar - target/${project.artifactId}-sources.jar - ${env.GPG_KEY_ID} - ${env.GPG_KEY_PASSPHRASE} - - - - - - - - - + + + 4.0.0 + + + net.snowflake + snowflake-jdbc-parent + 3.18.1-SNAPSHOT + ./parent-pom.xml + + + + ${artifactId} + 3.17.1-SNAPSHOT + jar + + ${artifactId} + https://github.com/snowflakedb/snowflake-jdbc + + + scm:git:https://github.com/snowflakedb/snowflake-jdbc.git + https://github.com/snowflakedb/snowflake-jdbc + + + + snowflake-jdbc + + + + + org.bouncycastle + bcpkix-jdk18on + + + org.bouncycastle + bcprov-jdk18on + + + + + ${project.artifactId} + + + true + src/main/resources + + + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + ${version.plugin.sortpom} + + + com.github.siom79.japicmp + japicmp-maven-plugin + ${version.plugin.japicmp} + + + com.spotify.fmt + fmt-maven-plugin + ${version.plugin.fmt} + + + org.apache.maven.plugins + maven-antrun-plugin + ${version.plugin.antrun} + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${version.plugin.checkstyle} + + + org.apache.maven.plugins + maven-clean-plugin + ${version.plugin.clean} + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.plugin.compiler} + + + org.apache.maven.plugins + maven-dependency-plugin + ${version.plugin.dependency} + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.plugin.deploy} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${version.plugin.enforcer} + + + org.apache.maven.plugins + maven-failsafe-plugin + ${version.plugin.failsafe} + + + org.apache.maven.plugins + maven-gpg-plugin + ${version.plugin.gpg} + + + org.apache.maven.plugins + maven-install-plugin + ${version.plugin.install} + + + org.apache.maven.plugins + maven-jar-plugin + ${version.plugin.jar} + + + org.apache.maven.plugins + maven-javadoc-plugin + ${version.plugin.javadoc} + + + org.apache.maven.plugins + maven-project-info-reports-plugin + ${version.plugin.projectinforeports} + + + org.apache.maven.plugins + maven-shade-plugin + ${version.plugin.shade} + + + org.apache.maven.plugins + maven-source-plugin + ${version.plugin.source} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.plugin.surefire} + + + org.codehaus.mojo + buildnumber-maven-plugin + ${version.plugin.buildnumber} + + + org.codehaus.mojo + exec-maven-plugin + ${version.plugin.exec} + + + org.jacoco + jacoco-maven-plugin + ${version.plugin.jacoco} + + + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + + false + false + true + scope,groupId,artifactId + groupId,artifactId + true + true + true + stop + strict + + + + + verify + + validate + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + false + \d+\.\d+\.\d+ + + com.snowflake + net.snowflake + + + @net.snowflake.client.core.SnowflakeJdbcInternalApi + ${shadeBase} + + + + + + japicmp + + cmp + + verify + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + + lib + + *.jar + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + true + true + javac + true + 8 + 8 + + -Xlint:all,-path + + + + + default-testCompile + + testCompile + + test-compile + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + + true + true + + javax.servlet:javax.servlet-api + + + + + install-jar + + copy + + install + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + lib + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + com.google.cloud.tools + linkage-checker-enforcer-rules + 1.5.13 + + + org.codehaus.mojo + extra-enforcer-rules + 1.3 + + + org.eclipse.aether + aether-util + + + + + + + enforce-best-practices + + enforce + + + + + true + true + + + arrow-memory-unsafe + + org.apache.arrow.memory.DefaultAllocationManagerFactory + + + + + + + + + + + + + enforce-maven + + enforce + + + + + ${version.maven} + + + + + + enforce-linkage-checker + + enforce + + verify + + + + true + linkage-checker-exclusion-rules.xml + + + + + + + + org.apache.maven.plugins + maven-install-plugin + + + install-arrow-format + + install-file + + validate + + ${project.basedir}/dependencies/arrow-format-${arrow.version}.jar + org.apache.arrow + arrow-format + ${arrow.version} + jar + true + + + + install-arrow-memory-core + + install-file + + validate + + ${project.basedir}/dependencies/arrow-memory-core-${arrow.version}.jar + org.apache.arrow + arrow-memory-core + ${arrow.version} + jar + true + + + + install-arrow-memory-netty + + install-file + + validate + + ${project.basedir}/dependencies/arrow-memory-netty-${arrow.version}.jar + org.apache.arrow + arrow-memory-netty + ${arrow.version} + jar + true + + + + install-arrow-memory-pom + + install-file + + validate + + ${project.basedir}/dependencies/arrow-memory-${arrow.version}.pom + org.apache.arrow + arrow-memory + ${arrow.version} + pom + true + + + + + install-arrow-memory-unsafe + + install-file + + validate + + ${project.basedir}/dependencies/arrow-memory-unsafe-${arrow.version}.jar + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + jar + true + + + + + install-arrow-vector + + install-file + + validate + + ${project.basedir}/dependencies/arrow-vector-${arrow.version}.jar + org.apache.arrow + arrow-vector + ${arrow.version} + jar + true + + + + install-tika-core + + install-file + + validate + + ${project.basedir}/dependencies/tika-core-${tika.version}.jar + org.apache.tika + tika-core + ${tika.version} + jar + true + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + net.snowflake.client.jdbc.SnowflakeDriver + true + + + + + + + test-jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + 8 + ${project.basedir}/src/main/javadoc/overview.html + java + ${project.basedir}/src/main/javadoc/licenses.html + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.jacoco + jacoco-maven-plugin + + ${jacoco.skip.instrument} + + + + pre-unit-test + + prepare-agent + + + target/jacoco-ut.exec + + + + post-unit-test + + report + + test + + target/jacoco-ut.exec + target/jacoco-ut + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + check-style + + + + com.spotify.fmt + fmt-maven-plugin + + + fmt + + check + + validate + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + + + + + + + + true + true + true + warning + + + + checkstyle + + check + + validate + + + + + + + + thin-jar + + + thin-jar + + + + snowflake-jdbc-thin + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-linkage-checker + + enforce + + none + + + + + org.apache.maven.plugins + maven-shade-plugin + + + + + shade + + package + + + + net.snowflake:snowflake-common + org.apache.arrow:* + org.apache.tika:tika-core + io.netty:* + + + + + + net.snowflake.common + ${shadeBase}.snowflake.common + + + mozilla + ${shadeBase}.mozilla + + + org.apache.arrow + ${shadeBase}.apache.arrow + + + org.apache.tika + ${shadeBase}.apache.tika + + + + io.netty + ${shadeBase}.io.netty + + + + + *:* + + META-INF/LICENSE* + META-INF/NOTICE* + META-INF/DEPENDENCIES + META-INF/maven/** + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + .netbeans_automatic_build + git.properties + arrow-git.properties + google-http-client.properties + storage.v1.json + + pipes-fork-server-default-log4j2.xml + dependencies.properties + pipes-fork-server-default-log4j2.xml + + + + org.apache.arrow:arrow-vector + + + codegen/** + + + + + + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + yyyyMMddHHmmss + buildNumber.timestamp + false + + false + + + + + + create-timestamp + + package + + + + + + + + self-contained-jar + + + !not-self-contained-jar + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-linkage-checker + + enforce + + none + + + + + org.apache.maven.plugins + maven-shade-plugin + + + + + shade + + package + + + + mozilla + ${shadeBase}.mozilla + + + net.snowflake.common + ${shadeBase}.snowflake.common + + + org.apache + ${shadeBase}.apache + + org.apache.log4j.* + + + + com.amazonaws + ${shadeBase}.amazonaws + + + software.amazon.ion + ${shadeBase}.software.amazon.ion + + + com.microsoft.azure + ${shadeBase}.microsoft.azure + + + com.fasterxml + ${shadeBase}.fasterxml + + + com.google + ${shadeBase}.google + + + google.geo + ${shadeBase}.google.geo + + + google.storage + ${shadeBase}.google.storage + + + org.joda + ${shadeBase}.joda + + + com.yammer + ${shadeBase}.yammer + + + javax.servlet + ${shadeBase}.javax.servlet + + + org.jsoup + ${shadeBase}.org.jsoup + + + org.bouncycastle + ${shadeBase}.org.bouncycastle + + + com.nimbusds + ${shadeBase}.com.nimbusds + + + javax.annotation + ${shadeBase}.javax.annotation + + + net.jcip + ${shadeBase}.net.jcip + + + net.minidev + ${shadeBase}.net.minidev + + + org.objectweb + ${shadeBase}.org.objectweb + + + io.netty + ${shadeBase}.io.netty + + + com.carrotsearch + ${shadeBase}.com.carrotsearch + + + google.type + ${shadeBase}.google.type + + + google.rpc + ${shadeBase}.google.rpc + + + google.iam + ${shadeBase}.google.iam + + + io.opencensus + ${shadeBase}.opencensus + + + org.threeten + ${shadeBase}.threeten + + + google.protobuf + ${shadeBase}.google.protobuf + + + google.api + ${shadeBase}.google.api + + + io.grpc + ${shadeBase}.grpc + + + org.eclipse.collections + ${shadeBase}org.eclipse.collections + + + google.longrunning + ${shadeBase}.google.longrunning + + + google.cloud + ${shadeBase}.google.cloud + + + google.logging + ${shadeBase}.google.logging + + + org.checkerframework + ${shadeBase}.org.checkerframework + + + org.codehaus + ${shadeBase}.org.codehaus + + + io.perfmark + ${shadeBase}.io.perfmark + + + org.conscrypt + ${shadeBase}.org.conscrypt + + + opencensus + ${shadeBase}.opencensus + + + grpc + ${shadeBase}.grpc + + + android.annotation + ${shadeBase}.android.annotation + + + + + *:* + + META-INF/LICENSE* + META-INF/NOTICE* + META-INF/DEPENDENCIES + META-INF/maven/** + META-INF/services/com.fasterxml.* + META-INF/versions/9/module-info.* + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + .netbeans_automatic_build + git.properties + arrow-git.properties + google-http-client.properties + storage.v1.json + LICENSE + about.html + LICENSE-EDL-1.0.txt + LICENSE-EPL-1.0.txt + + pipes-fork-server-default-log4j2.xml + dependencies.properties + pipes-fork-server-default-log4j2.xml + + + + org.apache.arrow:arrow-vector + + + codegen/** + + + + com.google.guava:guava + + com/google/common/io/** + com/google/common/base/** + com/google/common/hash/** + com/google/common/collect/** + com/google/common/graph/** + com/google/common/math/** + com/google/common/util/concurrent/** + + + + commons-logging:commons-logging + + org/apache/commons/logging/impl/AvalonLogger.class + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + repack + + run + + package + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + + yyyyMMddHHmmss + buildNumber.timestamp + false + + false + + + + + + create-timestamp + + package + + + + + + + + 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-opens=java.base/sun.util.calendar=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.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-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED + + + + + + + jenkinsIT + + + jenkinsIT + + + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + japicmp + + cmp + + none + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + analyze + + analyze-only + + none + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${testCategory} + + + + + verify + + + + DefaultIT + + integration-test + + + + **/DellBoomiCloudIT.java + + + net.snowflake.client.log.JDK14Logger + ${basedir}/src/test/resources/logging.properties + + + + + + + org.jacoco + jacoco-maven-plugin + + ${jacoco.skip.instrument} + + + + pre-integration-test + + prepare-agent + + pre-integration-test + + target/jacoco-it.exec + + + + post-integration-test + + report + + post-integration-test + + target/jacoco-it.exec + target/jacoco-it + + + + + + + + + + check-content + + + !windows + + + !thin-jar + + + + + + org.codehaus.mojo + exec-maven-plugin + ${version.plugin.exec} + + + check-shaded-content + + exec + + verify + + ${basedir}/ci/scripts/check_content.sh + + + + + + + + + + check-content-thin + + + !windows + + + thin-jar + + + + + + org.codehaus.mojo + exec-maven-plugin + ${version.plugin.exec} + + + check-shaded-content + + exec + + verify + + ${basedir}/ci/scripts/check_content.sh + + -thin + + + + + + + + + + qa1IT + + + qa1IT + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + verify + + + + ClientTelemetryIT + + integration-test + + + + **/ConnectionIT.java + **/SFTrustManagerIT.java + + + ${basedir}/src/test/resources/logback-test.xml + + + + + + + + + + DellBoomi + + + dellBoomiIT + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + verify + + + + DellBoomiIT + + integration-test + + + DellBoomiCloudIT.java + + + + + + + + + preprod3IT + + + preprod3IT + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + verify + + + + ClientTelemetryIT + + integration-test + + + + **/ConnectionIT.java + **/SFTrustManagerIT.java + + + ${basedir}/src/test/resources/logback-test.xml + + + + + + + + + + ossrh-deploy + + + ossrhDeploy + + + + + + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-gpg-plugin + + + + sign-and-deploy-file + + deploy + + target/${project.artifactId}.jar + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2 + generated_public_pom.xml + target/${project.artifactId}-javadoc.jar + target/${project.artifactId}-sources.jar + ${env.GPG_KEY_ID} + ${env.GPG_KEY_PASSPHRASE} + + + + + + + + + diff --git a/thin_public_pom.xml b/thin_public_pom.xml index 715a42878..f557522b5 100644 --- a/thin_public_pom.xml +++ b/thin_public_pom.xml @@ -41,9 +41,10 @@ 1.15 2.11.0 1.2 + 11.1.0 2.21.0 2.22.6 - 1.12.0 + 23.5.26 1.19.0 2.31.0 32.1.1-jre @@ -51,7 +52,7 @@ 3.0.2 3.23.3 1.60.0 - 2.15.3 + 2.16.0 3.1.0 5.13.0 2.8.1 @@ -272,6 +273,10 @@ flatbuffers-java ${google.flatbuffers.version} + + org.eclipse.collections + eclipse-collections + ${eclipse.collections.version} + -