Skip to content

Commit

Permalink
SNOW-924672: Upgrade aws-java-sdk, grpc, jackson, netty (#1545)
Browse files Browse the repository at this point in the history
* upgrade dependencies versions

* fix sorting error

* add exclusions due to jackson upgrade
  • Loading branch information
sfc-gh-ext-simba-jl committed Oct 31, 2023
1 parent a9784a9 commit 189d0a8
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 15 deletions.
33 changes: 26 additions & 7 deletions FIPS/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
<slf4j.version>1.7.36</slf4j.version>
<jsoup.version>1.15.3</jsoup.version>
<tika.version>2.4.1</tika.version>
<jackson.version>2.14.2</jackson.version>
<jacksondatabind.version>2.13.4.2</jacksondatabind.version>
<jackson.version>2.15.3</jackson.version>
<httpclient.version>4.5.11</httpclient.version>
<jacoco.version>0.8.4</jacoco.version>
<jacoco.skip.instrument>true</jacoco.skip.instrument>
Expand All @@ -64,18 +63,37 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.59.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.100.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency> <!-- netty is not a direct dependency. It is used by arrow-vector -->
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.77.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.87.Final</version>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
Expand Down Expand Up @@ -151,18 +169,15 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jacksondatabind.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -884,6 +899,10 @@
<exclude>META-INF/DEPENDENCIES</exclude>
<exclude>META-INF/maven/**</exclude>
<exclude>META-INF/services/com.fasterxml.*</exclude>
<!-- jackson became a multi-release JAR since 2.15.x -->
<!-- will need to exclude META-INF/versions/17 and META-INF/versions/19 until we move to newer Java versions -->
<exclude>META-INF/versions/17/**</exclude>
<exclude>META-INF/versions/19/**</exclude>
<exclude>META-INF/*.xml</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
Expand Down
18 changes: 10 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<properties>
<arrow.version>10.0.1</arrow.version>
<awssdk.version>1.12.327</awssdk.version>
<awssdk.version>1.12.501</awssdk.version>
<bouncycastle.version>1.74</bouncycastle.version>
<google.api.client.version>1.34.0</google.api.client.version>
<jacoco.skip.instrument>true</jacoco.skip.instrument>
Expand Down Expand Up @@ -67,14 +67,21 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.14.2</version>
<version>2.15.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.59.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.82.Final</version>
<version>4.1.100.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -143,11 +150,6 @@
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
<version>1.55.3</version>
</dependency>
<dependency>
<groupId>io.opencensus</groupId>
<artifactId>opencensus-api</artifactId>
Expand Down

0 comments on commit 189d0a8

Please sign in to comment.