Skip to content

Commit

Permalink
match dependencies versions between two pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfc-gh-ext-simba-jl
sfc-gh-ext-simba-jl committed Oct 25, 2023
1 parent b084129 commit fc5b240
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 28 deletions.
84 changes: 61 additions & 23 deletions FIPS/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<arrow.version>10.0.1</arrow.version>
<slf4j.version>1.7.36</slf4j.version>
<slf4j.version>2.0.6</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>
<httpclient.version>4.5.11</httpclient.version>
<httpclient.version>4.5.14</httpclient.version>
<jacoco.version>0.8.4</jacoco.version>
<jacoco.skip.instrument>true</jacoco.skip.instrument>
<awssdk.version>1.12.501</awssdk.version>
<google.api.client.version>1.33.2</google.api.client.version>
<google.http.client.version>1.43.2</google.http.client.version>
<google.api.client.version>2.2.0</google.api.client.version>
<google.http.client.version>1.43.3</google.http.client.version>
<netty.version>4.1.100.Final</netty.version>
<jna.version>5.13.0</jna.version>
<mockito.version>3.5.6</mockito.version>
<shadeBase>net.snowflake.client.jdbc.internal</shadeBase>
Expand All @@ -64,18 +64,30 @@
<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.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${netty.version}</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 All @@ -96,14 +108,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.1</version>
<artifactId>hamcrest-core</artifactId>
<version>2.2</version>
<type>jar</type>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -138,11 +150,20 @@
<version>${httpclient.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
<type>jar</type>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
Expand All @@ -151,23 +172,35 @@
<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>
<artifactId>guava</artifactId>
<version>32.0.0-jre</version>
<version>32.1.1-jre</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.23.3</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>3.23.3</version>
</dependency>
<dependency>
<groupId>net.snowflake</groupId>
Expand All @@ -186,7 +219,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.11</version>
<version>3.12.0</version>
<type>jar</type>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -255,7 +288,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>1.0.2.1</version>
<version>1.0.2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -272,7 +305,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -313,12 +346,12 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
<version>1.12.1</version>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.22.5</version>
<version>2.22.6</version>
<exclusions>
<exclusion> <!-- Exclude sub-sub dependency gson to avoid whitesource vulnerability -->
<groupId>com.google.code.gson</groupId>
Expand All @@ -333,7 +366,7 @@
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-credentials</artifactId>
<version>1.15.0</version>
<version>1.19.0</version>
</dependency>
<dependency>
<groupId>com.google.api-client</groupId>
Expand All @@ -349,13 +382,18 @@
<dependency> <!-- oauth-client is not a direct dependency. It is used by google-cloud-storage and api-client. -->
<groupId>com.google.oauth-client</groupId>
<artifactId>google-oauth-client</artifactId>
<version>1.33.3</version>
<version>1.34.1</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client</artifactId>
<version>${google.http.client.version}</version>
</dependency>
<dependency>
<groupId>com.google.http-client</groupId>
<artifactId>google-http-client-gson</artifactId>
<version>${google.http.client.version}</version>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
Expand Down
11 changes: 6 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@

<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>
<jackson.version>2.14.2</jackson.version>
<jacoco.skip.instrument>true</jacoco.skip.instrument>
<jna.version>5.13.0</jna.version>
<jsoup.version>1.15.3</jsoup.version>
<mockito.version>3.5.6</mockito.version>
<netty.version>4.1.100.Final</netty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<relocationBase>net/snowflake/client/jdbc/internal</relocationBase>
Expand Down Expand Up @@ -67,14 +68,14 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>2.14.2</version>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.82.Final</version>
<version>${netty.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -161,7 +162,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.23.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down

0 comments on commit fc5b240

Please sign in to comment.