From 4bdb8f5cac10e98a08d0540e0589859ff6fa8203 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Mon, 10 Jul 2023 12:13:58 -0700 Subject: [PATCH 01/11] update pom for vulns --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index c3994eb00..c29758b62 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,10 @@ org.slf4j slf4j-reload4j + + org.apache.hadoop.thirdparty + hadoop-shaded-protobuf_3_7 + @@ -354,6 +358,7 @@ com.fasterxml.jackson.core jackson-databind + 2.13.4.2 @@ -383,6 +388,7 @@ com.google.guava guava + ${guava.version} From c4f5caca9a0a94577945f1aa6d690d78d64dcb5e Mon Sep 17 00:00:00 2001 From: revi cheng Date: Mon, 10 Jul 2023 12:23:17 -0700 Subject: [PATCH 02/11] update pom --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c29758b62..8d5541b60 100644 --- a/pom.xml +++ b/pom.xml @@ -212,6 +212,10 @@ org.apache.hadoop hadoop-auth + + org.apache.hadoop.thirdparty + hadoop-shaded-protobuf_3_7 + org.apache.httpcomponents httpclient @@ -248,10 +252,6 @@ org.slf4j slf4j-reload4j - - org.apache.hadoop.thirdparty - hadoop-shaded-protobuf_3_7 - @@ -358,7 +358,7 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.14.0 From 87b08a0d735fbb14ebc14254ad808aa3aa85bc32 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Mon, 10 Jul 2023 15:56:05 -0700 Subject: [PATCH 03/11] use fasterxml version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d5541b60..243d2aa77 100644 --- a/pom.xml +++ b/pom.xml @@ -358,7 +358,7 @@ com.fasterxml.jackson.core jackson-databind - 2.14.0 + ${fasterxml.version} From bd3fab593156afc90d19fafe76c48ba5c1b52375 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Mon, 10 Jul 2023 17:09:47 -0700 Subject: [PATCH 04/11] remove hadoop exclusion --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 243d2aa77..41e476cc4 100644 --- a/pom.xml +++ b/pom.xml @@ -212,10 +212,6 @@ org.apache.hadoop hadoop-auth - - org.apache.hadoop.thirdparty - hadoop-shaded-protobuf_3_7 - org.apache.httpcomponents httpclient From ab80d88300091d2f1e3e69d6123fd4cddfa3d1d6 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Tue, 11 Jul 2023 15:11:21 -0700 Subject: [PATCH 05/11] mvn install passes --- pom.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 41e476cc4..20ba4cfdc 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.10.0 2.14.0 32.0.1-jre - 3.3.5 + 3.3.6 true 0.8.5 ${project.build.directory}/dependency-jars @@ -56,7 +56,7 @@ 1.8 2.4.9 4.1.94.Final - 9.9.3 + 9.31 3.1 1.12.3 UTF-8 @@ -184,6 +184,10 @@ dnsjava dnsjava + + io.dropwizard.metrics + metrics-core + javax.activation activation @@ -354,7 +358,6 @@ com.fasterxml.jackson.core jackson-databind - ${fasterxml.version} @@ -384,7 +387,6 @@ com.google.guava guava - ${guava.version} From 41740a9fd7fbcfa8fe7b1698a953f56522a2e0b3 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Tue, 11 Jul 2023 16:28:32 -0700 Subject: [PATCH 06/11] passes --- pom.xml | 2 +- scripts/process_licenses.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 20ba4cfdc..6b4056de2 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 4.1.94.Final 9.31 3.1 - 1.12.3 + 1.13.1 UTF-8 3.19.6 net.snowflake.ingest.internal diff --git a/scripts/process_licenses.py b/scripts/process_licenses.py index 69fafefed..a17c34843 100644 --- a/scripts/process_licenses.py +++ b/scripts/process_licenses.py @@ -56,6 +56,7 @@ "org.apache.parquet:parquet-common": APACHE_LICENSE, "org.apache.parquet:parquet-format-structures": APACHE_LICENSE, "com.github.luben:zstd-jni": BSD_2_CLAUSE_LICENSE, + "io.airlift:aircompressor": APACHE_LICENSE, } From 7cbe8f4f47d5d5061bc41fafd8018bb3346fa9b7 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Tue, 11 Jul 2023 16:28:34 -0700 Subject: [PATCH 07/11] autoformatting --- dependency-reduced-pom.xml | 1250 ++++++++++++++++++++++++++++++++++++ 1 file changed, 1250 insertions(+) create mode 100644 dependency-reduced-pom.xml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 000000000..9c84d9f47 --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,1250 @@ + + + 4.0.0 + net.snowflake + snowflake-ingest-sdk + Snowflake Ingest SDK + 2.0.2-SNAPSHOT + Snowflake Ingest SDK + https://www.snowflake.net/ + + + Snowflake Support Team + snowflake-java@snowflake.net + Snowflake Computing + https://www.snowflake.net + + + + + The Apache Software License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + scm:git:git://github.com/snowflakedb/snowflake-ingest-java + https://github.com/snowflakedb/snowflake-ingest-java/tree/master + + + + + true + src/main/resources + + + ${license.processing.resourcesRoot} + + + ${project.artifactId} + + + + maven-deploy-plugin + + true + + + + maven-enforcer-plugin + 3.0.0-M3 + + + com.google.cloud.tools + linkage-checker-enforcer-rules + 1.5.12 + + + org.codehaus.mojo + extra-enforcer-rules + 1.3 + + + aether-util + org.eclipse.aether + + + + + + + maven-failsafe-plugin + 3.0.0-M5 + + + maven-surefire-plugin + 2.19.1 + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + pre-unit-test + + prepare-agent + + + target/jacoco-ut.exec + + + + post-unit-test + test + + report + + + target/jacoco-ut.exec + target/jacoco-ut + + + + + ${jacoco.skip.instrument} + + **/*SnowflakeStreamingIngestExample* + **/*SnowflakeIngestBasicExample* + **/*IngestExampleHelper* + + + + + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + 3.0.1 + + + validate + + verify + + + + + false + false + true + scope,groupId,artifactId + groupId,artifactId + true + true + groupId,artifactId + true + stop + strict + + + + maven-assembly-plugin + + + + true + net.snowflake.ingest.SimpleIngestManager + + + + jar-with-dependencies + + + + + maven-compiler-plugin + 2.5.1 + true + + 1.8 + 1.8 + + + + maven-dependency-plugin + 3.3.0 + + + analyze + + analyze-only + + + true + true + + + + + + maven-enforcer-plugin + + + enforce-best-practices + + enforce + + + + + true + true + + + + + + + + + + enforce-maven + + enforce + + + + + 3.5 + + + + + + + + maven-javadoc-plugin + 2.10.4 + + + attach-javadocs + + jar + + + -Xdoclint:none + 8 + + + + + + maven-source-plugin + 3.0.1 + + + attach-sources + + jar + + + + + + maven-surefire-plugin + 2.19.1 + + + **/TestSimpleIngestLocal.java + + + + + org.codehaus.mojo + license-maven-plugin + 2.0.1 + + + add-third-party + package + + add-third-party + + + + + failFast + + Apache License 2.0 + BSD 2-Clause License + 3-Clause BSD License + The MIT License + EDL 1.0 + The Go license + + test,provided,system + true + + Apache License 2.0 + |The Apache License, Version 2.0 + |The Apache Software License, Version 2.0 + |Apache-2.0 + |Apache License, Version 2.0 + |Apache 2.0 + |Apache License V2.0 + BSD 2-Clause License + |The BSD License + The MIT License|MIT License + + + + + + + + checkLinkageErrors + + + + maven-enforcer-plugin + + + enforce-linkage-checker + verify + + enforce + + + + + true + ${basedir}/linkage-checker-exclusion-rules.xml + WARN + + + + + + + + + + + + + + checkShadedContent + + + + org.codehaus.mojo + exec-maven-plugin + + + check-shaded-content + verify + + exec + + + ${basedir}/scripts/check_content.sh + + + + + + + + + shadeDep + + + + maven-dependency-plugin + + + copy-dependencies + generate-resources + + copy-dependencies + + + /Users/rcheng/repos/snowflake-ingest-java/target/dependency-jars + false + false + true + runtime + /Users/rcheng/repos/snowflake-ingest-java/target/dependency-list.txt + + + + + + maven-dependency-plugin + 3.6.0 + + + generate-resources + + list + + + runtime + /Users/rcheng/repos/snowflake-ingest-java/target/dependency-list.txt + + + + + runtime + ${license.processing.dependencyListFile} + + + + maven-shade-plugin + 3.4.1 + + + package + + shade + + + + + net.snowflake:snowflake-jdbc + org.slf4j:slf4j-api + + + + + com.nimbusds + net.snowflake.ingest.internal.com.nimbusds + + + net.jcip + net.snowflake.ingest.internal.net.jcip + + + net.minidev + net.snowflake.ingest.internal.net.minidev + + + org.objectweb + net.snowflake.ingest.internal.org.objectweb + + + com.fasterxml + net.snowflake.ingest.internal.fasterxml + + + org.apache + net.snowflake.ingest.internal.apache + + + org.xbill + net.snowflake.ingest.internal.org.xbill + + + org.xerial + net.snowflake.ingest.internal.org.xerial + + + io.netty + net.snowflake.ingest.internal.io.netty + + + com.google + net.snowflake.ingest.internal.com.google + + + com.github.benmanes + net.snowflake.ingest.internal.com.github.benmanes + + + shaded.parquet + net.snowflake.ingest.internal.shaded.parquet + + + org.codehaus + net.snowflake.ingest.internal.org.codehaus + + + com.jcraft + net.snowflake.ingest.internal.com.jcraft + + + org.eclipse + net.snowflake.ingest.internal.org.eclipse + + + org.checkerframework + net.snowflake.ingest.internal.org.checkerframework + + + com.codahale + net.snowflake.ingest.internal.com.codahale + + + com.ctc + net.snowflake.ingest.internal.com.ctc + + + com.github.luben + net.snowflake.ingest.internal.com.github.luben + + + com.thoughtworks + net.snowflake.ingest.internal.com.thoughtworks + + + codegen + net.snowflake.ingest.internal.codegen + + + javax.annotation + net.snowflake.ingest.internal.javax.annotation + + + javax.activation + net.snowflake.ingest.internal.javax.activation + + + + + *:* + + assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties + about.html + mozilla/public-suffix-list.txt + 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 + google/protobuf/**/*.proto + + + + commons-logging:commons-logging + + org/apache/commons/logging/impl/AvalonLogger.class + + + + org.slf4j:slf4j-simple + + org/slf4j/** + + + + + + + + + + + + + + net.snowflake:snowflake-jdbc + org.slf4j:slf4j-api + + + + + com.nimbusds + net.snowflake.ingest.internal.com.nimbusds + + + net.jcip + net.snowflake.ingest.internal.net.jcip + + + net.minidev + net.snowflake.ingest.internal.net.minidev + + + org.objectweb + net.snowflake.ingest.internal.org.objectweb + + + com.fasterxml + net.snowflake.ingest.internal.fasterxml + + + org.apache + net.snowflake.ingest.internal.apache + + + org.xbill + net.snowflake.ingest.internal.org.xbill + + + org.xerial + net.snowflake.ingest.internal.org.xerial + + + io.netty + net.snowflake.ingest.internal.io.netty + + + com.google + net.snowflake.ingest.internal.com.google + + + com.github.benmanes + net.snowflake.ingest.internal.com.github.benmanes + + + shaded.parquet + net.snowflake.ingest.internal.shaded.parquet + + + org.codehaus + net.snowflake.ingest.internal.org.codehaus + + + com.jcraft + net.snowflake.ingest.internal.com.jcraft + + + org.eclipse + net.snowflake.ingest.internal.org.eclipse + + + org.checkerframework + net.snowflake.ingest.internal.org.checkerframework + + + com.codahale + net.snowflake.ingest.internal.com.codahale + + + com.ctc + net.snowflake.ingest.internal.com.ctc + + + com.github.luben + net.snowflake.ingest.internal.com.github.luben + + + com.thoughtworks + net.snowflake.ingest.internal.com.thoughtworks + + + codegen + net.snowflake.ingest.internal.codegen + + + javax.annotation + net.snowflake.ingest.internal.javax.annotation + + + javax.activation + net.snowflake.ingest.internal.javax.activation + + + + + *:* + + assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties + about.html + mozilla/public-suffix-list.txt + 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 + google/protobuf/**/*.proto + + + + commons-logging:commons-logging + + org/apache/commons/logging/impl/AvalonLogger.class + + + + org.slf4j:slf4j-simple + + org/slf4j/** + + + + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + process-third-party-licenses + generate-resources + + exec + + + python3 + + /Users/rcheng/repos/snowflake-ingest-java/scripts/process_licenses.py + /Users/rcheng/repos/snowflake-ingest-java/target/dependency-list.txt + /Users/rcheng/repos/snowflake-ingest-java/target/dependency-jars + /Users/rcheng/repos/snowflake-ingest-java/target/generated-licenses-info/META-INF/third-party-licenses + + + + + + + + + + ossrh-deploy + + + + maven-gpg-plugin + 1.6 + + + deploy + + sign-and-deploy-file + + + 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} + + + + + + + + + snapshot-deploy + + + + maven-gpg-plugin + 1.6 + + + deploy + + sign-and-deploy-file + + + target/${project.artifactId}.jar + snapshot + https://nexus.int.snowflakecomputing.com/repository/Snapshots/ + generated_public_pom.xml + target/${project.artifactId}-javadoc.jar + target/${project.artifactId}-sources.jar + ${env.GPG_KEY_ID} + ${env.GPG_KEY_PASSPHRASE} + + + + + + + + + ghActionsIT + + + + maven-failsafe-plugin + + + + integration-test + + + + verify_github_actions_it + verify + + verify + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + pre-unit-test + + prepare-agent + + + target/jacoco-ut.exec + + + + post-unit-test + test + + report + + + target/jacoco-ut.exec + target/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + target/jacoco-it.exec + + + + post-integration-test + post-integration-test + + report + + + target/jacoco-it.exec + target/jacoco-it + + + + + ${jacoco.skip.instrument} + + + + + + + + + net.bytebuddy + byte-buddy-agent + 1.10.19 + test + + + net.snowflake + snowflake-jdbc + 3.13.30 + compile + + + org.slf4j + slf4j-api + 1.7.36 + compile + + + junit + junit + 4.13.2 + test + + + org.apache.commons + commons-lang3 + 3.12.0 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.mockito + mockito-core + 3.7.7 + test + + + byte-buddy + net.bytebuddy + + + objenesis + org.objenesis + + + + + org.powermock + powermock-api-mockito2 + 2.0.2 + test + + + powermock-api-support + org.powermock + + + + + org.powermock + powermock-core + 2.0.2 + test + + + powermock-reflect + org.powermock + + + javassist + org.javassist + + + byte-buddy + net.bytebuddy + + + + + org.powermock + powermock-module-junit4 + 2.0.2 + test + + + powermock-module-junit4-common + org.powermock + + + + + org.slf4j + slf4j-simple + 1.7.36 + test + + + + + + com.fasterxml.jackson + jackson-bom + ${fasterxml.version} + pom + import + + + com.google.guava + guava + ${guava.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + com.nimbusds + nimbus-jose-jwt + ${nimbusds.version} + + + commons-codec + commons-codec + ${commonscodec.version} + + + commons-collections + commons-collections + ${commonscollections.version} + + + commons-io + commons-io + ${commonsio.version} + + + commons-logging + commons-logging + ${commonslogging.version} + + + io.netty + netty-buffer + ${netty.version} + + + io.netty + netty-common + ${netty.version} + + + net.minidev + json-smart + ${net.minidev.version} + + + net.snowflake + snowflake-jdbc + ${snowjdbc.version} + + + org.apache.commons + commons-compress + ${commonscompress.version} + + + org.apache.commons + commons-lang3 + ${commonslang3.version} + + + org.apache.commons + commons-text + ${commonstext.version} + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + reload4j + ch.qos.reload4j + + + jersey-json + com.github.pjfanning + + + jsch + com.jcraft + + + jersey-core + com.sun.jersey + + + jersey-server + com.sun.jersey + + + jersey-servlet + com.sun.jersey + + + commons-logging + commons-logging + + + dnsjava + dnsjava + + + metrics-core + io.dropwizard.metrics + + + activation + javax.activation + + + javax.servlet-api + javax.servlet + + + jsp-api + javax.servlet.jsp + + + avro + org.apache.avro + + + curator-client + org.apache.curator + + + curator-recipes + org.apache.curator + + + hadoop-auth + org.apache.hadoop + + + httpclient + org.apache.httpcomponents + + + kerb-core + org.apache.kerby + + + zookeeper + org.apache.zookeeper + + + jetty-server + org.eclipse.jetty + + + jetty-servlet + org.eclipse.jetty + + + jetty-util + org.eclipse.jetty + + + jetty-webapp + org.eclipse.jetty + + + slf4j-log4j12 + org.slf4j + + + slf4j-reload4j + org.slf4j + + + + + org.apache.parquet + parquet-column + ${parquet.version} + + + org.apache.parquet + parquet-common + ${parquet.version} + + + org.apache.parquet + parquet-hadoop + ${parquet.version} + + + org.apache.yetus + audience-annotations + ${yetus.version} + + + org.codehaus.jackson + jackson-core-asl + ${codehaus.version} + + + org.codehaus.jackson + jackson-jaxrs + ${codehaus.version} + + + org.codehaus.jackson + jackson-xc + ${codehaus.version} + + + org.codehaus.jettison + jettison + 1.5.4 + + + org.codehaus.woodstox + stax2-api + 4.2.1 + + + org.objenesis + objenesis + ${objenesis.version} + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + junit + junit + 4.13.2 + test + + + net.bytebuddy + byte-buddy + 1.10.19 + test + + + net.bytebuddy + byte-buddy-agent + 1.10.19 + test + + + org.mockito + mockito-core + 3.7.7 + test + + + + + 3.12.0 + 1.10.0 + 1.1.10.1 + 3.3.6 + 1.7.36 + ${project.build.directory}/dependency-list.txt + 3.19.6 + 2.8.0 + ${project.build.directory}/generated-licenses-info + 1.2 + 1.8 + 0.8.5 + 3.13.30 + 9.31 + 0.13.0 + 2.4.9 + 4.1.94.Final + 1.9.13 + true + 2.14.0 + 32.0.1-jre + ${project.build.directory}/dependency-jars + UTF-8 + net.snowflake.ingest.internal + 3.1 + 1.13.1 + ${license.processing.resourcesRoot}/META-INF/third-party-licenses + 1.15 + 1.21 + 3.2.2 + 1.8 + + From 20cb2160ce4e2eb8c37347d345bdf714c53353b5 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Tue, 11 Jul 2023 16:29:35 -0700 Subject: [PATCH 08/11] remove dependency pom --- dependency-reduced-pom.xml | 1250 ------------------------------------ 1 file changed, 1250 deletions(-) delete mode 100644 dependency-reduced-pom.xml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml deleted file mode 100644 index 9c84d9f47..000000000 --- a/dependency-reduced-pom.xml +++ /dev/null @@ -1,1250 +0,0 @@ - - - 4.0.0 - net.snowflake - snowflake-ingest-sdk - Snowflake Ingest SDK - 2.0.2-SNAPSHOT - Snowflake Ingest SDK - https://www.snowflake.net/ - - - Snowflake Support Team - snowflake-java@snowflake.net - Snowflake Computing - https://www.snowflake.net - - - - - The Apache Software License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - scm:git:git://github.com/snowflakedb/snowflake-ingest-java - https://github.com/snowflakedb/snowflake-ingest-java/tree/master - - - - - true - src/main/resources - - - ${license.processing.resourcesRoot} - - - ${project.artifactId} - - - - maven-deploy-plugin - - true - - - - maven-enforcer-plugin - 3.0.0-M3 - - - com.google.cloud.tools - linkage-checker-enforcer-rules - 1.5.12 - - - org.codehaus.mojo - extra-enforcer-rules - 1.3 - - - aether-util - org.eclipse.aether - - - - - - - maven-failsafe-plugin - 3.0.0-M5 - - - maven-surefire-plugin - 2.19.1 - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - pre-unit-test - - prepare-agent - - - target/jacoco-ut.exec - - - - post-unit-test - test - - report - - - target/jacoco-ut.exec - target/jacoco-ut - - - - - ${jacoco.skip.instrument} - - **/*SnowflakeStreamingIngestExample* - **/*SnowflakeIngestBasicExample* - **/*IngestExampleHelper* - - - - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - 3.0.1 - - - validate - - verify - - - - - false - false - true - scope,groupId,artifactId - groupId,artifactId - true - true - groupId,artifactId - true - stop - strict - - - - maven-assembly-plugin - - - - true - net.snowflake.ingest.SimpleIngestManager - - - - jar-with-dependencies - - - - - maven-compiler-plugin - 2.5.1 - true - - 1.8 - 1.8 - - - - maven-dependency-plugin - 3.3.0 - - - analyze - - analyze-only - - - true - true - - - - - - maven-enforcer-plugin - - - enforce-best-practices - - enforce - - - - - true - true - - - - - - - - - - enforce-maven - - enforce - - - - - 3.5 - - - - - - - - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - -Xdoclint:none - 8 - - - - - - maven-source-plugin - 3.0.1 - - - attach-sources - - jar - - - - - - maven-surefire-plugin - 2.19.1 - - - **/TestSimpleIngestLocal.java - - - - - org.codehaus.mojo - license-maven-plugin - 2.0.1 - - - add-third-party - package - - add-third-party - - - - - failFast - - Apache License 2.0 - BSD 2-Clause License - 3-Clause BSD License - The MIT License - EDL 1.0 - The Go license - - test,provided,system - true - - Apache License 2.0 - |The Apache License, Version 2.0 - |The Apache Software License, Version 2.0 - |Apache-2.0 - |Apache License, Version 2.0 - |Apache 2.0 - |Apache License V2.0 - BSD 2-Clause License - |The BSD License - The MIT License|MIT License - - - - - - - - checkLinkageErrors - - - - maven-enforcer-plugin - - - enforce-linkage-checker - verify - - enforce - - - - - true - ${basedir}/linkage-checker-exclusion-rules.xml - WARN - - - - - - - - - - - - - - checkShadedContent - - - - org.codehaus.mojo - exec-maven-plugin - - - check-shaded-content - verify - - exec - - - ${basedir}/scripts/check_content.sh - - - - - - - - - shadeDep - - - - maven-dependency-plugin - - - copy-dependencies - generate-resources - - copy-dependencies - - - /Users/rcheng/repos/snowflake-ingest-java/target/dependency-jars - false - false - true - runtime - /Users/rcheng/repos/snowflake-ingest-java/target/dependency-list.txt - - - - - - maven-dependency-plugin - 3.6.0 - - - generate-resources - - list - - - runtime - /Users/rcheng/repos/snowflake-ingest-java/target/dependency-list.txt - - - - - runtime - ${license.processing.dependencyListFile} - - - - maven-shade-plugin - 3.4.1 - - - package - - shade - - - - - net.snowflake:snowflake-jdbc - org.slf4j:slf4j-api - - - - - com.nimbusds - net.snowflake.ingest.internal.com.nimbusds - - - net.jcip - net.snowflake.ingest.internal.net.jcip - - - net.minidev - net.snowflake.ingest.internal.net.minidev - - - org.objectweb - net.snowflake.ingest.internal.org.objectweb - - - com.fasterxml - net.snowflake.ingest.internal.fasterxml - - - org.apache - net.snowflake.ingest.internal.apache - - - org.xbill - net.snowflake.ingest.internal.org.xbill - - - org.xerial - net.snowflake.ingest.internal.org.xerial - - - io.netty - net.snowflake.ingest.internal.io.netty - - - com.google - net.snowflake.ingest.internal.com.google - - - com.github.benmanes - net.snowflake.ingest.internal.com.github.benmanes - - - shaded.parquet - net.snowflake.ingest.internal.shaded.parquet - - - org.codehaus - net.snowflake.ingest.internal.org.codehaus - - - com.jcraft - net.snowflake.ingest.internal.com.jcraft - - - org.eclipse - net.snowflake.ingest.internal.org.eclipse - - - org.checkerframework - net.snowflake.ingest.internal.org.checkerframework - - - com.codahale - net.snowflake.ingest.internal.com.codahale - - - com.ctc - net.snowflake.ingest.internal.com.ctc - - - com.github.luben - net.snowflake.ingest.internal.com.github.luben - - - com.thoughtworks - net.snowflake.ingest.internal.com.thoughtworks - - - codegen - net.snowflake.ingest.internal.codegen - - - javax.annotation - net.snowflake.ingest.internal.javax.annotation - - - javax.activation - net.snowflake.ingest.internal.javax.activation - - - - - *:* - - assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties - about.html - mozilla/public-suffix-list.txt - 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 - google/protobuf/**/*.proto - - - - commons-logging:commons-logging - - org/apache/commons/logging/impl/AvalonLogger.class - - - - org.slf4j:slf4j-simple - - org/slf4j/** - - - - - - - - - - - - - - net.snowflake:snowflake-jdbc - org.slf4j:slf4j-api - - - - - com.nimbusds - net.snowflake.ingest.internal.com.nimbusds - - - net.jcip - net.snowflake.ingest.internal.net.jcip - - - net.minidev - net.snowflake.ingest.internal.net.minidev - - - org.objectweb - net.snowflake.ingest.internal.org.objectweb - - - com.fasterxml - net.snowflake.ingest.internal.fasterxml - - - org.apache - net.snowflake.ingest.internal.apache - - - org.xbill - net.snowflake.ingest.internal.org.xbill - - - org.xerial - net.snowflake.ingest.internal.org.xerial - - - io.netty - net.snowflake.ingest.internal.io.netty - - - com.google - net.snowflake.ingest.internal.com.google - - - com.github.benmanes - net.snowflake.ingest.internal.com.github.benmanes - - - shaded.parquet - net.snowflake.ingest.internal.shaded.parquet - - - org.codehaus - net.snowflake.ingest.internal.org.codehaus - - - com.jcraft - net.snowflake.ingest.internal.com.jcraft - - - org.eclipse - net.snowflake.ingest.internal.org.eclipse - - - org.checkerframework - net.snowflake.ingest.internal.org.checkerframework - - - com.codahale - net.snowflake.ingest.internal.com.codahale - - - com.ctc - net.snowflake.ingest.internal.com.ctc - - - com.github.luben - net.snowflake.ingest.internal.com.github.luben - - - com.thoughtworks - net.snowflake.ingest.internal.com.thoughtworks - - - codegen - net.snowflake.ingest.internal.codegen - - - javax.annotation - net.snowflake.ingest.internal.javax.annotation - - - javax.activation - net.snowflake.ingest.internal.javax.activation - - - - - *:* - - assets/org/apache/commons/math3/exception/util/LocalizedFormats_fr.properties - about.html - mozilla/public-suffix-list.txt - 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 - google/protobuf/**/*.proto - - - - commons-logging:commons-logging - - org/apache/commons/logging/impl/AvalonLogger.class - - - - org.slf4j:slf4j-simple - - org/slf4j/** - - - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 3.1.0 - - - process-third-party-licenses - generate-resources - - exec - - - python3 - - /Users/rcheng/repos/snowflake-ingest-java/scripts/process_licenses.py - /Users/rcheng/repos/snowflake-ingest-java/target/dependency-list.txt - /Users/rcheng/repos/snowflake-ingest-java/target/dependency-jars - /Users/rcheng/repos/snowflake-ingest-java/target/generated-licenses-info/META-INF/third-party-licenses - - - - - - - - - - ossrh-deploy - - - - maven-gpg-plugin - 1.6 - - - deploy - - sign-and-deploy-file - - - 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} - - - - - - - - - snapshot-deploy - - - - maven-gpg-plugin - 1.6 - - - deploy - - sign-and-deploy-file - - - target/${project.artifactId}.jar - snapshot - https://nexus.int.snowflakecomputing.com/repository/Snapshots/ - generated_public_pom.xml - target/${project.artifactId}-javadoc.jar - target/${project.artifactId}-sources.jar - ${env.GPG_KEY_ID} - ${env.GPG_KEY_PASSPHRASE} - - - - - - - - - ghActionsIT - - - - maven-failsafe-plugin - - - - integration-test - - - - verify_github_actions_it - verify - - verify - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - pre-unit-test - - prepare-agent - - - target/jacoco-ut.exec - - - - post-unit-test - test - - report - - - target/jacoco-ut.exec - target/jacoco-ut - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - target/jacoco-it.exec - - - - post-integration-test - post-integration-test - - report - - - target/jacoco-it.exec - target/jacoco-it - - - - - ${jacoco.skip.instrument} - - - - - - - - - net.bytebuddy - byte-buddy-agent - 1.10.19 - test - - - net.snowflake - snowflake-jdbc - 3.13.30 - compile - - - org.slf4j - slf4j-api - 1.7.36 - compile - - - junit - junit - 4.13.2 - test - - - org.apache.commons - commons-lang3 - 3.12.0 - test - - - org.hamcrest - hamcrest-core - 1.3 - test - - - org.mockito - mockito-core - 3.7.7 - test - - - byte-buddy - net.bytebuddy - - - objenesis - org.objenesis - - - - - org.powermock - powermock-api-mockito2 - 2.0.2 - test - - - powermock-api-support - org.powermock - - - - - org.powermock - powermock-core - 2.0.2 - test - - - powermock-reflect - org.powermock - - - javassist - org.javassist - - - byte-buddy - net.bytebuddy - - - - - org.powermock - powermock-module-junit4 - 2.0.2 - test - - - powermock-module-junit4-common - org.powermock - - - - - org.slf4j - slf4j-simple - 1.7.36 - test - - - - - - com.fasterxml.jackson - jackson-bom - ${fasterxml.version} - pom - import - - - com.google.guava - guava - ${guava.version} - - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.nimbusds - nimbus-jose-jwt - ${nimbusds.version} - - - commons-codec - commons-codec - ${commonscodec.version} - - - commons-collections - commons-collections - ${commonscollections.version} - - - commons-io - commons-io - ${commonsio.version} - - - commons-logging - commons-logging - ${commonslogging.version} - - - io.netty - netty-buffer - ${netty.version} - - - io.netty - netty-common - ${netty.version} - - - net.minidev - json-smart - ${net.minidev.version} - - - net.snowflake - snowflake-jdbc - ${snowjdbc.version} - - - org.apache.commons - commons-compress - ${commonscompress.version} - - - org.apache.commons - commons-lang3 - ${commonslang3.version} - - - org.apache.commons - commons-text - ${commonstext.version} - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - reload4j - ch.qos.reload4j - - - jersey-json - com.github.pjfanning - - - jsch - com.jcraft - - - jersey-core - com.sun.jersey - - - jersey-server - com.sun.jersey - - - jersey-servlet - com.sun.jersey - - - commons-logging - commons-logging - - - dnsjava - dnsjava - - - metrics-core - io.dropwizard.metrics - - - activation - javax.activation - - - javax.servlet-api - javax.servlet - - - jsp-api - javax.servlet.jsp - - - avro - org.apache.avro - - - curator-client - org.apache.curator - - - curator-recipes - org.apache.curator - - - hadoop-auth - org.apache.hadoop - - - httpclient - org.apache.httpcomponents - - - kerb-core - org.apache.kerby - - - zookeeper - org.apache.zookeeper - - - jetty-server - org.eclipse.jetty - - - jetty-servlet - org.eclipse.jetty - - - jetty-util - org.eclipse.jetty - - - jetty-webapp - org.eclipse.jetty - - - slf4j-log4j12 - org.slf4j - - - slf4j-reload4j - org.slf4j - - - - - org.apache.parquet - parquet-column - ${parquet.version} - - - org.apache.parquet - parquet-common - ${parquet.version} - - - org.apache.parquet - parquet-hadoop - ${parquet.version} - - - org.apache.yetus - audience-annotations - ${yetus.version} - - - org.codehaus.jackson - jackson-core-asl - ${codehaus.version} - - - org.codehaus.jackson - jackson-jaxrs - ${codehaus.version} - - - org.codehaus.jackson - jackson-xc - ${codehaus.version} - - - org.codehaus.jettison - jettison - 1.5.4 - - - org.codehaus.woodstox - stax2-api - 4.2.1 - - - org.objenesis - objenesis - ${objenesis.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - junit - junit - 4.13.2 - test - - - net.bytebuddy - byte-buddy - 1.10.19 - test - - - net.bytebuddy - byte-buddy-agent - 1.10.19 - test - - - org.mockito - mockito-core - 3.7.7 - test - - - - - 3.12.0 - 1.10.0 - 1.1.10.1 - 3.3.6 - 1.7.36 - ${project.build.directory}/dependency-list.txt - 3.19.6 - 2.8.0 - ${project.build.directory}/generated-licenses-info - 1.2 - 1.8 - 0.8.5 - 3.13.30 - 9.31 - 0.13.0 - 2.4.9 - 4.1.94.Final - 1.9.13 - true - 2.14.0 - 32.0.1-jre - ${project.build.directory}/dependency-jars - UTF-8 - net.snowflake.ingest.internal - 3.1 - 1.13.1 - ${license.processing.resourcesRoot}/META-INF/third-party-licenses - 1.15 - 1.21 - 3.2.2 - 1.8 - - From c18f2e5815559cf06939ddb3dabb7743898710f9 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Fri, 14 Jul 2023 09:47:44 -0700 Subject: [PATCH 09/11] relocate parquet-hadoop --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 6b4056de2..d2421d110 100644 --- a/pom.xml +++ b/pom.xml @@ -1019,6 +1019,10 @@ javax.activation ${shadeBase}.javax.activation + + org.apache.parquet + ${shadeBase}.org.apache.parquet + From e5fb882e6720f5b9f9f846824301cffa54b00577 Mon Sep 17 00:00:00 2001 From: revi cheng Date: Fri, 14 Jul 2023 09:49:45 -0700 Subject: [PATCH 10/11] dont relocate --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index d2421d110..6b4056de2 100644 --- a/pom.xml +++ b/pom.xml @@ -1019,10 +1019,6 @@ javax.activation ${shadeBase}.javax.activation - - org.apache.parquet - ${shadeBase}.org.apache.parquet - From 22a5dcddbbbfda052d1f7f52220d53927e66c6eb Mon Sep 17 00:00:00 2001 From: revi cheng Date: Fri, 14 Jul 2023 10:23:54 -0700 Subject: [PATCH 11/11] relocate just airlift not parquet-hadoop --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 6b4056de2..846f2ccbb 100644 --- a/pom.xml +++ b/pom.xml @@ -1019,6 +1019,10 @@ javax.activation ${shadeBase}.javax.activation + + io.airlift.compress + ${shadeBase}.io.airlift.compress +