Update version to 5.3.7 (#74)

Author: ali-ince

antora.yml

@@ -9,8 +9,10 @@ asciidoc:
   attributes:
     theme: docs
     connector-version: '5.3'
-    exact-connector-version: '5.3.6'
+    exact-connector-version: '5.3.7'
     scala-version: '2.12'
+    exact-scala-version: '2.12.20'
+    spark-version: '3.5.5'
     copyright: Neo4j Inc.
     url-neo4j-product-gds-lib: https://neo4j.com/product/graph-data-science-library/
     url-gh-spark-notebooks: https://github.com/utnaf/neo4j-connector-apache-spark-notebooks

modules/ROOT/examples/java/pom.xml

@@ -8,14 +8,14 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.spark</groupId>
-      <artifactId>spark-sql_2.12</artifactId>
-      <version>3.5.1</version>
+      <artifactId>spark-sql_{scala-version}</artifactId>
+      <version>{spark-version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
-      <artifactId>neo4j-connector-apache-spark_2.12</artifactId>
-      <version>5.3.1_for_spark_3</version>
+      <artifactId>neo4j-connector-apache-spark_{scala-version}</artifactId>
+      <version>{exact-connector-version}_for_spark_3</version>
     </dependency>
   </dependencies>
 </project>

modules/ROOT/examples/scala/build.sbt

@@ -1,6 +1,6 @@
 name := "Spark App"
 version := "1.0"
-scalaVersion := "2.12.18"
+scalaVersion := "{exact-scala-version}"
 
-libraryDependencies += "org.apache.spark" %% "spark-sql" % "3.5.1"
-libraryDependencies += "org.neo4j" %% "neo4j-connector-apache-spark" % "5.3.1_for_spark_3"
+libraryDependencies += "org.apache.spark" %% "spark-sql" % "{spark-version}"
+libraryDependencies += "org.neo4j" %% "neo4j-connector-apache-spark" % "{exact-connector-version}_for_spark_3"

modules/ROOT/pages/installation.adoc

@@ -83,15 +83,15 @@ Alternatively, you can download the connector JAR file from the link:https://neo
 =====
 [source, shell, subs="attributes+"]
 ----
-$SPARK_HOME/bin/spark-shell --jars neo4j-connector-apache-spark_{scala-version}-{exact-connector-version}_for_spark_3.jar
+$SPARK_HOME/bin/spark-shell --jars neo4j-spark-connector-{exact-connector-version}-s_{scala-version}.jar
 ----
 =====
 
 [.include-with-Python]
 =====
 [source, shell, subs="attributes+"]
 ----
-$SPARK_HOME/bin/pyspark --jars neo4j-connector-apache-spark_{scala-version}-{exact-connector-version}_for_spark_3.jar
+$SPARK_HOME/bin/pyspark --jars neo4j-spark-connector-{exact-connector-version}-s_{scala-version}.jar
 ----
 =====
 ====
@@ -115,7 +115,7 @@ See the xref:quickstart.adoc#applications[Quickstart] for code examples.
 [.include-with-Scala]
 =====
 .A minimal `build.sbt`
-[source, sbt]
+[source, sbt, subs="attributes+"]
 ----
 include::example$scala/build.sbt[]
 ----
@@ -131,7 +131,7 @@ scala spDependencies += "org.neo4j/neo4j-connector-apache-spark_{scala-version}:
 [.include-with-Java]
 =====
 .A minimal `pom.xml`
-[source, xml]
+[source, xml, subs="attributes+"]
 ----
 include::example$java/pom.xml[]
 ----

scripts/run-examples/run-app/run_java.sh

@@ -1,11 +1,15 @@
 EXAMPLES_ROOT=../../../../modules/ROOT/examples
 CONNECTOR_VERSION=$(grep -o "exact-connector-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+\.\d\+")
-SCALA_VERSION=$(grep -o "scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+")
+SCALA_VERSION=$(grep -o " scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+")
+SPARK_VERSION=$(grep -o "spark-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+\.\d\+")
 
 mkdir -p java-example
 cd java-example
 
 cp $EXAMPLES_ROOT/java/pom.xml .
+sed -i '' -e "s/{scala-version}/$SCALA_VERSION/g" pom.xml
+sed -i '' -e "s/{spark-version}/$SPARK_VERSION/g" pom.xml
+sed -i '' -e "s/{exact-connector-version}/$CONNECTOR_VERSION/g" pom.xml
 cp $EXAMPLES_ROOT/example.jsonl .
 
 mkdir -p src/main/java

scripts/run-examples/run-app/run_python.sh

@@ -1,6 +1,6 @@
 EXAMPLES_ROOT=../../../../modules/ROOT/examples
 CONNECTOR_VERSION=$(grep -o "exact-connector-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+\.\d\+")
-SCALA_VERSION=$(grep -o "scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+")
+SCALA_VERSION=$(grep -o " scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+")
 
 mkdir -p python-example
 cd python-example

scripts/run-examples/run-app/run_scala.sh

@@ -1,11 +1,16 @@
 EXAMPLES_ROOT=../../../../modules/ROOT/examples
 CONNECTOR_VERSION=$(grep -o "exact-connector-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+\.\d\+")
-SCALA_VERSION=$(grep -o "scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+")
+EXACT_SCALA_VERSION=$(grep -o "exact-scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+\.\d\+")
+SCALA_VERSION=$(grep -o " scala-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+")
+SPARK_VERSION=$(grep -o "spark-version: .\+" ../../../antora.yml | grep -o "\d\+\.\d\+\.\d\+")
 
 mkdir -p scala-example
 cd scala-example
 
 cp $EXAMPLES_ROOT/scala/build.sbt .
+sed -i '' -e "s/{exact-scala-version}/$EXACT_SCALA_VERSION/g" build.sbt
+sed -i '' -e "s/{spark-version}/$SPARK_VERSION/g" build.sbt
+sed -i '' -e "s/{exact-connector-version}/$CONNECTOR_VERSION/g" build.sbt
 cp $EXAMPLES_ROOT/example.jsonl .
 
 mkdir -p src/main/scala
@@ -16,4 +21,4 @@ sbt package
 $SPARK_HOME/bin/spark-submit \
   --packages org.neo4j:neo4j-connector-apache-spark_${SCALA_VERSION}:${CONNECTOR_VERSION}_for_spark_3 \
   --class SparkApp \
-  target/scala-2.12/spark-app_2.12-1.0.jar
+  target/scala-${SCALA_VERSION}/spark-app_${SCALA_VERSION}-1.0.jar