This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/master by this push:
new 5d45ea3e8d [GH-1943] Upgrade to Java 11 (#1942)
5d45ea3e8d is described below
commit 5d45ea3e8de7bd4e4ba4753305066bb4dac4398b
Author: jp <[email protected]>
AuthorDate: Tue May 20 21:01:46 2025 -0700
[GH-1943] Upgrade to Java 11 (#1942)
* Configure pom.xml files to use java 11
* update and run spotless for min version for java11
* configure workflows to use java11
* remove duplicates in java.yml file
* Adding bindAddress to spark unit tests
* configuring spark port in unit tests
* set spark host in unit tests
* Add missing bindings in unit tests
* DO NOT PUSH: adding debugging of actions with tmate
* Reverts adding tmate action
* Updating scala maven plugin
* Adding scala-lib as a dependency in common and snowflake poms
* Revert upgrading scala plugin
* Fix python format errors
* reduced size of change by:
- switching to environment variables for test failures
- only building docs for spark
* Exclude modules without scala but with poms from
the maven scala:docs build
---
.github/workflows/docs.yml | 4 ++--
.github/workflows/example.yml | 3 ++-
.github/workflows/java.yml | 17 +++++------------
.github/workflows/python.yml | 3 ++-
.github/workflows/r.yml | 2 +-
common/pom.xml | 4 ++--
.../apache/sedona/common/geometryObjects/Circle.java | 4 +++-
examples/flink-sql/pom.xml | 4 ++--
examples/spark-sql/pom.xml | 4 ++--
pom.xml | 10 +++++-----
shade-proto/pom.xml | 8 ++++----
.../core/joinJudgement/DynamicIndexLookupJudgement.java | 4 +++-
.../core/joinJudgement/LeftIndexLookupJudgement.java | 4 +++-
.../sedona/core/joinJudgement/NestedLoopJudgement.java | 4 +++-
.../core/joinJudgement/RightIndexLookupJudgement.java | 4 +++-
.../org/apache/sedona/core/spatialPartitioning/KDB.java | 4 +++-
.../org/apache/sedona/core/spatialRDD/SpatialRDD.java | 8 ++++++--
.../sedona/core/spatialOperator/PolygonKnnTest.java | 4 +++-
.../java/org/apache/sedona/core/utils/testGeoJSON.java | 4 +++-
19 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index eb2c8e67f0..ef6fd8b9a2 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -44,11 +44,11 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: '8'
+ java-version: '11'
- name: Compile JavaDoc
run: mvn -q clean install -DskipTests && mkdir -p
docs/api/javadoc/spark && cp -r spark/common/target/apidocs/*
docs/api/javadoc/spark/
- name: Compile ScalaDoc
- run: mvn scala:doc && mkdir -p docs/api/scaladoc/spark && cp -r
spark/common/target/site/scaladocs/* docs/api/scaladoc/spark
+ run: mvn scala:doc -pl !common,!snowflake,!flink && mkdir -p
docs/api/scaladoc/spark && cp -r spark/common/target/site/scaladocs/*
docs/api/scaladoc/spark
- uses: actions/setup-python@v5
with:
python-version: 3.x
diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml
index 7668c1886c..9b0f8e84a6 100644
--- a/.github/workflows/example.yml
+++ b/.github/workflows/example.yml
@@ -58,7 +58,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: '8'
+ java-version: '11'
- run: sudo apt-get remove scala-library scala
- run: sudo wget www.scala-lang.org/files/archive/scala-2.12.11.deb
- run: sudo dpkg -i scala-2.12.11.deb
@@ -82,6 +82,7 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- env:
SPARK_VERSION: ${{ matrix.spark }}
+ SPARK_LOCAL_IP: 127.0.0.1
SPARK_COMPAT_VERSION: ${{ matrix.spark-compat }}
SEDONA_VERSION: ${{ matrix.sedona }}
run: (cd examples/spark-sql;mvn clean install
-Dspark.version=${SPARK_VERSION} -Dspark.compat.version=${SPARK_COMPAT_VERSION}
-Dsedona.version=${SEDONA_VERSION};java -jar
target/sedona-spark-example-1.6.0.jar)
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 6ff667ec65..c850cb4787 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -46,6 +46,7 @@ on:
env:
MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=60
DO_NOT_TRACK: true
+ SPARK_LOCAL_IP: 127.0.0.1
permissions:
contents: read
@@ -63,11 +64,7 @@ jobs:
include:
- spark: 3.5.0
scala: 2.13.8
- jdk: '8'
- skipTests: ''
- - spark: 3.5.0
- scala: 2.12.15
- jdk: '8'
+ jdk: '11'
skipTests: ''
- spark: 3.5.0
scala: 2.12.15
@@ -75,11 +72,7 @@ jobs:
skipTests: ''
- spark: 3.4.0
scala: 2.13.8
- jdk: '8'
- skipTests: ''
- - spark: 3.4.0
- scala: 2.12.15
- jdk: '8'
+ jdk: '11'
skipTests: ''
- spark: 3.4.0
scala: 2.12.15
@@ -87,11 +80,11 @@ jobs:
skipTests: ''
- spark: 3.3.0
scala: 2.13.8
- jdk: '8'
+ jdk: '11'
skipTests: ''
- spark: 3.3.0
scala: 2.12.15
- jdk: '8'
+ jdk: '11'
skipTests: ''
steps:
- uses: actions/checkout@v4
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 5297cdca31..a61ec43125 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -45,6 +45,7 @@ env:
JAI_CODEC_VERSION: '1.1.3'
JAI_IMAGEIO_VERSION: '1.1'
DO_NOT_TRACK: true
+ SPARK_LOCAL_IP: 127.0.0.1
permissions:
contents: read
@@ -99,7 +100,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
- java-version: '8'
+ java-version: '11'
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
diff --git a/.github/workflows/r.yml b/.github/workflows/r.yml
index 2f5ae08ca7..250a7759a5 100644
--- a/.github/workflows/r.yml
+++ b/.github/workflows/r.yml
@@ -107,7 +107,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: 'temurin'
- java-version: '8'
+ java-version: '11'
cache: 'maven'
- name: Get OS name
id: os-name
diff --git a/common/pom.xml b/common/pom.xml
index 2ababe827c..36a99be252 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -130,8 +130,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>8</source>
- <target>8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
</plugins>
diff --git
a/common/src/main/java/org/apache/sedona/common/geometryObjects/Circle.java
b/common/src/main/java/org/apache/sedona/common/geometryObjects/Circle.java
index 09de7696eb..4ebc065244 100644
--- a/common/src/main/java/org/apache/sedona/common/geometryObjects/Circle.java
+++ b/common/src/main/java/org/apache/sedona/common/geometryObjects/Circle.java
@@ -246,7 +246,9 @@ public class Circle extends Geometry {
return false;
}
- /** @return true if a line from `start` to `end` intersects this circle */
+ /**
+ * @return true if a line from `start` to `end` intersects this circle
+ */
private boolean intersects(Point start, Point end) {
double deltaX = end.getX() - start.getX();
double deltaY = end.getY() - start.getY();
diff --git a/examples/flink-sql/pom.xml b/examples/flink-sql/pom.xml
index 2ea51d41d5..6c7c2121c9 100644
--- a/examples/flink-sql/pom.xml
+++ b/examples/flink-sql/pom.xml
@@ -194,8 +194,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/examples/spark-sql/pom.xml b/examples/spark-sql/pom.xml
index 903a88bf15..b15f209b08 100644
--- a/examples/spark-sql/pom.xml
+++ b/examples/spark-sql/pom.xml
@@ -266,8 +266,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git a/pom.xml b/pom.xml
index 08d4ff646a..75e7d29ad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
<properties>
<project.scm.id>github</project.scm.id>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
+ <java.version>11</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<skip.deploy.common.modules>false</skip.deploy.common.modules>
@@ -498,8 +498,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
<executions>
<execution>
@@ -643,11 +643,11 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
- <version>2.30.0</version>
+ <version>2.35.0</version>
<configuration>
<java>
<googleJavaFormat>
- <version>1.7</version>
+ <version>1.15.0</version>
</googleJavaFormat>
<licenseHeader>
<file>tools/maven/license-header.txt</file>
diff --git a/shade-proto/pom.xml b/shade-proto/pom.xml
index 68541c97f4..fea3709926 100644
--- a/shade-proto/pom.xml
+++ b/shade-proto/pom.xml
@@ -14,8 +14,8 @@
<packaging>jar</packaging>
<properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -34,8 +34,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>8</source>
- <target>8</target>
+ <source>11</source>
+ <target>11</target>
</configuration>
</plugin>
<plugin>
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/DynamicIndexLookupJudgement.java
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/DynamicIndexLookupJudgement.java
index a0ebcc4480..a8526b1404 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/DynamicIndexLookupJudgement.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/DynamicIndexLookupJudgement.java
@@ -40,7 +40,9 @@ public class DynamicIndexLookupJudgement<T extends Geometry,
U extends Geometry>
private final IndexType indexType;
private final JoinBuildSide joinBuildSide;
- /** @see JudgementBase */
+ /**
+ * @see JudgementBase
+ */
public DynamicIndexLookupJudgement(
SpatialPredicate spatialPredicate,
IndexType indexType,
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/LeftIndexLookupJudgement.java
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/LeftIndexLookupJudgement.java
index e6d3c75fdc..3a09ade39c 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/LeftIndexLookupJudgement.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/LeftIndexLookupJudgement.java
@@ -32,7 +32,9 @@ public class LeftIndexLookupJudgement<T extends Geometry, U
extends Geometry>
extends JudgementBase<T, U>
implements FlatMapFunction2<Iterator<SpatialIndex>, Iterator<U>, Pair<U,
T>>, Serializable {
- /** @see JudgementBase */
+ /**
+ * @see JudgementBase
+ */
public LeftIndexLookupJudgement(
SpatialPredicate spatialPredicate,
LongAccumulator buildCount,
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/NestedLoopJudgement.java
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/NestedLoopJudgement.java
index a4f55bb0fb..b7733b7462 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/NestedLoopJudgement.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/NestedLoopJudgement.java
@@ -31,7 +31,9 @@ import org.locationtech.jts.geom.Geometry;
public class NestedLoopJudgement<T extends Geometry, U extends Geometry>
extends JudgementBase<T, U>
implements FlatMapFunction2<Iterator<T>, Iterator<U>, Pair<U, T>>,
Serializable {
- /** @see JudgementBase */
+ /**
+ * @see JudgementBase
+ */
public NestedLoopJudgement(
SpatialPredicate spatialPredicate,
LongAccumulator buildCount,
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/RightIndexLookupJudgement.java
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/RightIndexLookupJudgement.java
index 1618e0181c..20f192d736 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/RightIndexLookupJudgement.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/joinJudgement/RightIndexLookupJudgement.java
@@ -32,7 +32,9 @@ public class RightIndexLookupJudgement<T extends Geometry, U
extends Geometry>
extends JudgementBase<T, U>
implements FlatMapFunction2<Iterator<T>, Iterator<SpatialIndex>, Pair<U,
T>>, Serializable {
- /** @see JudgementBase */
+ /**
+ * @see JudgementBase
+ */
public RightIndexLookupJudgement(
SpatialPredicate spatialPredicate,
LongAccumulator buildCount,
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/spatialPartitioning/KDB.java
b/spark/common/src/main/java/org/apache/sedona/core/spatialPartitioning/KDB.java
index 4bd615383a..19a7dc8cd4 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/spatialPartitioning/KDB.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/spatialPartitioning/KDB.java
@@ -306,7 +306,9 @@ public class KDB extends PartitioningUtils implements
Serializable {
}
private interface Splitter {
- /** @return true if the specified envelope belongs to the lower split */
+ /**
+ * @return true if the specified envelope belongs to the lower split
+ */
boolean split(Envelope envelope);
}
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
b/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
index 3d5f6e662f..50d44b9bf4 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
@@ -339,14 +339,18 @@ public class SpatialRDD<T extends Geometry> implements
Serializable {
this.spatialPartitionedRDD = partition(partitioner);
}
- /** @deprecated Use spatialPartitioning(SpatialPartitioner partitioner) */
+ /**
+ * @deprecated Use spatialPartitioning(SpatialPartitioner partitioner)
+ */
public boolean spatialPartitioning(final List<Envelope> otherGrids) throws
Exception {
this.partitioner = new IndexedGridPartitioner(otherGrids);
this.spatialPartitionedRDD = partition(partitioner);
return true;
}
- /** @deprecated Use spatialPartitioning(SpatialPartitioner partitioner) */
+ /**
+ * @deprecated Use spatialPartitioning(SpatialPartitioner partitioner)
+ */
public boolean spatialPartitioning(final StandardQuadTree partitionTree)
throws Exception {
this.partitioner = new QuadTreePartitioner(partitionTree);
this.spatialPartitionedRDD = partition(partitioner);
diff --git
a/spark/common/src/test/java/org/apache/sedona/core/spatialOperator/PolygonKnnTest.java
b/spark/common/src/test/java/org/apache/sedona/core/spatialOperator/PolygonKnnTest.java
index 42eee297a2..8a0a8bed38 100644
---
a/spark/common/src/test/java/org/apache/sedona/core/spatialOperator/PolygonKnnTest.java
+++
b/spark/common/src/test/java/org/apache/sedona/core/spatialOperator/PolygonKnnTest.java
@@ -40,7 +40,9 @@ import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
-/** @author Arizona State University DataSystems Lab */
+/**
+ * @author Arizona State University DataSystems Lab
+ */
// TODO: Auto-generated Javadoc
diff --git
a/spark/common/src/test/java/org/apache/sedona/core/utils/testGeoJSON.java
b/spark/common/src/test/java/org/apache/sedona/core/utils/testGeoJSON.java
index fcce97d40a..bc4be60830 100644
--- a/spark/common/src/test/java/org/apache/sedona/core/utils/testGeoJSON.java
+++ b/spark/common/src/test/java/org/apache/sedona/core/utils/testGeoJSON.java
@@ -33,7 +33,9 @@ import org.locationtech.jts.geom.GeometryFactory;
import org.wololo.geojson.Feature;
import org.wololo.jts2geojson.GeoJSONWriter;
-/** @author Arizona State University DataSystems Lab */
+/**
+ * @author Arizona State University DataSystems Lab
+ */
// TODO: Auto-generated Javadoc
