diff --git a/FIPS/pom.xml b/FIPS/pom.xml index a572eb653..ba1929bd2 100644 --- a/FIPS/pom.xml +++ b/FIPS/pom.xml @@ -398,8 +398,8 @@ ${shadeBase}.google - google - ${shadeBase}.google + google.geo + ${shadeBase}.google.geo org.joda @@ -445,6 +445,18 @@ com.carrotsearch ${shadeBase}.com.carrotsearch + + google.type + ${shadeBase}.google.type + + + google.rpc + ${shadeBase}.google.rpc + + + google.iam + ${shadeBase}.google.iam + io.opencensus ${shadeBase}.opencensus @@ -453,13 +465,33 @@ org.threeten ${shadeBase}.threeten + + google.protobuf + ${shadeBase}.google.protobuf + + + google.api + ${shadeBase}.google.api + + + google.storage + ${shadeBase}.google.storage + io.grpc ${shadeBase}.grpc - io.opentelemetry - ${shadeBase}.io.opentelemetry + google.longrunning + ${shadeBase}.google.longrunning + + + google.cloud + ${shadeBase}.google.cloud + + + google.logging + ${shadeBase}.google.logging org.checkerframework @@ -562,24 +594,17 @@ - - - - - - - diff --git a/parent-pom.xml b/parent-pom.xml index 17b6103f1..7f165f376 100644 --- a/parent-pom.xml +++ b/parent-pom.xml @@ -31,31 +31,30 @@ 1.0.7 1.14.17 1.1 - 3.48.2 + 3.33.0 1.2 - 1.17.1 + 1.17.0 1.4 2.17.0 1.2 1.5.4 0.9.5.4 - 2.48.0 - 1.29.0 - 2.47.0 - 2.44.1 - 2.11.0 - 2.35.1 + 2.22.0 + 1.19.0 + 2.21.0 + 2.22.6 + 2.10.1 + 2.18.0 24.3.25 - 2.57.0 - 33.3.1-jre - 1.45.0 - 3.0.0 + 2.31.0 + 32.1.1-jre + 1.43.3 3.0.2 - 4.28.2 - 1.68.1 + 3.25.5 + 1.60.0 2.2 2.4.3 - 2.18.1 + 2.17.2 true 3.1.0 5.13.0 @@ -78,6 +77,7 @@ 2.0.13 5.1.4 net.snowflake.client.category.AllTestCategory + 1.6.9 2.4.1 1.9 3.6.3 @@ -200,11 +200,6 @@ guava ${google.guava.version} - - com.google.j2objc - j2objc-annotations - ${google.j2objc-annotations.version} - com.microsoft.azure azure-storage @@ -479,6 +474,11 @@ ${bouncycastle.bcpkixfips.version} provided + + org.threeten + threetenbp + ${threeten.version} + org.tukaani xz diff --git a/pom.xml b/pom.xml index e80b0c75f..69ff5b183 100644 --- a/pom.xml +++ b/pom.xml @@ -824,8 +824,12 @@ ${shadeBase}.google - google - ${shadeBase}.google + google.geo + ${shadeBase}.google.geo + + + google.storage + ${shadeBase}.google.storage org.joda @@ -871,14 +875,22 @@ io.netty ${shadeBase}.io.netty - - io.opentelemetry - ${shadeBase}.io.opentelemetry - com.carrotsearch ${shadeBase}.com.carrotsearch + + google.type + ${shadeBase}.google.type + + + google.rpc + ${shadeBase}.google.rpc + + + google.iam + ${shadeBase}.google.iam + io.opencensus ${shadeBase}.opencensus @@ -887,10 +899,30 @@ 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 @@ -999,7 +1031,6 @@ - @@ -1009,16 +1040,12 @@ - - - - diff --git a/thin_public_pom.xml b/thin_public_pom.xml index 1d3d26fdd..460ceaec2 100644 --- a/thin_public_pom.xml +++ b/thin_public_pom.xml @@ -41,17 +41,17 @@ 1.17.0 2.17.0 1.2 - 1.29.0 - 2.47.0 - 2.44.1 + 2.21.0 + 2.22.6 24.3.25 - 2.57.0 - 33.3.1-jre - 1.45.0 + 1.19.0 + 2.31.0 + 32.1.1-jre + 1.43.3 3.0.2 - 4.28.2 - 1.68.1 - 2.18.1 + 3.25.5 + 1.60.0 + 2.17.2 3.1.0 5.13.0 2.8.1 @@ -63,6 +63,7 @@ UTF-8 UTF-8 2.0.13 + 1.6.9 1.5.6-5 @@ -155,6 +156,12 @@ gax ${google.gax.version} + + + org.threeten + threetenbp + ${threeten.version} + com.google.auth google-auth-library-oauth2-http