Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SNOW-919389: match dependencies versions for both pom.xml files #1543

Closed
wants to merge 2 commits into from
Closed

SNOW-919389: match dependencies versions for both pom.xml files #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc5b240
match dependencies versions between two pom.xml
sfc-gh-ext-simba-jl Oct 25, 2023
919b16b
Merge branch 'master' into SNOW-919389-dependencies-versions
sfc-gh-ext-simba-jl Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 60 additions & 22 deletions FIPS/pom.xml
View file
Open in desktop
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>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jacksondatabind becomes the same version as jackson.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 @@ -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
Open in desktop
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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why removing this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This property is not used in this file.

<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