Update python-ci.yml

neo4j-contrib · Jul 25, 2023 · 79da429 · 79da429
1 parent 9bc6751
commit 79da429
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 78 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,27 +14,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala-version: [2.11, 2.12, 2.12]
-        spark-version: ["2.4", "3"]
-        neo4j-version: ["3.5", "4.0", "4.1", "4.2", "4.3", "4.4"]
+        scala-version: [2.12, 2.13]
+        spark-version: ["3"]
+        neo4j-version: ["4.4", "5"]
     name: Build with Scala ${{ matrix.scala-version }}, Spark ${{ matrix.spark-version }} and Neo4j ${{ matrix.neo4j-version }}
     steps:
       - uses: actions/checkout@v2
-        if: ${{ !(matrix.spark-version == 3 && matrix.scala-version == 2.11) && !(matrix.spark-version == 2.4 && matrix.scala-version == 2.13) }}
       - name: Set up JDK 8
-        if: ${{ !(matrix.spark-version == 3 && matrix.scala-version == 2.11) && !(matrix.spark-version == 2.4 && matrix.scala-version == 2.13) }}
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
       - name: Cache Maven packages
-        if: ${{ !(matrix.spark-version == 3 && matrix.scala-version == 2.11) && !(matrix.spark-version == 2.4 && matrix.scala-version == 2.13) }}
         uses: actions/cache@v1
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Build with Maven
-        if: ${{ !(matrix.spark-version == 3 && matrix.scala-version == 2.11) && !(matrix.spark-version == 2.4 && matrix.scala-version == 2.13) }}
         env:
           CI: true
           MY_ENV: "MY_ENV_value"

diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ "3.6", "3.7", "3.8" ]
-        neo4j-version: [ "3.5", "4.0", "4.1", "4.2", "4.3", "4.4" ]
-        spark-version: [ {short: "3", ext: "3.0.1", scala: "2.12"}, {short: "3", ext: "3.1.1", scala: "2.12"}, {short: "3", ext: "3.2.0", scala: "2.12"} ]
+        python-version: [ "3.7", "3.8" ]
+        neo4j-version: [ "4.4", "5" ]
+        spark-version: [ {short: "3", ext: "3.3.2", scala: "2.12"} ]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -47,9 +47,8 @@ jobs:
         env:
           CI: true
         run: |
-          mvn clean package -Pspark-${{ matrix.spark-version.short }} -Pscala-${{ matrix.spark-version.scala }} -DskipTests --no-transfer-progress
+          mvn clean package -Pscala-${{ matrix.spark-version.scala }} -DskipTests --no-transfer-progress
       - name: Run tests for Spark ${{ matrix.spark-version.ext }} and Neo4j ${{ matrix.neo4j-version }}
-        if: ${{ !(matrix.spark-version.short == 2.4 && matrix.python-version == 3.8) && !(matrix.spark-version.ext == '3.2.0' && matrix.python-version == 3.5) }}
         run: |
           cd ./python
           export PYTHONPATH=$(pwd)

diff --git a/README.md b/README.md
@@ -592,24 +592,17 @@ connector.run()
 
 We support:
 
-* Spark 2.4 with Scala 2.11 and 2.12
 * Spark 3.x with Scala 2.12 and 2.13
 
 # Maven resolution
 
-It depends on the Spark and Scala version:
-* For Spark 2.4 with Scala 2.11 and 2.12 the package resolution is `org.neo4j:neo4j-dwh-connector_<scala_version>:<dwh-connector-version>_for_spark_2.4`
-* For Spark 3.x with Scala 2.12 and 2.13 the package resolution is `org.neo4j:neo4j-dwh-connector_<scala_version>:<dwh-connector-version>_for_spark_3`
+For Spark 3.x with Scala 2.12 and 2.13 the package resolution is `org.neo4j:neo4j-dwh-connector_<scala_version>:<dwh-connector-version>_for_spark_3`
 
 
 # Build it locally
 
 In order to build it locally you can use the following commands
 
-For scala 2.11 and Spark 2.4 `./maven-release.sh package 2.11 2.4`
-
-For scala 2.12 and Spark 2.4 `./maven-release.sh package 2.12 2.4`
-
 For scala 2.12 and Spark 3 `./maven-release.sh package 2.12 3`
 
 For scala 2.13 and Spark 3 `./maven-release.sh package 2.13 3`

diff --git a/pom.xml b/pom.xml
@@ -51,8 +51,11 @@
     <xbean.version>4.10</xbean.version>
     <common-cli.version>1.5.0</common-cli.version>
 
+    <spark.version>3.3.2</spark.version>
+    <neo4j.spark.version>5.0.3_for_spark_3</neo4j.spark.version>
+
     <powermock.version>2.0.9</powermock.version>
-    <testcontainers.version>1.15.3</testcontainers.version>
+    <testcontainers.version>1.18.3</testcontainers.version>
     <bigquery.spark.version>0.23.2</bigquery.spark.version>
     <snowflake.spark.version>2.10.0-spark_3.2</snowflake.spark.version>
     <snowflake.jdbc.version>3.13.15</snowflake.jdbc.version>
@@ -238,7 +241,6 @@
       <properties>
         <scala.version>2.12.13</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
-
       </properties>
     </profile>
     <profile>
@@ -259,76 +261,24 @@
         </neo4j-connector-apache-spark-artifactId>
       </properties>
     </profile>
-    <profile>
-      <id>scala-2.11</id>
-      <properties>
-        <scala.version>2.11.12</scala.version>
-        <scala.binary.version>2.11</scala.binary.version>
-      </properties>
-    </profile>
     <!-- end scala profiles -->
     <!-- spark profiles -->
-    <profile>
-      <id>spark-3</id>
-      <properties>
-        <spark.version>3.2.1</spark.version>
-        <neo4j.spark.version>4.1.2_for_spark_3</neo4j.spark.version>
-      </properties>
-    </profile>
-    <profile>
-      <id>spark-2.4</id>
-      <properties>
-        <spark.version>2.4.8</spark.version>
-        <neo4j.spark.version>4.1.2_for_spark_2.4</neo4j.spark.version>
-        <spark-mssql-connector_version>1.0.2</spark-mssql-connector_version>
-        <snowflake.spark.version>2.9.3-spark_2.4</snowflake.spark.version>
-        <spark-mssql-connector-artifactId>spark-mssql-connector</spark-mssql-connector-artifactId>
-      </properties>
-    </profile>
     <!-- end spark profiles -->
     <!-- neo4j profiles -->
     <profile>
-      <id>neo4j-4.0</id>
+      <id>neo4j-4.4</id>
       <properties>
-        <neo4j.version>4.0.11</neo4j.version>
+        <neo4j.version>4.4.23</neo4j.version>
         <neo4j.experimental>false</neo4j.experimental>
       </properties>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
     </profile>
     <profile>
-      <id>neo4j-3.5</id>
-      <properties>
-        <neo4j.version>3.5.22</neo4j.version>
-        <neo4j.experimental>false</neo4j.experimental>
-      </properties>
-    </profile>
-    <profile>
-      <id>neo4j-4.1</id>
-      <properties>
-        <neo4j.version>4.1.6</neo4j.version>
-        <neo4j.experimental>false</neo4j.experimental>
-      </properties>
-    </profile>
-    <profile>
-      <id>neo4j-4.2</id>
-      <properties>
-        <neo4j.version>4.2.3</neo4j.version>
-        <neo4j.experimental>false</neo4j.experimental>
-      </properties>
-    </profile>
-    <profile>
-      <id>neo4j-4.3</id>
-      <properties>
-        <neo4j.version>4.3.0</neo4j.version>
-        <neo4j.experimental>false</neo4j.experimental>
-      </properties>
-    </profile>
-    <profile>
-      <id>neo4j-4.4</id>
+      <id>neo4j-5</id>
       <properties>
-        <neo4j.version>4.4.4</neo4j.version>
+        <neo4j.version>5.10.0</neo4j.version>
         <neo4j.experimental>false</neo4j.experimental>
       </properties>
     </profile>