-
Notifications
You must be signed in to change notification settings - Fork 170
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.
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-1322004: Upgrade to Arrow 15.0.2 in snowflake-jdbc #1848
Changes from all commits
665a082
f00856d
cf495da
220dc20
b604b62
1df0660
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -477,6 +477,10 @@ | |
<pattern>org.threeten</pattern> | ||
<shadedPattern>${shadeBase}.threeten</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>org.slf4j</pattern> | ||
<shadedPattern>${shadeBase}.org.slf4j</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>google.protobuf</pattern> | ||
<shadedPattern>${shadeBase}.google.protobuf</shadedPattern> | ||
|
@@ -493,6 +497,10 @@ | |
<pattern>io.grpc</pattern> | ||
<shadedPattern>${shadeBase}.grpc</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>org.eclipse.collections</pattern> | ||
<shadedPattern>${shadeBase}org.eclipse.collections</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>google.longrunning</pattern> | ||
<shadedPattern>${shadeBase}.google.longrunning</shadedPattern> | ||
|
@@ -553,6 +561,9 @@ | |
<exclude>arrow-git.properties</exclude> | ||
<exclude>google-http-client.properties</exclude> | ||
<exclude>pipes-fork-server-default-log4j2.xml</exclude> | ||
<exclude>about.html</exclude> | ||
<exclude>LICENSE-EDL-1.0.txt</exclude> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. according to the licence we should include this files? |
||
<exclude>LICENSE-EPL-1.0.txt</exclude> | ||
<exclude>dependencies.properties</exclude> | ||
</excludes> | ||
</filter> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
<parent> | ||
<groupId>org.apache.arrow</groupId> | ||
<artifactId>arrow-java-root</artifactId> | ||
<version>10.0.1</version> | ||
<version>15.0.2</version> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's update also dependencies/README.md |
||
</parent> | ||
<artifactId>arrow-memory</artifactId> | ||
<name>Arrow Memory</name> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,11 +19,11 @@ | |
<apache.commons.text.version>1.10.0</apache.commons.text.version> | ||
<apache.httpclient.version>4.5.14</apache.httpclient.version> | ||
<apache.httpcore.version>4.4.16</apache.httpcore.version> | ||
<arrow.version>10.0.1</arrow.version> | ||
<arrow.version>15.0.2</arrow.version> | ||
<asm.version>9.3</asm.version> | ||
<avro.version>1.8.1</avro.version> | ||
<awaitility.version>4.2.0</awaitility.version> | ||
<awssdk.version>1.12.501</awssdk.version> | ||
<awssdk.version>1.12.655</awssdk.version> | ||
<azure.storage.version>5.0.0</azure.storage.version> | ||
<bouncycastle.version>1.74</bouncycastle.version> | ||
<bouncycastle.bcfips.version>1.0.2.4</bouncycastle.bcfips.version> | ||
|
@@ -38,13 +38,14 @@ | |
<commons.logging.version>1.2</commons.logging.version> | ||
<commons.pool.version>1.5.4</commons.pool.version> | ||
<c3p0.version>0.9.5.4</c3p0.version> | ||
<eclipse.collections.version>11.1.0</eclipse.collections.version> | ||
<google.api.grpc.version>2.22.0</google.api.grpc.version> | ||
<google.auth.library.oauth2.http.version>1.19.0</google.auth.library.oauth2.http.version> | ||
<google.cloud.core.version>2.21.0</google.cloud.core.version> | ||
<google.cloud.storage.version>2.22.6</google.cloud.storage.version> | ||
<google.code.gson.version>2.10.1</google.code.gson.version> | ||
<google.errorprone.version>2.18.0</google.errorprone.version> | ||
<google.flatbuffers.version>1.12.0</google.flatbuffers.version> | ||
<google.flatbuffers.version>23.5.26</google.flatbuffers.version> | ||
<google.gax.version>2.31.0</google.gax.version> | ||
<google.guava.version>32.1.1-jre</google.guava.version> | ||
<google.http.client.version>1.43.3</google.http.client.version> | ||
|
@@ -53,7 +54,7 @@ | |
<grpc.version>1.60.0</grpc.version> | ||
<hamcrest.version>2.2</hamcrest.version> | ||
<hikaricp.version>2.4.3</hikaricp.version> | ||
<jackson.version>2.15.3</jackson.version> | ||
<jackson.version>2.16.0</jackson.version> | ||
<jacoco.skip.instrument>true</jacoco.skip.instrument> | ||
<javax.servlet.version>3.1.0</javax.servlet.version> | ||
<jna.version>5.13.0</jna.version> | ||
|
@@ -73,7 +74,7 @@ | |
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> | ||
<relocationBase>net/snowflake/client/jdbc/internal</relocationBase> | ||
<shadeBase>net.snowflake.client.jdbc.internal</shadeBase> | ||
<slf4j.version>2.0.6</slf4j.version> | ||
<slf4j.version>2.0.9</slf4j.version> | ||
<snowflake.common.version>5.1.4</snowflake.common.version> | ||
<testCategory>net.snowflake.client.category.AllTestCategory</testCategory> | ||
<threeten.version>1.6.8</threeten.version> | ||
|
@@ -98,7 +99,7 @@ | |
<version.plugin.jar>3.3.0</version.plugin.jar> | ||
<version.plugin.javadoc>3.5.0</version.plugin.javadoc> | ||
<version.plugin.projectinforeports>3.4.2</version.plugin.projectinforeports> | ||
<version.plugin.shade>3.4.1</version.plugin.shade> | ||
<version.plugin.shade>3.5.0</version.plugin.shade> | ||
<version.plugin.sortpom>3.0.1</version.plugin.sortpom> | ||
<version.plugin.source>3.2.1</version.plugin.source> | ||
<version.plugin.surefire>3.0.0</version.plugin.surefire> | ||
|
@@ -385,7 +386,6 @@ | |
<groupId>org.slf4j</groupId> | ||
<artifactId>slf4j-api</artifactId> | ||
<version>${slf4j.version}</version> | ||
<scope>provided</scope> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's keep it provided |
||
</dependency> | ||
<dependency> | ||
<!-- used by apache arrow --> | ||
|
@@ -394,6 +394,18 @@ | |
<version>${google.flatbuffers.version}</version> | ||
<scope>runtime</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.collections</groupId> | ||
<artifactId>eclipse-collections</artifactId> | ||
<version>${eclipse.collections.version}</version> | ||
<scope>runtime</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.collections</groupId> | ||
<artifactId>eclipse-collections-api</artifactId> | ||
<version>${eclipse.collections.version}</version> | ||
<scope>runtime</scope> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.arrow</groupId> | ||
<artifactId>arrow-format</artifactId> | ||
|
@@ -674,6 +686,10 @@ | |
<groupId>com.google.flatbuffers</groupId> | ||
<artifactId>flatbuffers-java</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.collections</groupId> | ||
<artifactId>eclipse-collections</artifactId> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.apache.arrow</groupId> | ||
<artifactId>arrow-format</artifactId> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -907,6 +907,10 @@ | |
<pattern>io.grpc</pattern> | ||
<shadedPattern>${shadeBase}.grpc</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>org.eclipse.collections</pattern> | ||
<shadedPattern>${shadeBase}org.eclipse.collections</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>google.longrunning</pattern> | ||
<shadedPattern>${shadeBase}.google.longrunning</shadedPattern> | ||
|
@@ -927,6 +931,10 @@ | |
<pattern>org.codehaus</pattern> | ||
<shadedPattern>${shadeBase}.org.codehaus</shadedPattern> | ||
</relocation> | ||
<relocation> | ||
<pattern>org.slf4j</pattern> | ||
<shadedPattern>${shadeBase}.org.slf4j</shadedPattern> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. let's not shade slf4j |
||
</relocation> | ||
<relocation> | ||
<pattern>io.perfmark</pattern> | ||
<shadedPattern>${shadeBase}.io.perfmark</shadedPattern> | ||
|
@@ -967,6 +975,9 @@ | |
<exclude>arrow-git.properties</exclude> | ||
<exclude>google-http-client.properties</exclude> | ||
<exclude>storage.v1.json</exclude> | ||
<exclude>about.html</exclude> | ||
<exclude>LICENSE-EDL-1.0.txt</exclude> | ||
<exclude>LICENSE-EPL-1.0.txt</exclude> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. we should include licenses? |
||
<!-- This is just a documentation file, not needed--> | ||
<exclude>pipes-fork-server-default-log4j2.xml</exclude> | ||
<exclude>dependencies.properties</exclude> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,23 +35,24 @@ | |
<properties> | ||
<apache.httpclient.version>4.5.14</apache.httpclient.version> | ||
<apache.httpcore.version>4.4.16</apache.httpcore.version> | ||
<awssdk.version>1.12.501</awssdk.version> | ||
<awssdk.version>1.12.655</awssdk.version> | ||
<azure.storage.version>5.0.0</azure.storage.version> | ||
<bouncycastle.version>1.74</bouncycastle.version> | ||
<commons.codec.version>1.15</commons.codec.version> | ||
<commons.io.version>2.11.0</commons.io.version> | ||
<commons.logging.version>1.2</commons.logging.version> | ||
<eclipse.collections.version>11.1.0</eclipse.collections.version> | ||
<google.cloud.core.version>2.21.0</google.cloud.core.version> | ||
<google.cloud.storage.version>2.22.6</google.cloud.storage.version> | ||
<google.flatbuffers.version>1.12.0</google.flatbuffers.version> | ||
<google.flatbuffers.version>23.5.26</google.flatbuffers.version> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't we need to change any other google library? |
||
<google.auth.library.oauth2.http.version>1.19.0</google.auth.library.oauth2.http.version> | ||
<google.gax.version>2.31.0</google.gax.version> | ||
<google.guava.version>32.1.1-jre</google.guava.version> | ||
<google.http.client.version>1.43.3</google.http.client.version> | ||
<google.jsr305.version>3.0.2</google.jsr305.version> | ||
<google.protobuf.java.version>3.23.3</google.protobuf.java.version> | ||
<grpc.version>1.60.0</grpc.version> | ||
<jackson.version>2.15.3</jackson.version> | ||
<jackson.version>2.16.0</jackson.version> | ||
<javax.servlet.version>3.1.0</javax.servlet.version> | ||
<jna.version>5.13.0</jna.version> | ||
<joda.time.version>2.8.1</joda.time.version> | ||
|
@@ -272,6 +273,11 @@ | |
<artifactId>flatbuffers-java</artifactId> | ||
<version>${google.flatbuffers.version}</version> | ||
</dependency> | ||
<dependency> | ||
<groupId>org.eclipse.collections</groupId> | ||
<artifactId>eclipse-collections</artifactId> | ||
<version>${eclipse.collections.version}</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
</project> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
let's not shade slf4j - arrow should not need this dependency