Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 43 additions & 5 deletions .github/workflows/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,41 @@ jobs:
fail-fast: false
matrix:
include:
- spark: 4.0.1
spark-compat: '4.0'
sedona: 1.8.0
hadoop: 3.4.2
- spark: 3.5.0
spark-compat: '3.5'
sedona: 1.5.1
sedona: 1.8.0
hadoop: 3.3.4
- spark: 3.4.2
spark-compat: '3.4'
sedona: 1.5.1
sedona: 1.8.0
hadoop: 3.3.4
env:
JAVA_TOOL_OPTIONS: >-
-XX:+IgnoreUnrecognizedVMOptions
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
--add-opens=java.base/sun.security.action=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
-Djdk.reflect.useDirectMethodHandle=false
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '11'
java-version: '17'
- 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
Expand All @@ -82,5 +105,20 @@ jobs:
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)
- run: (cd examples/flink-sql;mvn clean install;java -jar target/sedona-flink-example-1.6.0.jar)
HADOOP_VERSION: ${{ matrix.hadoop }}
run: |
cd examples/spark-sql
mvn versions:set -DnewVersion=${SEDONA_VERSION} -DgenerateBackupPoms=false
mvn clean install \
-Dspark.version=${SPARK_VERSION} \
-Dspark.compat.version=${SPARK_COMPAT_VERSION} \
-Dsedona.version=${SEDONA_VERSION} \
-Dhadoop.version=${HADOOP_VERSION}
java -jar target/sedona-spark-example-${SEDONA_VERSION}.jar
- env:
SEDONA_VERSION: ${{ matrix.sedona }}
run: |
cd examples/flink-sql
mvn versions:set -DnewVersion=${SEDONA_VERSION} -DgenerateBackupPoms=false
mvn clean install
java -jar target/sedona-flink-example-${SEDONA_VERSION}.jar
50 changes: 26 additions & 24 deletions examples/flink-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>org.apache.sedona</groupId>
<artifactId>sedona-flink-example</artifactId>
<version>1.6.0</version>
<version>1.8.0</version>
<name>Sedona : Examples : Flink</name>
<packaging>jar</packaging>

Expand All @@ -33,8 +33,27 @@
<flink.version>1.19.0</flink.version>
<flink.scope>compile</flink.scope>
<scala.compat.version>2.12</scala.compat.version>
<geotools.version>28.2</geotools.version>
<geotools.version>33.1</geotools.version>
<log4j.version>2.17.2</log4j.version>

<!-- For JDK-17 and above -->
<extraJavaArgs>
-XX:+IgnoreUnrecognizedVMOptions
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
--add-opens=java.base/sun.security.action=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
-Djdk.reflect.useDirectMethodHandle=false
</extraJavaArgs>
</properties>

<dependencies>
Expand Down Expand Up @@ -139,7 +158,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -209,27 +228,6 @@
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<!-- use transformer to handle merge of META-INF/services - see http://java.net/jira/browse/JERSEY-440?focusedCommentId=14822&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#action_14822 -->
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>reference.conf</resource>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Specification-Title>Java Advanced Imaging Image I/O Tools</Specification-Title>
<Specification-Version>1.1</Specification-Version>
<Specification-Vendor>Sun Microsystems, Inc.</Specification-Vendor>
<Implementation-Title>com.sun.media.imageio</Implementation-Title>
<Implementation-Version>1.1</Implementation-Version>
<Implementation-Vendor>Sun Microsystems, Inc.</Implementation-Vendor>
<Extension-Name>com.sun.media.imageio</Extension-Name>
</manifestEntries>
</transformer>
</transformers>
<filters>
<!-- filter to address "Invalid signature file" issue - see http://stackoverflow.com/a/6743609/589215-->
<filter>
Expand All @@ -241,6 +239,10 @@
</excludes>
</filter>
</filters>
<transformers>
<!-- Merge service files -->
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
</executions>
Expand Down
58 changes: 48 additions & 10 deletions examples/spark-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>org.apache.sedona</groupId>
<artifactId>sedona-spark-example</artifactId>
<version>1.6.0</version>
<version>1.8.0</version>
<name>Sedona : Examples : Spark</name>
<description>Maven Example for SedonaDB</description>
<packaging>jar</packaging>
Expand All @@ -34,13 +34,31 @@
<sedona.scope>compile</sedona.scope>
<geotools.scope>compile</geotools.scope>

<geotools.version>28.2</geotools.version>
<geotools.version>33.1</geotools.version>
<jt-jiffle.version>1.1.24</jt-jiffle.version>
<spark.version>3.4.0</spark.version>
<spark.compat.version>3.4</spark.compat.version>
<scala.compat.version>2.12</scala.compat.version>
<sedona.version>1.5.1</sedona.version>
<hadoop.version>3.3.4</hadoop.version>
<spark.version>4.0.1</spark.version>
<spark.compat.version>4.0</spark.compat.version>
<scala.compat.version>2.13</scala.compat.version>
<hadoop.version>3.4.2</hadoop.version>

<!-- For JDK-17 and above -->
<extraJavaArgs>
-XX:+IgnoreUnrecognizedVMOptions
--add-opens=java.base/java.lang=ALL-UNNAMED
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/java.net=ALL-UNNAMED
--add-opens=java.base/java.nio=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
--add-opens=java.base/sun.security.action=ALL-UNNAMED
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
-Djdk.reflect.useDirectMethodHandle=false
</extraJavaArgs>
</properties>

<dependencies>
Expand All @@ -59,7 +77,7 @@
<dependency>
<groupId>org.apache.sedona</groupId>
<artifactId>sedona-spark-${spark.compat.version}_${scala.compat.version}</artifactId>
<version>${sedona.version}</version>
<version>${project.version}</version>
<scope>${sedona.scope}</scope>
</dependency>
<!--The following GeoTools dependencies use GNU Lesser General Public License and thus are excluded from the binary distribution-->
Expand Down Expand Up @@ -172,7 +190,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -273,7 +291,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.1</version>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -291,6 +309,7 @@
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>Main</mainClass>
<manifestEntries>
<Specification-Title>Java Advanced Imaging Image I/O Tools</Specification-Title>
<Specification-Version>1.1</Specification-Version>
Expand All @@ -317,6 +336,25 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<mainClass>Main</mainClass>
<arguments>
<argument>${extraJavaArgs}</argument>
</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<argLine>${extraJavaArgs}</argLine>
</configuration>
</plugin>
</plugins>
<resources>
<resource>
Expand Down
Loading