Skip to content

Commit

Permalink
SNOW-1734031: Bump google dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfc-gh-dprzybysz
sfc-gh-dprzybysz committed Nov 4, 2024
1 parent e28c15e commit a5db221
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 110 deletions.
47 changes: 11 additions & 36 deletions FIPS/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,8 @@
<shadedPattern>${shadeBase}.google</shadedPattern>
</relocation>
<relocation>
<pattern>google.geo</pattern>
<shadedPattern>${shadeBase}.google.geo</shadedPattern>
<pattern>google</pattern>
<shadedPattern>${shadeBase}.google</shadedPattern>
</relocation>
<relocation>
<pattern>org.joda</pattern>
Expand Down Expand Up @@ -445,18 +445,6 @@
<pattern>com.carrotsearch</pattern>
<shadedPattern>${shadeBase}.com.carrotsearch</shadedPattern>
</relocation>
<relocation>
<pattern>google.type</pattern>
<shadedPattern>${shadeBase}.google.type</shadedPattern>
</relocation>
<relocation>
<pattern>google.rpc</pattern>
<shadedPattern>${shadeBase}.google.rpc</shadedPattern>
</relocation>
<relocation>
<pattern>google.iam</pattern>
<shadedPattern>${shadeBase}.google.iam</shadedPattern>
</relocation>
<relocation>
<pattern>io.opencensus</pattern>
<shadedPattern>${shadeBase}.opencensus</shadedPattern>
Expand All @@ -465,33 +453,13 @@
<pattern>org.threeten</pattern>
<shadedPattern>${shadeBase}.threeten</shadedPattern>
</relocation>
<relocation>
<pattern>google.protobuf</pattern>
<shadedPattern>${shadeBase}.google.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>google.api</pattern>
<shadedPattern>${shadeBase}.google.api</shadedPattern>
</relocation>
<relocation>
<pattern>google.storage</pattern>
<shadedPattern>${shadeBase}.google.storage</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>${shadeBase}.grpc</shadedPattern>
</relocation>
<relocation>
<pattern>google.longrunning</pattern>
<shadedPattern>${shadeBase}.google.longrunning</shadedPattern>
</relocation>
<relocation>
<pattern>google.cloud</pattern>
<shadedPattern>${shadeBase}.google.cloud</shadedPattern>
</relocation>
<relocation>
<pattern>google.logging</pattern>
<shadedPattern>${shadeBase}.google.logging</shadedPattern>
<pattern>io.opentelemetry</pattern>
<shadedPattern>${shadeBase}.io.opentelemetry</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
Expand Down Expand Up @@ -594,17 +562,24 @@
<configuration>
<target>
<unzip dest="${project.build.directory}/relocate" src="${project.build.directory}/${project.build.finalName}.jar"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
<!-- com.fasterxml.* packages are relocated to ${relocationBase}.fasterxml.* -->
<move file="${project.build.directory}/relocate/META-INF/versions/11/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/17/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/21/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/22/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
<!-- io.opentelemetry.* packages are relocated to ${relocationBase}.io.opentelemetry.* -->
<move file="${project.build.directory}/relocate/META-INF/versions/9/io" todir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
<zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
</target>
</configuration>
</execution>
Expand Down
40 changes: 20 additions & 20 deletions parent-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,30 +31,31 @@
<bouncycastle.bcpkixfips.version>1.0.7</bouncycastle.bcpkixfips.version>
<bytebuddy.version>1.14.17</bytebuddy.version>
<classworlds.version>1.1</classworlds.version>
<checkerframework.version>3.33.0</checkerframework.version>
<checkerframework.version>3.48.1</checkerframework.version>
<commons.cli.version>1.2</commons.cli.version>
<commons.codec.version>1.17.0</commons.codec.version>
<commons.codec.version>1.17.1</commons.codec.version>
<commons.dbcp.version>1.4</commons.dbcp.version>
<commons.io.version>2.17.0</commons.io.version>
<commons.logging.version>1.2</commons.logging.version>
<commons.pool.version>1.5.4</commons.pool.version>
<c3p0.version>0.9.5.4</c3p0.version>
<google.api.grpc.version>2.22.0</google.api.grpc.version>
<google.auth.library.oauth2.http.version>1.19.0</google.auth.library.oauth2.http.version>
<google.cloud.core.version>2.21.0</google.cloud.core.version>
<google.cloud.storage.version>2.22.6</google.cloud.storage.version>
<google.code.gson.version>2.10.1</google.code.gson.version>
<google.errorprone.version>2.18.0</google.errorprone.version>
<google.api.grpc.version>2.46.0</google.api.grpc.version>
<google.auth.library.oauth2.http.version>1.28.0</google.auth.library.oauth2.http.version>
<google.cloud.core.version>2.45.0</google.cloud.core.version>
<google.cloud.storage.version>2.43.2</google.cloud.storage.version>
<google.code.gson.version>2.11.0</google.code.gson.version>
<google.errorprone.version>2.33.0</google.errorprone.version>
<google.flatbuffers.version>24.3.25</google.flatbuffers.version>
<google.gax.version>2.31.0</google.gax.version>
<google.guava.version>32.1.1-jre</google.guava.version>
<google.http.client.version>1.43.3</google.http.client.version>
<google.gax.version>2.55.0</google.gax.version>
<google.guava.version>33.3.1-jre</google.guava.version>
<google.http.client.version>1.45.0</google.http.client.version>
<google.j2objc-annotations.version>3.0.0</google.j2objc-annotations.version>
<google.jsr305.version>3.0.2</google.jsr305.version>
<google.protobuf.java.version>3.25.5</google.protobuf.java.version>
<grpc.version>1.60.0</grpc.version>
<google.protobuf.java.version>4.28.2</google.protobuf.java.version>
<grpc.version>1.68.0</grpc.version>
<hamcrest.version>2.2</hamcrest.version>
<hikaricp.version>2.4.3</hikaricp.version>
<jackson.version>2.17.2</jackson.version>
<jackson.version>2.18.0</jackson.version>
<jacoco.skip.instrument>true</jacoco.skip.instrument>
<javax.servlet.version>3.1.0</javax.servlet.version>
<jna.version>5.13.0</jna.version>
Expand All @@ -77,7 +78,6 @@
<slf4j.version>2.0.13</slf4j.version>
<snowflake.common.version>5.1.4</snowflake.common.version>
<testCategory>net.snowflake.client.category.AllTestCategory</testCategory>
<threeten.version>1.6.9</threeten.version>
<tika.version>2.4.1</tika.version>
<tukaani.version>1.9</tukaani.version>
<version.maven>3.6.3</version.maven>
Expand Down Expand Up @@ -200,6 +200,11 @@
<artifactId>guava</artifactId>
<version>${google.guava.version}</version>
</dependency>
<dependency>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
<version>${google.j2objc-annotations.version}</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage</artifactId>
Expand Down Expand Up @@ -474,11 +479,6 @@
<version>${bouncycastle.bcpkixfips.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
Expand Down
49 changes: 11 additions & 38 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,12 +824,8 @@
<shadedPattern>${shadeBase}.google</shadedPattern>
</relocation>
<relocation>
<pattern>google.geo</pattern>
<shadedPattern>${shadeBase}.google.geo</shadedPattern>
</relocation>
<relocation>
<pattern>google.storage</pattern>
<shadedPattern>${shadeBase}.google.storage</shadedPattern>
<pattern>google</pattern>
<shadedPattern>${shadeBase}.google</shadedPattern>
</relocation>
<relocation>
<pattern>org.joda</pattern>
Expand Down Expand Up @@ -876,20 +872,12 @@
<shadedPattern>${shadeBase}.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>com.carrotsearch</pattern>
<shadedPattern>${shadeBase}.com.carrotsearch</shadedPattern>
<pattern>io.opentelemetry</pattern>
<shadedPattern>${shadeBase}.io.opentelemetry</shadedPattern>
</relocation>
<relocation>
<pattern>google.type</pattern>
<shadedPattern>${shadeBase}.google.type</shadedPattern>
</relocation>
<relocation>
<pattern>google.rpc</pattern>
<shadedPattern>${shadeBase}.google.rpc</shadedPattern>
</relocation>
<relocation>
<pattern>google.iam</pattern>
<shadedPattern>${shadeBase}.google.iam</shadedPattern>
<pattern>com.carrotsearch</pattern>
<shadedPattern>${shadeBase}.com.carrotsearch</shadedPattern>
</relocation>
<relocation>
<pattern>io.opencensus</pattern>
Expand All @@ -899,30 +887,10 @@
<pattern>org.threeten</pattern>
<shadedPattern>${shadeBase}.threeten</shadedPattern>
</relocation>
<relocation>
<pattern>google.protobuf</pattern>
<shadedPattern>${shadeBase}.google.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>google.api</pattern>
<shadedPattern>${shadeBase}.google.api</shadedPattern>
</relocation>
<relocation>
<pattern>io.grpc</pattern>
<shadedPattern>${shadeBase}.grpc</shadedPattern>
</relocation>
<relocation>
<pattern>google.longrunning</pattern>
<shadedPattern>${shadeBase}.google.longrunning</shadedPattern>
</relocation>
<relocation>
<pattern>google.cloud</pattern>
<shadedPattern>${shadeBase}.google.cloud</shadedPattern>
</relocation>
<relocation>
<pattern>google.logging</pattern>
<shadedPattern>${shadeBase}.google.logging</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
Expand Down Expand Up @@ -1031,6 +999,7 @@
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
<mkdir dir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
<!-- org.bouncycastle.* packages are relocated to ${relocationBase}.org.bouncycastle.* -->
<move file="${project.build.directory}/relocate/META-INF/versions/9/org" todir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/11/org" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
Expand All @@ -1040,12 +1009,16 @@
<move file="${project.build.directory}/relocate/META-INF/versions/11/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/17/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/21/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
<move file="${project.build.directory}/relocate/META-INF/versions/22/com/fasterxml" todir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
<!-- io.opentelemetry.* packages are relocated to ${relocationBase}.io.opentelemetry.* -->
<move file="${project.build.directory}/relocate/META-INF/versions/9/io" todir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
<zip basedir="${project.build.directory}/relocate" destfile="${project.build.directory}/${project.build.finalName}.jar"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/9/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/11/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/15/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/17/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/21/${relocationBase}"/>
<delete dir="${project.build.directory}/relocate/META-INF/versions/22/${relocationBase}"/>
</target>
</configuration>
</execution>
Expand Down
25 changes: 9 additions & 16 deletions thin_public_pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
<commons.codec.version>1.17.0</commons.codec.version>
<commons.io.version>2.17.0</commons.io.version>
<commons.logging.version>1.2</commons.logging.version>
<google.cloud.core.version>2.21.0</google.cloud.core.version>
<google.cloud.storage.version>2.22.6</google.cloud.storage.version>
<google.auth.library.oauth2.http.version>1.28.0</google.auth.library.oauth2.http.version>
<google.cloud.core.version>2.45.0</google.cloud.core.version>
<google.cloud.storage.version>2.43.2</google.cloud.storage.version>
<google.flatbuffers.version>24.3.25</google.flatbuffers.version>
<google.auth.library.oauth2.http.version>1.19.0</google.auth.library.oauth2.http.version>
<google.gax.version>2.31.0</google.gax.version>
<google.guava.version>32.1.1-jre</google.guava.version>
<google.http.client.version>1.43.3</google.http.client.version>
<google.gax.version>2.55.0</google.gax.version>
<google.guava.version>33.3.1-jre</google.guava.version>
<google.http.client.version>1.45.0</google.http.client.version>
<google.jsr305.version>3.0.2</google.jsr305.version>
<google.protobuf.java.version>3.25.5</google.protobuf.java.version>
<grpc.version>1.60.0</grpc.version>
<jackson.version>2.17.2</jackson.version>
<google.protobuf.java.version>4.28.2</google.protobuf.java.version>
<grpc.version>1.68.0</grpc.version>
<jackson.version>2.18.0</jackson.version>
<javax.servlet.version>3.1.0</javax.servlet.version>
<jna.version>5.13.0</jna.version>
<joda.time.version>2.8.1</joda.time.version>
Expand All @@ -63,7 +63,6 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<slf4j.version>2.0.13</slf4j.version>
<threeten.version>1.6.9</threeten.version>
<zstd-jni.version>1.5.6-5</zstd-jni.version>
</properties>

Expand Down Expand Up @@ -156,12 +155,6 @@
<artifactId>gax</artifactId>
<version>${google.gax.version}</version>
</dependency>
<!-- It's google gax transitive dependency, we bump it to avoid vulnerability reported for version 1.6.8 -->
<dependency>
<groupId>org.threeten</groupId>
<artifactId>threetenbp</artifactId>
<version>${threeten.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
Expand Down

0 comments on commit a5db221

Please sign in to comment.