Skip to content

Commit 7fdb266

Browse files
juripetersenjuripetersen
authored
Merge pull request #568 from mspruc/main
Spark & Calcite Guava dependency issue
2 parents 5f60b98 + eee3a38 commit 7fdb266

File tree

7 files changed

+11
-50
lines changed

7 files changed

+11
-50
lines changed

‎bin/wayang-submit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ WAYANG_CONF="${WAYANG_HOME}/conf"
9898

9999
# Bootstrap the classpath.
100100
WAYANG_CLASSPATH="${WAYANG_CONF}/*:${WAYANG_CODE}/*:${WAYANG_LIBS}/*"
101-
WAYANG_CLASSPATH="${SPARK_JARS_DIR}/*:${WAYANG_CLASSPATH}:${HADOOP_JARS_DIR}"
101+
WAYANG_CLASSPATH="${WAYANG_CLASSPATH}:${SPARK_JARS_DIR}/*:${HADOOP_JARS_DIR}"
102102

103103
FLAGS=""
104104
if [ "${FLAG_LOG}" = "true" ]; then

‎pom.xml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119

120120
<assertj.version>3.25.3</assertj.version>
121121
<commons-io.version>2.15.1</commons-io.version>
122-
<guava.version>32.1.3-jre</guava.version>
122+
<guava.version>33.4.0-jre</guava.version>
123123
<hamcrest.version>2.2</hamcrest.version>
124124
<jackson.version>2.15.4</jackson.version>
125125
<jacoco.version>0.8.9</jacoco.version>
@@ -780,11 +780,19 @@
780780
<scope>import</scope>
781781
<type>pom</type>
782782
</dependency>
783+
<dependency>
784+
<groupId>com.google.guava</groupId>
785+
<artifactId>guava</artifactId>
786+
<version>${guava.version}</version>
787+
</dependency>
783788
</dependencies>
784789
</dependencyManagement>
785790

786791
<dependencies>
787-
792+
<dependency>
793+
<groupId>com.google.guava</groupId>
794+
<artifactId>guava</artifactId>
795+
</dependency>
788796
<!-- Test -->
789797
<dependency>
790798
<groupId>org.junit.jupiter</groupId>

‎wayang-api/wayang-api-sql/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
<version>1.0.1-SNAPSHOT</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
28-
29-
<properties>
30-
<calcite.version>1.39.0</calcite.version>
31-
</properties>
3228

3329
<artifactId>wayang-api-sql</artifactId>
3430
<dependencies>

‎wayang-applications/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747

4848
<assertj.version>3.25.3</assertj.version>
4949
<commons-io.version>2.15.1</commons-io.version>
50-
<guava.version>32.1.3-jre</guava.version>
5150
<hamcrest.version>2.2</hamcrest.version>
5251
<jackson.version>2.15.4</jackson.version>
5352
<jacoco.version>0.8.9</jacoco.version>

‎wayang-assembly/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<build.testJarPhase>none</build.testJarPhase>
3636
<build.copyDependenciesPhase>package</build.copyDependenciesPhase>
3737
<wayang.name>wayang-${project.version}</wayang.name>
38-
<calcite.version>1.35.0</calcite.version>
3938
</properties>
4039

4140
<dependencies>
@@ -114,11 +113,6 @@
114113
<artifactId>gson</artifactId>
115114
<version>2.10.1</version>
116115
</dependency>
117-
<dependency>
118-
<groupId>org.apache.calcite</groupId>
119-
<artifactId>calcite-core</artifactId>
120-
<version>${calcite.version}</version>
121-
</dependency>
122116
</dependencies>
123117

124118
<build>

‎wayang-platforms/wayang-giraph/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,16 @@
7979
<groupId>org.apache.giraph</groupId>
8080
<artifactId>giraph-core</artifactId>
8181
<version>${giraph.version}</version>
82-
<exclusions>
83-
<exclusion>
84-
<groupId>com.google.guava</groupId>
85-
<artifactId>guava</artifactId>
86-
</exclusion>
87-
</exclusions>
8882
</dependency>
8983
<dependency>
9084
<groupId>org.apache.giraph</groupId>
9185
<artifactId>giraph-block-app</artifactId>
9286
<version>${giraph.version}</version>
93-
<exclusions>
94-
<exclusion>
95-
<groupId>com.google.guava</groupId>
96-
<artifactId>guava</artifactId>
97-
</exclusion>
98-
</exclusions>
9987
</dependency>
10088
<dependency>
10189
<groupId>org.apache.giraph</groupId>
10290
<artifactId>giraph-examples</artifactId>
10391
<version>${giraph.version}</version>
104-
<exclusions>
105-
<exclusion>
106-
<groupId>com.google.guava</groupId>
107-
<artifactId>guava</artifactId>
108-
</exclusion>
109-
</exclusions>
11092
</dependency>
11193
</dependencies>
11294

‎wayang-tests-integration/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -189,36 +189,18 @@
189189
<artifactId>giraph-core</artifactId>
190190
<version>${giraph.version}</version>
191191
<scope>test</scope>
192-
<exclusions>
193-
<exclusion>
194-
<groupId>com.google.guava</groupId>
195-
<artifactId>guava</artifactId>
196-
</exclusion>
197-
</exclusions>
198192
</dependency>
199193
<dependency>
200194
<groupId>org.apache.giraph</groupId>
201195
<artifactId>giraph-block-app</artifactId>
202196
<version>${giraph.version}</version>
203197
<scope>test</scope>
204-
<exclusions>
205-
<exclusion>
206-
<groupId>com.google.guava</groupId>
207-
<artifactId>guava</artifactId>
208-
</exclusion>
209-
</exclusions>
210198
</dependency>
211199
<dependency>
212200
<groupId>org.apache.giraph</groupId>
213201
<artifactId>giraph-examples</artifactId>
214202
<version>${giraph.version}</version>
215203
<scope>test</scope>
216-
<exclusions>
217-
<exclusion>
218-
<groupId>com.google.guava</groupId>
219-
<artifactId>guava</artifactId>
220-
</exclusion>
221-
</exclusions>
222204
</dependency>
223205
<!-- https://mvnrepository.com/artifact/org.codehaus.janino/janino -->
224206
<dependency>

0 commit comments

Comments
 (0)