Skip to content

Commit e5594f8

Browse files
davisusanibardavisusanibar
committed
fix: solve error to call Isthmus by Dataset that use JDK8
1 parent 8cc5443 commit e5594f8

File tree

4 files changed

+39
-58
lines changed

4 files changed

+39
-58
lines changed

‎ci/docker/java-jni-manylinux-201x.dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ RUN vcpkg install \
3333
--x-feature=s3
3434

3535
# Install Java
36-
ARG java=1.8.0
37-
RUN yum install -y java-$java-openjdk-devel rh-maven35 && yum clean all
38-
ENV JAVA_HOME=/usr/lib/jvm/java-$java-openjdk/
36+
ARG java1=1.8.0
37+
ARG java2=11
38+
RUN yum install -y java-$java1-openjdk-devel java-$java2-openjdk-devel rh-maven35 && yum clean all
39+
ENV JAVA_HOME=/usr/lib/jvm/java-$java2-openjdk/
3940

4041
# For ci/scripts/{cpp,java}_*.sh
4142
ENV ARROW_HOME=/tmp/local \

‎docker-compose.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,6 @@ services:
10531053
build:
10541054
args:
10551055
base: ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
1056-
java: 1.8.0
10571056
context: .
10581057
dockerfile: ci/docker/java-jni-manylinux-201x.dockerfile
10591058
cache_from:

‎java/dataset/pom.xml‎

Lines changed: 34 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<protobuf.version>2.5.0</protobuf.version>
2929
<parquet.version>1.11.0</parquet.version>
3030
<avro.version>1.8.2</avro.version>
31+
<substrait.version>0.7.0</substrait.version>
32+
<calcite.version>1.32.0</calcite.version>
33+
<protobuf.java.version>3.22.2</protobuf.java.version>
3134
</properties>
3235

3336
<dependencies>
@@ -146,16 +149,10 @@
146149
<version>2.7</version>
147150
<scope>test</scope>
148151
</dependency>
149-
<dependency>
150-
<groupId>io.substrait</groupId>
151-
<artifactId>core</artifactId>
152-
<version>0.7.0</version>
153-
<scope>test</scope>
154-
</dependency>
155152
<dependency>
156153
<groupId>io.substrait</groupId>
157154
<artifactId>isthmus</artifactId>
158-
<version>0.7.0</version>
155+
<version>${substrait.version}</version>
159156
<scope>test</scope>
160157
<exclusions>
161158
<exclusion>
@@ -164,10 +161,16 @@
164161
</exclusion>
165162
</exclusions>
166163
</dependency>
164+
<dependency>
165+
<groupId>io.substrait</groupId>
166+
<artifactId>core</artifactId>
167+
<version>${substrait.version}</version>
168+
<scope>test</scope>
169+
</dependency>
167170
<dependency>
168171
<groupId>org.apache.calcite</groupId>
169172
<artifactId>calcite-core</artifactId>
170-
<version>1.32.0</version>
173+
<version>${calcite.version}</version>
171174
<scope>test</scope>
172175
<exclusions>
173176
<exclusion>
@@ -179,7 +182,7 @@
179182
<dependency>
180183
<groupId>com.google.protobuf</groupId>
181184
<artifactId>protobuf-java-util</artifactId>
182-
<version>3.21.6</version>
185+
<version>${protobuf.java.version}</version>
183186
<scope>test</scope>
184187
</dependency>
185188
</dependencies>
@@ -192,51 +195,29 @@
192195
</includes>
193196
</resource>
194197
</resources>
195-
196-
<plugins>
197-
<plugin>
198-
<groupId>org.xolstice.maven.plugins</groupId>
199-
<artifactId>protobuf-maven-plugin</artifactId>
200-
<version>0.6.1</version>
201-
<configuration>
202-
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
203-
</protocArtifact>
204-
<protoSourceRoot>../../cpp/src/jni/dataset/proto</protoSourceRoot>
205-
</configuration>
206-
<executions>
207-
<execution>
208-
<goals>
209-
<goal>compile</goal>
210-
<goal>test-compile</goal>
211-
</goals>
212-
</execution>
213-
</executions>
214-
</plugin>
215-
</plugins>
216198
</build>
217-
218199
<profiles>
219-
220-
<profile>
221-
<id>default</id>
222-
<activation>
223-
<activeByDefault>true</activeByDefault>
224-
</activation>
225-
<build>
226-
<plugins>
227-
<plugin>
228-
<groupId>org.apache.maven.plugins</groupId>
229-
<artifactId>maven-compiler-plugin</artifactId>
230-
<configuration>
231-
<source>1.8</source>
232-
<target>1.8</target>
233-
<!--To be able to consume Isthmus Library to create binary Substrait Plan-->
234-
<testSource>11</testSource>
235-
<testTarget>11</testTarget>
236-
</configuration>
237-
</plugin>
238-
</plugins>
239-
</build>
240-
</profile>
200+
<profile>
201+
<id>default</id>
202+
<activation>
203+
<activeByDefault>true</activeByDefault>
204+
</activation>
205+
<build>
206+
<plugins>
207+
<plugin>
208+
<groupId>org.apache.maven.plugins</groupId>
209+
<artifactId>maven-compiler-plugin</artifactId>
210+
<version>${maven-compiler-plugin.version}</version>
211+
<configuration>
212+
<source>1.8</source>
213+
<target>1.8</target>
214+
<!--To be able to consume Isthmus Library to create binary Substrait Plan-->
215+
<testSource>11</testSource>
216+
<testTarget>11</testTarget>
217+
</configuration>
218+
</plugin>
219+
</plugins>
220+
</build>
221+
</profile>
241222
</profiles>
242223
</project>

‎java/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
<plugin>
377377
<groupId>org.apache.maven.plugins</groupId>
378378
<artifactId>maven-dependency-plugin</artifactId>
379-
<version>3.0.1</version>
379+
<version>3.1.2</version>
380380
</plugin>
381381
<plugin>
382382
<groupId>org.apache.rat</groupId>

0 commit comments

Comments
 (0)