From 12a351f7799869cda7e74994d82d9132edf2087c Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Fri, 27 Oct 2023 00:47:47 -0700 Subject: [PATCH 1/9] move the dependencies to base_pom.xml --- FIPS/pom.xml | 302 ++----------------------------- base_pom.xml | 497 +++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 491 +------------------------------------------------- 3 files changed, 515 insertions(+), 775 deletions(-) create mode 100644 base_pom.xml diff --git a/FIPS/pom.xml b/FIPS/pom.xml index faa2d08c2..dfb316206 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -2,9 +2,14 @@ 4.0.0 - net.snowflake + + net.snowflake + snowflake-jdbc-base + 3.14.2 + ../base_pom.xml + + snowflake-jdbc-fips - 3.14.2 jar snowflake-jdbc-fips @@ -67,191 +72,6 @@ - - io.netty - netty-common - 4.1.77.Final - - - io.netty - netty-buffer - 4.1.87.Final - - - com.nimbusds - nimbus-jose-jwt - 9.21 - - - net.minidev - json-smart - 2.4.9 - - - org.apache.maven.plugins - maven-failsafe-plugin - 3.0.0-M1 - test - - - junit - junit - 4.13.1 - jar - test - - - org.hamcrest - hamcrest - 2.1 - jar - test - - - org.mockito - mockito-inline - ${mockito.version} - test - - - commons-dbcp - commons-dbcp - 1.4 - test - - - com.mchange - c3p0 - 0.9.5.4 - jar - test - - - com.zaxxer - HikariCP - 2.4.3 - test - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - jar - - - commons-io - commons-io - 2.7 - jar - - - com.amazonaws - aws-java-sdk-s3 - - - com.fasterxml.jackson.core - jackson-databind - ${jacksondatabind.version} - jar - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.google.guava - guava - 32.0.0-jre - - - net.snowflake - snowflake-common - 5.1.4 - jar - compile - - - commons-cli - commons-cli - 1.2 - jar - test - - - org.apache.commons - commons-lang3 - 3.11 - jar - test - - - org.apache.commons - commons-text - 1.10.0 - jar - test - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - test - - - org.codehaus.plexus - plexus-archiver - 4.8.0 - provided - - - com.yammer.metrics - metrics-graphite - 2.2.0 - - - com.yammer.metrics - metrics-servlet - 2.2.0 - - - javax.servlet - javax.servlet-api - 3.1.0 - compile - - - org.apache.tika - tika-core - ${tika.version} - - - org.apache.avro - avro - 1.8.1 - test - - - org.slf4j - slf4j-api - ${slf4j.version} - provided - - - org.jsoup - jsoup - ${jsoup.version} - - - com.microsoft.azure - azure-storage - 5.0.0 - org.bouncycastle bc-fips @@ -264,110 +84,6 @@ 1.0.5 provided - - com.amazonaws - aws-java-sdk-sns - test - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - org.apache.arrow - arrow-vector - ${arrow.version} - - - io.netty - netty-common - - - io.netty - netty-buffer - - - - - org.apache.arrow - arrow-memory-netty - ${arrow.version} - - - io.netty - netty-common - - - io.netty - netty-buffer - - - - - org.apache.arrow - arrow-memory-unsafe - ${arrow.version} - - - com.google.auth - google-auth-library-oauth2-http - 1.12.1 - - - com.google.cloud - google-cloud-storage - 2.22.5 - - - com.google.code.gson - gson - - - com.google.oauth-client - google-oauth-client - - - - - com.google.auth - google-auth-library-credentials - 1.15.0 - - - com.google.api-client - google-api-client - ${google.api.client.version} - - - com.google.oauth-client - google-oauth-client - - - - - com.google.oauth-client - google-oauth-client - 1.33.3 - - - com.google.http-client - google-http-client - ${google.http.client.version} - - - net.java.dev.jna - jna - ${jna.version} - provided - - - net.java.dev.jna - jna-platform - ${jna.version} - provided - @@ -888,6 +604,10 @@ META-INF/*.SF META-INF/*.DSA META-INF/*.RSA + + + META-INF/versions/17/** + META-INF/versions/19/** .netbeans_automatic_build git.properties arrow-git.properties diff --git a/base_pom.xml b/base_pom.xml new file mode 100644 index 000000000..4c42a1982 --- /dev/null +++ b/base_pom.xml @@ -0,0 +1,497 @@ + + + 4.0.0 + + net.snowflake + snowflake-jdbc-base + 3.14.2 + pom + + + 10.0.1 + 1.12.501 + 1.74 + 1.34.0 + true + 5.13.0 + 1.15.3 + 3.5.6 + UTF-8 + UTF-8 + net/snowflake/client/jdbc/internal + net.snowflake.client.jdbc.internal + net.snowflake.client.category.AllTestCategory + 2.4.1 + 3.6.3 + 3.1.0 + 3.0.0 + 3.2.0 + 3.11.0 + 3.5.0 + 3.1.1 + 3.0.0-M3 + 3.1.0 + 3.0.0 + 2.19 + 3.0.1 + 3.1.1 + 0.8.8 + 0.17.2 + 3.3.0 + 3.5.0 + 3.4.2 + 3.4.1 + 3.0.1 + 3.2.1 + 3.0.0 + + + + + + com.amazonaws + aws-java-sdk-bom + ${awssdk.version} + pom + import + + + com.fasterxml.jackson + jackson-bom + 2.15.3 + pom + import + + + io.grpc + grpc-bom + 1.59.0 + pom + import + + + io.netty + netty-bom + 4.1.100.Final + pom + import + + + classworlds + classworlds + 1.1 + + + com.google.api.grpc + proto-google-common-protos + 2.22.0 + + + com.google.code.gson + gson + 2.10.1 + + + com.google.errorprone + error_prone_annotations + 2.18.0 + + + com.google.guava + guava + 32.1.1-jre + + + com.google.http-client + google-http-client + 1.43.3 + + + com.google.http-client + google-http-client-gson + 1.43.3 + + + com.google.protobuf + protobuf-java + 3.23.3 + + + com.google.protobuf + protobuf-java-util + 3.23.3 + + + commons-cli + commons-cli + 1.2 + + + commons-codec + commons-codec + 1.15 + + + commons-io + commons-io + 2.11.0 + + + commons-logging + commons-logging + 1.2 + + + io.opencensus + opencensus-api + 0.31.1 + + + junit + junit + 4.13.2 + + + org.apache.commons + commons-compress + 1.21 + + + org.apache.commons + commons-lang3 + 3.12.0 + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + org.checkerframework + checker-qual + 3.33.0 + + + org.codehaus.plexus + plexus-container-default + 1.0-alpha-9-stable-1 + + + org.codehaus.plexus + plexus-utils + 3.4.2 + + + org.hamcrest + hamcrest-core + 2.2 + + + org.ow2.asm + asm + 9.3 + + + org.slf4j + slf4j-api + 2.0.6 + + + org.threeten + threetenbp + 1.6.8 + + + org.tukaani + xz + 1.9 + + + + + + + com.amazonaws + aws-java-sdk-core + + + com.amazonaws + aws-java-sdk-kms + + + com.amazonaws + aws-java-sdk-s3 + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.google.api + gax + 2.31.0 + + + com.google.cloud + google-cloud-core + 2.21.0 + + + com.google.cloud + google-cloud-storage + 2.22.6 + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.google.guava + guava + + + com.google.http-client + google-http-client + + + com.microsoft.azure + azure-storage + 5.0.0 + + + com.nimbusds + nimbus-jose-jwt + 9.21 + + + com.yammer.metrics + metrics-core + 2.2.0 + + + com.yammer.metrics + metrics-servlet + 2.2.0 + + + commons-codec + commons-codec + + + commons-io + commons-io + + + commons-logging + commons-logging + 1.2 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + joda-time + joda-time + 2.8.1 + + + net.minidev + json-smart + 2.4.9 + + + net.snowflake + snowflake-common + 5.1.4 + + + org.apache.arrow + arrow-memory-core + ${arrow.version} + + + org.apache.arrow + arrow-vector + ${arrow.version} + + + org.apache.httpcomponents + httpclient + + + org.apache.httpcomponents + httpcore + + + org.apache.tika + tika-core + ${tika.version} + + + org.jsoup + jsoup + ${jsoup.version} + + + net.java.dev.jna + jna + ${jna.version} + provided + + + net.java.dev.jna + jna-platform + ${jna.version} + provided + + + org.slf4j + slf4j-api + provided + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + runtime + + + + com.google.flatbuffers + flatbuffers-java + 1.12.0 + runtime + + + io.netty + netty-buffer + runtime + + + org.apache.arrow + arrow-format + ${arrow.version} + runtime + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + runtime + + + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + runtime + + + ch.qos.logback + logback-classic + 1.3.6 + test + + + ch.qos.logback + logback-core + 1.3.6 + test + + + com.amazonaws + aws-java-sdk-sns + test + + + com.mchange + c3p0 + 0.9.5.4 + test + + + com.zaxxer + HikariCP + 2.4.3 + test + + + commons-cli + commons-cli + jar + test + + + commons-dbcp + commons-dbcp + 1.4 + test + + + commons-pool + commons-pool + 1.5.4 + test + + + junit + junit + test + + + org.apache.avro + avro + 1.8.1 + test + + + org.apache.commons + commons-compress + test + + + org.apache.commons + commons-lang3 + test + + + org.apache.commons + commons-text + 1.10.0 + test + + + org.hamcrest + hamcrest + 2.2 + test + + + org.mockito + mockito-core + 3.5.6 + test + + + org.mockito + mockito-inline + ${mockito.version} + test + + + diff --git a/pom.xml b/pom.xml index bc3d88866..055844a24 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,14 @@ 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 + + net.snowflake + snowflake-jdbc-base + 3.14.2 + base_pom.xml + + snowflake-jdbc - 3.14.2 jar snowflake-jdbc @@ -16,340 +21,7 @@ https://github.com/snowflakedb/snowflake-jdbc - - 10.0.1 - 1.12.327 - 1.74 - 1.34.0 - true - 5.13.0 - 1.15.3 - 3.5.6 - UTF-8 - UTF-8 - net/snowflake/client/jdbc/internal - net.snowflake.client.jdbc.internal - net.snowflake.client.category.AllTestCategory - 2.4.1 - 3.6.3 - 3.1.0 - 3.0.0 - 3.2.0 - 3.11.0 - 3.5.0 - 3.1.1 - 3.0.0-M3 - 3.1.0 - 3.0.0 - 2.19 - 3.0.1 - 3.1.1 - 0.8.8 - 0.17.2 - 3.3.0 - 3.5.0 - 3.4.2 - 3.4.1 - 3.0.1 - 3.2.1 - 3.0.0 - - - - - - com.amazonaws - aws-java-sdk-bom - ${awssdk.version} - pom - import - - - com.fasterxml.jackson - jackson-bom - 2.14.2 - pom - import - - - io.netty - netty-bom - 4.1.82.Final - pom - import - - - classworlds - classworlds - 1.1 - - - com.google.api.grpc - proto-google-common-protos - 2.22.0 - - - com.google.code.gson - gson - 2.10.1 - - - com.google.errorprone - error_prone_annotations - 2.18.0 - - - com.google.guava - guava - 32.1.1-jre - - - com.google.http-client - google-http-client - 1.43.3 - - - com.google.http-client - google-http-client-gson - 1.43.3 - - - com.google.protobuf - protobuf-java - 3.23.3 - - - com.google.protobuf - protobuf-java-util - 3.23.3 - - - commons-cli - commons-cli - 1.2 - - - commons-codec - commons-codec - 1.15 - - - commons-io - commons-io - 2.11.0 - - - commons-logging - commons-logging - 1.2 - - - io.grpc - grpc-context - 1.55.3 - - - io.opencensus - opencensus-api - 0.31.1 - - - junit - junit - 4.13.2 - - - org.apache.commons - commons-compress - 1.21 - - - org.apache.commons - commons-lang3 - 3.12.0 - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - org.apache.httpcomponents - httpcore - 4.4.16 - - - org.checkerframework - checker-qual - 3.33.0 - - - org.codehaus.plexus - plexus-container-default - 1.0-alpha-9-stable-1 - - - org.codehaus.plexus - plexus-utils - 3.4.2 - - - org.hamcrest - hamcrest-core - 2.2 - - - org.ow2.asm - asm - 9.3 - - - org.slf4j - slf4j-api - 2.0.6 - - - org.threeten - threetenbp - 1.6.8 - - - org.tukaani - xz - 1.9 - - - - - - com.amazonaws - aws-java-sdk-core - - - com.amazonaws - aws-java-sdk-kms - - - com.amazonaws - aws-java-sdk-s3 - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.google.api - gax - 2.31.0 - - - com.google.cloud - google-cloud-core - 2.21.0 - - - com.google.cloud - google-cloud-storage - 2.22.6 - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - com.google.guava - guava - - - com.google.http-client - google-http-client - - - com.microsoft.azure - azure-storage - 5.0.0 - - - com.nimbusds - nimbus-jose-jwt - 9.21 - - - com.yammer.metrics - metrics-core - 2.2.0 - - - com.yammer.metrics - metrics-servlet - 2.2.0 - - - commons-codec - commons-codec - - - commons-io - commons-io - - - commons-logging - commons-logging - 1.2 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - joda-time - joda-time - 2.8.1 - - - net.minidev - json-smart - 2.4.9 - - - net.snowflake - snowflake-common - 5.1.4 - - - org.apache.arrow - arrow-memory-core - ${arrow.version} - - - org.apache.arrow - arrow-vector - ${arrow.version} - - - org.apache.httpcomponents - httpclient - - - org.apache.httpcomponents - httpcore - - - org.apache.tika - tika-core - ${tika.version} - org.bouncycastle bcpkix-jdk18on @@ -360,155 +32,6 @@ bcprov-jdk18on ${bouncycastle.version} - - org.jsoup - jsoup - ${jsoup.version} - - - net.java.dev.jna - jna - ${jna.version} - provided - - - net.java.dev.jna - jna-platform - ${jna.version} - provided - - - org.slf4j - slf4j-api - provided - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - runtime - - - - com.google.flatbuffers - flatbuffers-java - 1.12.0 - runtime - - - io.netty - netty-buffer - runtime - - - org.apache.arrow - arrow-format - ${arrow.version} - runtime - - - org.apache.arrow - arrow-memory-netty - ${arrow.version} - runtime - - - org.apache.arrow - arrow-memory-unsafe - ${arrow.version} - runtime - - - ch.qos.logback - logback-classic - 1.3.6 - test - - - ch.qos.logback - logback-core - 1.3.6 - test - - - com.amazonaws - aws-java-sdk-sns - test - - - com.mchange - c3p0 - 0.9.5.4 - test - - - com.zaxxer - HikariCP - 2.4.3 - test - - - commons-cli - commons-cli - jar - test - - - commons-dbcp - commons-dbcp - 1.4 - test - - - commons-pool - commons-pool - 1.5.4 - test - - - junit - junit - test - - - org.apache.avro - avro - 1.8.1 - test - - - org.apache.commons - commons-compress - test - - - org.apache.commons - commons-lang3 - test - - - org.apache.commons - commons-text - 1.10.0 - test - - - org.hamcrest - hamcrest - 2.2 - test - - - org.mockito - mockito-core - 3.5.6 - test - - - org.mockito - mockito-inline - ${mockito.version} - test - From b3ae9143248f9f570da73a6a9211df0e6737e8a1 Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Fri, 10 Nov 2023 16:11:45 -0800 Subject: [PATCH 2/9] update base pom --- base_pom.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/base_pom.xml b/base_pom.xml index 4c42a1982..309026cf7 100644 --- a/base_pom.xml +++ b/base_pom.xml @@ -5,18 +5,19 @@ net.snowflake snowflake-jdbc-base - 3.14.2 + 3.14.3 pom 10.0.1 1.12.501 - 1.74 - 1.34.0 + 1.59.0 + 2.15.3 true 5.13.0 1.15.3 3.5.6 + 4.1.100.Final UTF-8 UTF-8 net/snowflake/client/jdbc/internal @@ -59,21 +60,21 @@ com.fasterxml.jackson jackson-bom - 2.15.3 + ${jackson.version} pom import io.grpc grpc-bom - 1.59.0 + ${grpc.version} pom import io.netty netty-bom - 4.1.100.Final + ${netty.version} pom import @@ -484,7 +485,7 @@ org.mockito mockito-core - 3.5.6 + ${mockito.version} test From 5f405ed9204b7c26a59c0c2a269f7776cb3623e3 Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Thu, 23 Nov 2023 13:26:48 -0800 Subject: [PATCH 3/9] update pom files --- FIPS/pom.xml | 22 +- base_pom.xml => parent-pom.xml | 390 +++-- pom.xml | 2513 ++++++++++++++++---------------- 3 files changed, 1551 insertions(+), 1374 deletions(-) rename base_pom.xml => parent-pom.xml (53%) diff --git a/FIPS/pom.xml b/FIPS/pom.xml index 6f5ab763d..533da6be1 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -4,9 +4,9 @@ net.snowflake - snowflake-jdbc-base + snowflake-jdbc-parent 3.14.3 - ../base_pom.xml + ../parent-pom.xml snowflake-jdbc-fips @@ -43,14 +43,10 @@ org.bouncycastle bc-fips - 1.0.2.4 - provided org.bouncycastle bcpkix-fips - 1.0.5 - provided @@ -73,7 +69,7 @@ org.apache.maven.plugins maven-install-plugin - 3.0.0-M1 + ${version.plugin.install} install-tika-core @@ -217,6 +213,7 @@ org.apache.maven.plugins maven-surefire-plugin + ${version.plugin.surefire} **/*SFTrustManagerTest.java @@ -275,6 +272,7 @@ maven-dependency-plugin + ${version.plugin.dependency} install-jar @@ -568,14 +566,14 @@ META-INF/DEPENDENCIES META-INF/maven/** META-INF/services/com.fasterxml.* - META-INF/*.xml - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA META-INF/versions/17/** META-INF/versions/19/** + META-INF/*.xml + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA .netbeans_automatic_build git.properties arrow-git.properties @@ -651,6 +649,7 @@ maven-failsafe-plugin + ${version.plugin.failsafe} --add-opens=java.base/java.io=ALL-UNNAMED @@ -694,6 +693,7 @@ org.apache.maven.plugins maven-failsafe-plugin + ${version.plugin.failsafe} DefaultIT diff --git a/base_pom.xml b/parent-pom.xml similarity index 53% rename from base_pom.xml rename to parent-pom.xml index 309026cf7..439892e97 100644 --- a/base_pom.xml +++ b/parent-pom.xml @@ -4,26 +4,73 @@ 4.0.0 net.snowflake - snowflake-jdbc-base + snowflake-jdbc-parent 3.14.3 pom + 1.21 + 3.12.0 + 1.10.0 + 4.5.14 + 4.4.16 10.0.1 + 9.3 + 1.8.1 1.12.501 + 5.0.0 + 1.74 + 1.0.2.4 + 1.0.5 + 1.1 + 3.33.0 + 1.2 + 1.15 + 1.4 + 2.11.0 + 1.2 + 1.5.4 + 0.9.5.4 + 2.22.0 + 2.21.0 + 2.22.6 + 2.10.1 + 2.18.0 + 1.12.0 + 2.31.0 + 32.1.1-jre + 1.43.3 + 3.0.2 + 3.23.3 1.59.0 + 2.2 + 2.4.3 2.15.3 true + 3.1.0 5.13.0 + 2.8.1 + 2.4.9 + 4.13.2 1.15.3 - 3.5.6 + 1.3.6 + 2.2.0 + 4.11.0 4.1.100.Final + 9.21 + 0.31.1 + 1.0-alpha-9-stable-1 + 3.4.2 UTF-8 UTF-8 net/snowflake/client/jdbc/internal net.snowflake.client.jdbc.internal + 2.0.6 + 5.1.4 net.snowflake.client.category.AllTestCategory + 1.6.8 2.4.1 + 1.9 3.6.3 3.1.0 3.0.0 @@ -64,6 +111,20 @@ pom import + + com.google.http-client + google-http-client-bom + ${google.http.client.version} + pom + import + + + com.google.protobuf + protobuf-bom + ${google.protobuf.java.version} + pom + import + io.grpc grpc-bom @@ -81,137 +142,326 @@ classworlds classworlds - 1.1 + ${classworlds.version} + + + com.google.api + gax + ${google.gax.version} com.google.api.grpc proto-google-common-protos - 2.22.0 + ${google.api.grpc.version} + + + com.google.cloud + google-cloud-core + ${google.cloud.core.version} + + + com.google.cloud + google-cloud-storage + ${google.cloud.storage.version} + + + com.google.code.findbugs + jsr305 + ${google.jsr305.version} com.google.code.gson gson - 2.10.1 + ${google.code.gson.version} com.google.errorprone error_prone_annotations - 2.18.0 + ${google.errorprone.version} com.google.guava guava - 32.1.1-jre + ${google.guava.version} - com.google.http-client - google-http-client - 1.43.3 + com.microsoft.azure + azure-storage + ${azure.storage.version} - com.google.http-client - google-http-client-gson - 1.43.3 + com.nimbusds + nimbus-jose-jwt + ${nimbusds.version} - com.google.protobuf - protobuf-java - 3.23.3 + com.yammer.metrics + metrics-core + ${metrics.version} - com.google.protobuf - protobuf-java-util - 3.23.3 + com.yammer.metrics + metrics-servlet + ${metrics.version} commons-cli commons-cli - 1.2 + ${commons.cli.version} + test commons-codec commons-codec - 1.15 + ${commons.codec.version} commons-io commons-io - 2.11.0 + ${commons.io.version} commons-logging commons-logging - 1.2 + ${commons.logging.version} + + + commons-dbcp + commons-dbcp + ${commons.dbcp.version} + test + + + commons-pool + commons-pool + ${commons.pool.version} + test io.opencensus opencensus-api - 0.31.1 + ${opencensus.version} junit junit - 4.13.2 + ${junit.version} + test + + + org.apache.avro + avro + ${avro.version} + test org.apache.commons commons-compress - 1.21 + ${apache.commons.compress.version} + test org.apache.commons commons-lang3 - 3.12.0 + ${apache.commons.lang3.version} + test + + + org.apache.commons + commons-text + ${apache.commons.text.version} + test + + + javax.servlet + javax.servlet-api + ${javax.servlet.version} + + + joda-time + joda-time + ${joda.time.version} + + + net.minidev + json-smart + ${json.smart.version} + + + net.snowflake + snowflake-common + ${snowflake.common.version} + + + org.apache.arrow + arrow-memory-core + ${arrow.version} + + + org.apache.arrow + arrow-vector + ${arrow.version} org.apache.httpcomponents httpclient - 4.5.14 + ${apache.httpclient.version} org.apache.httpcomponents httpcore - 4.4.16 + ${apache.httpcore.version} + + + org.apache.tika + tika-core + ${tika.version} + + + org.jsoup + jsoup + ${jsoup.version} + + + net.java.dev.jna + jna + ${jna.version} + provided + + + net.java.dev.jna + jna-platform + ${jna.version} + provided org.checkerframework checker-qual - 3.33.0 + ${checkerframework.version} org.codehaus.plexus plexus-container-default - 1.0-alpha-9-stable-1 + ${plexus.container.version} org.codehaus.plexus plexus-utils - 3.4.2 + ${plexus.utils.version} org.hamcrest hamcrest-core - 2.2 + ${hamcrest.version} + test org.ow2.asm asm - 9.3 + ${asm.version} org.slf4j slf4j-api - 2.0.6 + ${slf4j.version} + provided + + + + com.google.flatbuffers + flatbuffers-java + ${google.flatbuffers.version} + runtime + + + org.apache.arrow + arrow-format + ${arrow.version} + runtime + + + org.apache.arrow + arrow-memory-netty + ${arrow.version} + runtime + + + org.apache.arrow + arrow-memory-unsafe + ${arrow.version} + runtime + + + ch.qos.logback + logback-classic + ${logback.version} + test + + + ch.qos.logback + logback-core + ${logback.version} + test + + + com.mchange + c3p0 + ${c3p0.version} + test + + + com.zaxxer + HikariCP + ${hikaricp.version} + test + + + + org.bouncycastle + bcpkix-jdk18on + ${bouncycastle.version} + + + + org.bouncycastle + bcprov-jdk18on + ${bouncycastle.version} + + + + org.bouncycastle + bc-fips + ${bouncycastle.bc-fips.version} + provided + + + + org.bouncycastle + bcpkix-fips + ${bouncycastle.bcpkix.fips.version} + provided org.threeten threetenbp - 1.6.8 + ${threeten.version} org.tukaani xz - 1.9 + ${tukaani.version} + + + org.mockito + mockito-core + ${mockito.version} + test + + + org.mockito + mockito-inline + ${mockito.version} + test @@ -244,22 +494,18 @@ com.google.api gax - 2.31.0 com.google.cloud google-cloud-core - 2.21.0 com.google.cloud google-cloud-storage - 2.22.6 com.google.code.findbugs jsr305 - 3.0.2 com.google.guava @@ -272,22 +518,18 @@ com.microsoft.azure azure-storage - 5.0.0 com.nimbusds nimbus-jose-jwt - 9.21 com.yammer.metrics metrics-core - 2.2.0 com.yammer.metrics metrics-servlet - 2.2.0 commons-codec @@ -300,37 +542,30 @@ commons-logging commons-logging - 1.2 javax.servlet javax.servlet-api - 3.1.0 joda-time joda-time - 2.8.1 net.minidev json-smart - 2.4.9 net.snowflake snowflake-common - 5.1.4 org.apache.arrow arrow-memory-core - ${arrow.version} org.apache.arrow arrow-vector - ${arrow.version} org.apache.httpcomponents @@ -343,29 +578,22 @@ org.apache.tika tika-core - ${tika.version} org.jsoup jsoup - ${jsoup.version} net.java.dev.jna jna - ${jna.version} - provided net.java.dev.jna jna-platform - ${jna.version} - provided org.slf4j slf4j-api - provided com.fasterxml.jackson.datatype @@ -376,43 +604,26 @@ com.google.flatbuffers flatbuffers-java - 1.12.0 - runtime - - - io.netty - netty-buffer - runtime org.apache.arrow arrow-format - ${arrow.version} - runtime org.apache.arrow arrow-memory-netty - ${arrow.version} - runtime org.apache.arrow arrow-memory-unsafe - ${arrow.version} - runtime ch.qos.logback logback-classic - 1.3.6 - test ch.qos.logback logback-core - 1.3.6 - test com.amazonaws @@ -422,77 +633,50 @@ com.mchange c3p0 - 0.9.5.4 - test com.zaxxer HikariCP - 2.4.3 - test commons-cli commons-cli - jar - test commons-dbcp commons-dbcp - 1.4 - test commons-pool commons-pool - 1.5.4 - test junit junit - test org.apache.avro avro - 1.8.1 - test org.apache.commons commons-compress - test org.apache.commons commons-lang3 - test org.apache.commons commons-text - 1.10.0 - test - - - org.hamcrest - hamcrest - 2.2 - test org.mockito mockito-core - ${mockito.version} - test org.mockito mockito-inline - ${mockito.version} - test diff --git a/pom.xml b/pom.xml index 1110d2bd7..a7748dcf6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,1260 +1,1253 @@ - - - 4.0.0 - - - net.snowflake - snowflake-jdbc-base - 3.14.3 - base_pom.xml - - - snowflake-jdbc - jar - - snowflake-jdbc - https://github.com/snowflakedb/snowflake-jdbc - - - scm:git:https://github.com/snowflakedb/snowflake-jdbc.git - https://github.com/snowflakedb/snowflake-jdbc - - - - 1.74 - - - - - org.bouncycastle - bcpkix-jdk18on - ${bouncycastle.version} - - - org.bouncycastle - bcprov-jdk18on - ${bouncycastle.version} - - - - - ${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-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 - groupId,artifactId - true - stop - strict - - - - - verify - - validate - - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - - true - true - \d+\.\d+\.\d+ - - com.snowflake - net.snowflake - - - ${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 - 3.0.0-M1 - - - 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 - - - - check - - - - - - - - - self-contained-jar - - - !not-self-contained-jar - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - repack - - run - - package - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-linkage-checker - - enforce - - none - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - - shade - - package - - - - 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 - - - com.sun - ${shadeBase}.com.sun - - com.sun.jna.** - - - - 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/*.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.codehaus.mojo - buildnumber-maven-plugin - - yyyyMMddHHmmss - buildNumber.timestamp - false - - false - - - - - - create-timestamp - - package - - - - - org.codehaus.mojo - exec-maven-plugin - - - check-shaded-content - - exec - - verify - - ${basedir}/ci/scripts/check_content.sh - - - - - - - - - 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=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=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 - - - - - - - - - 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 - - - - - - - - - - travisIT - - - travisIT - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - ${testCategory} - - - - - integration-test - - - - **/DellBoomiCloudIT.java - - - ${basedir}/src/test/resources/logback-test.xml - true - - - - - verify_travis_it - - verify - - verify - - - - - 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 - - - - - - - - - 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} - - - - - - - - - \ No newline at end of file + + + 4.0.0 + + + net.snowflake + snowflake-jdbc-parent + 3.14.3 + ./parent-pom.xml + + + snowflake-jdbc + jar + + snowflake-jdbc + https://github.com/snowflakedb/snowflake-jdbc + + + scm:git:https://github.com/snowflakedb/snowflake-jdbc.git + https://github.com/snowflakedb/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-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 + groupId,artifactId + true + stop + strict + + + + + verify + + validate + + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + true + true + \d+\.\d+\.\d+ + + com.snowflake + net.snowflake + + + ${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 + + + + check + + + + + + + + + self-contained-jar + + + !not-self-contained-jar + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + repack + + run + + package + + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-linkage-checker + + enforce + + none + + + + + org.apache.maven.plugins + maven-shade-plugin + + + + + shade + + package + + + + 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 + + + com.sun + ${shadeBase}.com.sun + + com.sun.jna.** + + + + 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/*.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.codehaus.mojo + buildnumber-maven-plugin + + yyyyMMddHHmmss + buildNumber.timestamp + false + + false + + + + + + create-timestamp + + package + + + + + org.codehaus.mojo + exec-maven-plugin + + + check-shaded-content + + exec + + verify + + ${basedir}/ci/scripts/check_content.sh + + + + + + + + + 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=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=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 + + + + + + + + + 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 + + + + + + + + + + travisIT + + + travisIT + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + ${testCategory} + + + + + integration-test + + + + **/DellBoomiCloudIT.java + + + ${basedir}/src/test/resources/logback-test.xml + true + + + + + verify_travis_it + + verify + + verify + + + + + 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 + + + + + + + + + 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} + + + + + + + + + From 78bb68b99338170dd9c98d63fd9f7b8ee17bdcf9 Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Thu, 23 Nov 2023 14:13:46 -0800 Subject: [PATCH 4/9] change hamcrest-core to hamcrest --- parent-pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent-pom.xml b/parent-pom.xml index 439892e97..d48516c9c 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -351,7 +351,7 @@ org.hamcrest - hamcrest-core + hamcrest ${hamcrest.version} test From 38ebea0f01c237ab93a1b079dbca6aca304c548c Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:18:41 -0800 Subject: [PATCH 5/9] add hamcrest dependency --- parent-pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/parent-pom.xml b/parent-pom.xml index d48516c9c..06e3765c0 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -670,6 +670,10 @@ org.apache.commons commons-text + + org.hamcrest + hamcrest + org.mockito mockito-core From 96888131fd11a05327203d34f58cd910f80730cd Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Thu, 23 Nov 2023 15:44:33 -0800 Subject: [PATCH 6/9] fix BanDuplicateClasses for hamcrest-core --- parent-pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/parent-pom.xml b/parent-pom.xml index 06e3765c0..24adb1a94 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -355,6 +355,12 @@ ${hamcrest.version} test + + org.hamcrest + hamcrest-core + ${hamcrest.version} + test + org.ow2.asm asm From 9639b3c24fad118ccd988adb80eaabe536141b01 Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:02:49 -0800 Subject: [PATCH 7/9] add netty-buffer dependency --- parent-pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parent-pom.xml b/parent-pom.xml index 24adb1a94..cf44955ec 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -379,6 +379,11 @@ ${google.flatbuffers.version} runtime + + io.netty + netty-buffer + runtime + org.apache.arrow arrow-format From 988df652a0aa4094c387211bac15b539ae806f4c Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:40:16 -0800 Subject: [PATCH 8/9] fix missing netty dependencies error --- parent-pom.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/parent-pom.xml b/parent-pom.xml index cf44955ec..bf7f90410 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -379,11 +379,6 @@ ${google.flatbuffers.version} runtime - - io.netty - netty-buffer - runtime - org.apache.arrow arrow-format @@ -566,6 +561,16 @@ net.minidev json-smart + + io.netty + netty-common + runtime + + + io.netty + netty-buffer + runtime + net.snowflake snowflake-common From 04cfd640dadb753f38e2a347ff769c14f1bffe04 Mon Sep 17 00:00:00 2001 From: Joyce Ling <115662568+sfc-gh-ext-simba-jl@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:21:59 -0800 Subject: [PATCH 9/9] update bouncycastle properties --- FIPS/public_pom.xml | 6 ++++-- parent-pom.xml | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/FIPS/public_pom.xml b/FIPS/public_pom.xml index 8a576e5ff..d180e4a57 100644 --- a/FIPS/public_pom.xml +++ b/FIPS/public_pom.xml @@ -32,6 +32,8 @@ + 1.0.2.4 + 1.0.5 5.13.0 @@ -39,13 +41,13 @@ org.bouncycastle bc-fips - 1.0.2.1 + ${bouncycastle.bcfips.version} runtime org.bouncycastle bcpkix-fips - 1.0.5 + ${bouncycastle.bcpkixfips.version} runtime diff --git a/parent-pom.xml b/parent-pom.xml index bf7f90410..4b7385c81 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -20,8 +20,8 @@ 1.12.501 5.0.0 1.74 - 1.0.2.4 - 1.0.5 + 1.0.2.4 + 1.0.5 1.1 3.33.0 1.2 @@ -437,14 +437,14 @@ org.bouncycastle bc-fips - ${bouncycastle.bc-fips.version} + ${bouncycastle.bcfips.version} provided org.bouncycastle bcpkix-fips - ${bouncycastle.bcpkix.fips.version} + ${bouncycastle.bcpkixfips.version} provided