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