Skip to content

Commit f7d2d8d

Browse files
jackye1995jackye1995
authored
feat: bump lance to 2.0.0-rc.3 and remove lance-namespace version ping (#13)
We also remove hard-pinged lance-namespace dependencies so that it can use transitive version from lance.
1 parent 3496d5e commit f7d2d8d

8 files changed

Lines changed: 124 additions & 97 deletions

File tree

‎java/lance-namespace-glue/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,6 @@
2222
</properties>
2323

2424
<dependencies>
25-
<dependency>
26-
<groupId>org.lance</groupId>
27-
<artifactId>lance-core</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.lance</groupId>
31-
<artifactId>lance-namespace-core</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.lance</groupId>
35-
<artifactId>lance-namespace-apache-client</artifactId>
36-
</dependency>
37-
3825
<dependency>
3926
<groupId>software.amazon.awssdk</groupId>
4027
<artifactId>glue</artifactId>

‎java/lance-namespace-hive2/pom.xml‎

Lines changed: 52 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,6 @@
1818
<packaging>jar</packaging>
1919

2020
<dependencies>
21-
<dependency>
22-
<groupId>org.lance</groupId>
23-
<artifactId>lance-core</artifactId>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.lance</groupId>
27-
<artifactId>lance-namespace-core</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.lance</groupId>
31-
<artifactId>lance-namespace-apache-client</artifactId>
32-
</dependency>
3321
<dependency>
3422
<groupId>org.apache.hive</groupId>
3523
<artifactId>hive-metastore</artifactId>
@@ -47,6 +35,14 @@
4735
<groupId>org.pentaho</groupId>
4836
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
4937
</exclusion>
38+
<exclusion>
39+
<groupId>io.netty</groupId>
40+
<artifactId>netty</artifactId>
41+
</exclusion>
42+
<exclusion>
43+
<groupId>io.netty</groupId>
44+
<artifactId>netty-all</artifactId>
45+
</exclusion>
5046
</exclusions>
5147
</dependency>
5248
<dependency>
@@ -62,6 +58,14 @@
6258
<groupId>org.pentaho</groupId>
6359
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
6460
</exclusion>
61+
<exclusion>
62+
<groupId>io.netty</groupId>
63+
<artifactId>netty</artifactId>
64+
</exclusion>
65+
<exclusion>
66+
<groupId>io.netty</groupId>
67+
<artifactId>netty-all</artifactId>
68+
</exclusion>
6569
</exclusions>
6670
</dependency>
6771
<dependency>
@@ -77,6 +81,14 @@
7781
<groupId>org.pentaho</groupId>
7882
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
7983
</exclusion>
84+
<exclusion>
85+
<groupId>io.netty</groupId>
86+
<artifactId>netty</artifactId>
87+
</exclusion>
88+
<exclusion>
89+
<groupId>io.netty</groupId>
90+
<artifactId>netty-all</artifactId>
91+
</exclusion>
8092
</exclusions>
8193
</dependency>
8294
<dependency>
@@ -100,6 +112,14 @@
100112
<groupId>org.pentaho</groupId>
101113
<artifactId>pentaho-aggdesigner-algorithm</artifactId>
102114
</exclusion>
115+
<exclusion>
116+
<groupId>io.netty</groupId>
117+
<artifactId>netty</artifactId>
118+
</exclusion>
119+
<exclusion>
120+
<groupId>io.netty</groupId>
121+
<artifactId>netty-all</artifactId>
122+
</exclusion>
103123
</exclusions>
104124
<classifier>core</classifier>
105125
</dependency>
@@ -114,6 +134,14 @@
114134
<groupId>com.google.guava</groupId>
115135
<artifactId>guava</artifactId>
116136
</exclusion>
137+
<exclusion>
138+
<groupId>io.netty</groupId>
139+
<artifactId>netty</artifactId>
140+
</exclusion>
141+
<exclusion>
142+
<groupId>io.netty</groupId>
143+
<artifactId>netty-all</artifactId>
144+
</exclusion>
117145
</exclusions>
118146
</dependency>
119147
<dependency>
@@ -125,6 +153,10 @@
125153
<groupId>com.google.guava</groupId>
126154
<artifactId>guava</artifactId>
127155
</exclusion>
156+
<exclusion>
157+
<groupId>io.netty</groupId>
158+
<artifactId>netty</artifactId>
159+
</exclusion>
128160
</exclusions>
129161
</dependency>
130162
<dependency>
@@ -137,6 +169,14 @@
137169
<groupId>com.google.guava</groupId>
138170
<artifactId>guava</artifactId>
139171
</exclusion>
172+
<exclusion>
173+
<groupId>io.netty</groupId>
174+
<artifactId>netty</artifactId>
175+
</exclusion>
176+
<exclusion>
177+
<groupId>io.netty</groupId>
178+
<artifactId>netty-all</artifactId>
179+
</exclusion>
140180
</exclusions>
141181
</dependency>
142182
<dependency>

‎java/lance-namespace-hive3/pom.xml‎

Lines changed: 51 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,24 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>org.lance</groupId>
23-
<artifactId>lance-core</artifactId>
24-
</dependency>
25-
<dependency>
26-
<groupId>org.lance</groupId>
27-
<artifactId>lance-namespace-core</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.lance</groupId>
31-
<artifactId>lance-namespace-apache-client</artifactId>
22+
<groupId>com.google.errorprone</groupId>
23+
<artifactId>error_prone_annotations</artifactId>
24+
<version>2.28.0</version>
3225
</dependency>
3326
<dependency>
3427
<groupId>org.apache.hive</groupId>
3528
<artifactId>hive-standalone-metastore</artifactId>
3629
<version>3.1.3</version>
30+
<exclusions>
31+
<exclusion>
32+
<groupId>io.netty</groupId>
33+
<artifactId>netty</artifactId>
34+
</exclusion>
35+
<exclusion>
36+
<groupId>io.netty</groupId>
37+
<artifactId>netty-all</artifactId>
38+
</exclusion>
39+
</exclusions>
3740
</dependency>
3841
<dependency>
3942
<groupId>org.apache.hive</groupId>
@@ -48,6 +51,14 @@
4851
<groupId>com.tdunning</groupId>
4952
<artifactId>json</artifactId>
5053
</exclusion>
54+
<exclusion>
55+
<groupId>io.netty</groupId>
56+
<artifactId>netty</artifactId>
57+
</exclusion>
58+
<exclusion>
59+
<groupId>io.netty</groupId>
60+
<artifactId>netty-all</artifactId>
61+
</exclusion>
5162
</exclusions>
5263
<classifier>core</classifier>
5364
</dependency>
@@ -57,19 +68,49 @@
5768
<artifactId>hive-metastore</artifactId>
5869
<version>3.1.3</version>
5970
<scope>test</scope>
71+
<exclusions>
72+
<exclusion>
73+
<groupId>io.netty</groupId>
74+
<artifactId>netty</artifactId>
75+
</exclusion>
76+
<exclusion>
77+
<groupId>io.netty</groupId>
78+
<artifactId>netty-all</artifactId>
79+
</exclusion>
80+
</exclusions>
6081
</dependency>
6182
<dependency>
6283
<groupId>org.apache.hive</groupId>
6384
<artifactId>hive-service</artifactId>
6485
<version>3.1.3</version>
6586
<scope>test</scope>
87+
<exclusions>
88+
<exclusion>
89+
<groupId>io.netty</groupId>
90+
<artifactId>netty</artifactId>
91+
</exclusion>
92+
<exclusion>
93+
<groupId>io.netty</groupId>
94+
<artifactId>netty-all</artifactId>
95+
</exclusion>
96+
</exclusions>
6697
</dependency>
6798
<dependency>
6899
<groupId>org.apache.hive</groupId>
69100
<artifactId>hive-standalone-metastore</artifactId>
70101
<version>3.1.3</version>
71102
<type>test-jar</type>
72103
<scope>test</scope>
104+
<exclusions>
105+
<exclusion>
106+
<groupId>io.netty</groupId>
107+
<artifactId>netty</artifactId>
108+
</exclusion>
109+
<exclusion>
110+
<groupId>io.netty</groupId>
111+
<artifactId>netty-all</artifactId>
112+
</exclusion>
113+
</exclusions>
73114
</dependency>
74115
<dependency>
75116
<groupId>org.apache.derby</groupId>

‎java/lance-namespace-iceberg/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,6 @@
2222
<groupId>org.lance</groupId>
2323
<artifactId>lance-namespace-impls-core</artifactId>
2424
</dependency>
25-
<dependency>
26-
<groupId>org.lance</groupId>
27-
<artifactId>lance-core</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.lance</groupId>
31-
<artifactId>lance-namespace-core</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.lance</groupId>
35-
<artifactId>lance-namespace-apache-client</artifactId>
36-
</dependency>
37-
3825
<!-- Jackson for JSON processing -->
3926
<dependency>
4027
<groupId>com.fasterxml.jackson.core</groupId>

‎java/lance-namespace-impls-core/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@
1515
<description>Core utilities for Lance Namespace implementations including RestClient</description>
1616

1717
<dependencies>
18-
<!-- Lance Namespace Core -->
19-
<dependency>
20-
<groupId>org.lance</groupId>
21-
<artifactId>lance-namespace-core</artifactId>
22-
</dependency>
23-
2418
<!-- HTTP Client -->
2519
<dependency>
2620
<groupId>org.apache.httpcomponents.client5</groupId>

‎java/lance-namespace-polaris/pom.xml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@
3535
<groupId>org.lance</groupId>
3636
<artifactId>lance-namespace-impls-core</artifactId>
3737
</dependency>
38-
<dependency>
39-
<groupId>org.lance</groupId>
40-
<artifactId>lance-core</artifactId>
41-
</dependency>
42-
<dependency>
43-
<groupId>org.lance</groupId>
44-
<artifactId>lance-namespace-core</artifactId>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.lance</groupId>
48-
<artifactId>lance-namespace-apache-client</artifactId>
49-
</dependency>
5038
<dependency>
5139
<groupId>com.fasterxml.jackson.core</groupId>
5240
<artifactId>jackson-databind</artifactId>

‎java/lance-namespace-unity/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@
2222
<groupId>org.lance</groupId>
2323
<artifactId>lance-namespace-impls-core</artifactId>
2424
</dependency>
25-
<dependency>
26-
<groupId>org.lance</groupId>
27-
<artifactId>lance-core</artifactId>
28-
</dependency>
29-
<dependency>
30-
<groupId>org.lance</groupId>
31-
<artifactId>lance-namespace-core</artifactId>
32-
</dependency>
33-
<dependency>
34-
<groupId>org.lance</groupId>
35-
<artifactId>lance-namespace-apache-client</artifactId>
36-
</dependency>
37-
38-
3925
<!-- Jackson for JSON processing -->
4026
<dependency>
4127
<groupId>com.fasterxml.jackson.core</groupId>

‎java/pom.xml‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
<properties>
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5959

60-
<lance-core.version>2.0.0-beta.4</lance-core.version>
61-
<lance-namespace.version>0.4.2</lance-namespace.version>
60+
<lance-core.version>2.0.0-rc.3</lance-core.version>
6261
<arrow.version>15.0.0</arrow.version>
62+
<netty.version>4.1.118.Final</netty.version>
6363
<junit-version>5.8.2</junit-version>
6464

6565
<spotless.skip>false</spotless.skip>
@@ -95,28 +95,21 @@
9595
<module>lance-namespace-polaris</module>
9696
</modules>
9797

98+
<dependencies>
99+
<dependency>
100+
<groupId>org.lance</groupId>
101+
<artifactId>lance-core</artifactId>
102+
<version>${lance-core.version}</version>
103+
</dependency>
104+
</dependencies>
105+
98106
<dependencyManagement>
99107
<dependencies>
100108
<dependency>
101109
<groupId>org.lance</groupId>
102110
<artifactId>lance-namespace-impls-core</artifactId>
103111
<version>${project.version}</version>
104112
</dependency>
105-
<dependency>
106-
<groupId>org.lance</groupId>
107-
<artifactId>lance-core</artifactId>
108-
<version>${lance-core.version}</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.lance</groupId>
112-
<artifactId>lance-namespace-core</artifactId>
113-
<version>${lance-namespace.version}</version>
114-
</dependency>
115-
<dependency>
116-
<groupId>org.lance</groupId>
117-
<artifactId>lance-namespace-apache-client</artifactId>
118-
<version>${lance-namespace.version}</version>
119-
</dependency>
120113
<dependency>
121114
<groupId>org.apache.arrow</groupId>
122115
<artifactId>arrow-vector</artifactId>
@@ -127,6 +120,17 @@
127120
<artifactId>arrow-memory-netty</artifactId>
128121
<version>${arrow.version}</version>
129122
</dependency>
123+
<!-- Netty - force version for Arrow compatibility -->
124+
<dependency>
125+
<groupId>io.netty</groupId>
126+
<artifactId>netty-buffer</artifactId>
127+
<version>${netty.version}</version>
128+
</dependency>
129+
<dependency>
130+
<groupId>io.netty</groupId>
131+
<artifactId>netty-common</artifactId>
132+
<version>${netty.version}</version>
133+
</dependency>
130134
<!-- Jackson -->
131135
<dependency>
132136
<groupId>com.fasterxml.jackson.core</groupId>

0 commit comments

Comments
 (0)