Skip to content

Commit

Permalink
Merge branch 'master' into SNOW-1374896-add-get-object-and-bytes-support
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfc-gh-mkubik
sfc-gh-mkubik authored Nov 14, 2024
2 parents 4a74df7 + be85cf7 commit b30bb71
Show file tree
Hide file tree
Showing 2 changed files with 110 additions and 12 deletions.
61 changes: 55 additions & 6 deletions FIPS/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,58 @@
<pattern>com.google</pattern>
<shadedPattern>${shadeBase}.google</shadedPattern>
</relocation>
<!-- google packages should be relocated explicitly to avoid problems with properties files renaming -->
<relocation>
<pattern>google</pattern>
<shadedPattern>${shadeBase}.google</shadedPattern>
<pattern>google.api</pattern>
<shadedPattern>${shadeBase}.google.api</shadedPattern>
</relocation>
<relocation>
<pattern>google.apps</pattern>
<shadedPattern>${shadeBase}.google.apps</shadedPattern>
</relocation>
<relocation>
<pattern>google.cloud</pattern>
<shadedPattern>${shadeBase}.google.cloud</shadedPattern>
</relocation>
<relocation>
<pattern>google.geo</pattern>
<shadedPattern>${shadeBase}.google.geo</shadedPattern>
</relocation>
<relocation>
<pattern>google.iam</pattern>
<shadedPattern>${shadeBase}.google.iam</shadedPattern>
</relocation>
<relocation>
<pattern>google.logging</pattern>
<shadedPattern>${shadeBase}.google.logging</shadedPattern>
</relocation>
<relocation>
<pattern>google.longrunning</pattern>
<shadedPattern>${shadeBase}.google.longrunning</shadedPattern>
</relocation>
<relocation>
<pattern>google.monitoring</pattern>
<shadedPattern>${shadeBase}.google.monitoring</shadedPattern>
</relocation>
<relocation>
<pattern>google.protobuf</pattern>
<shadedPattern>${shadeBase}.google.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>google.rpc</pattern>
<shadedPattern>${shadeBase}.google.rpc</shadedPattern>
</relocation>
<relocation>
<pattern>google.shopping</pattern>
<shadedPattern>${shadeBase}.google.shopping</shadedPattern>
</relocation>
<relocation>
<pattern>google.storage</pattern>
<shadedPattern>${shadeBase}.google.storage</shadedPattern>
</relocation>
<relocation>
<pattern>google.type</pattern>
<shadedPattern>${shadeBase}.google.type</shadedPattern>
</relocation>
<relocation>
<pattern>org.joda</pattern>
Expand Down Expand Up @@ -449,6 +498,10 @@
<pattern>io.opencensus</pattern>
<shadedPattern>${shadeBase}.opencensus</shadedPattern>
</relocation>
<relocation>
<pattern>io.opentelemetry</pattern>
<shadedPattern>${shadeBase}.opentelemetry</shadedPattern>
</relocation>
<relocation>
<pattern>org.threeten</pattern>
<shadedPattern>${shadeBase}.threeten</shadedPattern>
Expand All @@ -457,10 +510,6 @@
<pattern>io.grpc</pattern>
<shadedPattern>${shadeBase}.grpc</shadedPattern>
</relocation>
<relocation>
<pattern>io.opentelemetry</pattern>
<shadedPattern>${shadeBase}.io.opentelemetry</shadedPattern>
</relocation>
<relocation>
<pattern>org.checkerframework</pattern>
<shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
Expand Down
61 changes: 55 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -823,9 +823,58 @@
<pattern>com.google</pattern>
<shadedPattern>${shadeBase}.google</shadedPattern>
</relocation>
<!-- google packages should be relocated explicitly to avoid problems with properties files renaming -->
<relocation>
<pattern>google</pattern>
<shadedPattern>${shadeBase}.google</shadedPattern>
<pattern>google.api</pattern>
<shadedPattern>${shadeBase}.google.api</shadedPattern>
</relocation>
<relocation>
<pattern>google.apps</pattern>
<shadedPattern>${shadeBase}.google.apps</shadedPattern>
</relocation>
<relocation>
<pattern>google.cloud</pattern>
<shadedPattern>${shadeBase}.google.cloud</shadedPattern>
</relocation>
<relocation>
<pattern>google.geo</pattern>
<shadedPattern>${shadeBase}.google.geo</shadedPattern>
</relocation>
<relocation>
<pattern>google.iam</pattern>
<shadedPattern>${shadeBase}.google.iam</shadedPattern>
</relocation>
<relocation>
<pattern>google.logging</pattern>
<shadedPattern>${shadeBase}.google.logging</shadedPattern>
</relocation>
<relocation>
<pattern>google.longrunning</pattern>
<shadedPattern>${shadeBase}.google.longrunning</shadedPattern>
</relocation>
<relocation>
<pattern>google.monitoring</pattern>
<shadedPattern>${shadeBase}.google.monitoring</shadedPattern>
</relocation>
<relocation>
<pattern>google.protobuf</pattern>
<shadedPattern>${shadeBase}.google.protobuf</shadedPattern>
</relocation>
<relocation>
<pattern>google.rpc</pattern>
<shadedPattern>${shadeBase}.google.rpc</shadedPattern>
</relocation>
<relocation>
<pattern>google.shopping</pattern>
<shadedPattern>${shadeBase}.google.shopping</shadedPattern>
</relocation>
<relocation>
<pattern>google.storage</pattern>
<shadedPattern>${shadeBase}.google.storage</shadedPattern>
</relocation>
<relocation>
<pattern>google.type</pattern>
<shadedPattern>${shadeBase}.google.type</shadedPattern>
</relocation>
<relocation>
<pattern>org.joda</pattern>
Expand Down Expand Up @@ -871,10 +920,6 @@
<pattern>io.netty</pattern>
<shadedPattern>${shadeBase}.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>io.opentelemetry</pattern>
<shadedPattern>${shadeBase}.io.opentelemetry</shadedPattern>
</relocation>
<relocation>
<pattern>com.carrotsearch</pattern>
<shadedPattern>${shadeBase}.com.carrotsearch</shadedPattern>
Expand All @@ -883,6 +928,10 @@
<pattern>io.opencensus</pattern>
<shadedPattern>${shadeBase}.opencensus</shadedPattern>
</relocation>
<relocation>
<pattern>io.opentelemetry</pattern>
<shadedPattern>${shadeBase}.opentelemetry</shadedPattern>
</relocation>
<relocation>
<pattern>org.threeten</pattern>
<shadedPattern>${shadeBase}.threeten</shadedPattern>
Expand Down

0 comments on commit b30bb71

Please sign in to comment.