Extract Scala version

neo4j · Apr 25, 2024 · 9b5a4ee · 9b5a4ee
1 parent e5610b2
commit 9b5a4ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/antora.yml b/antora.yml
@@ -10,6 +10,7 @@ asciidoc:
     theme: docs
     connector-version: '5.3'
     exact-connector-version: '5.3.0'
+    scala-version: '2.12'
     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

diff --git a/modules/ROOT/pages/installation.adoc b/modules/ROOT/pages/installation.adoc
@@ -36,15 +36,15 @@ The connector is available via link:https://spark-packages.org/?q=neo4j-connecto
 =====
 [source, shell, subs="attributes+"]
 ----
-$SPARK_HOME/bin/spark-shell --packages org.neo4j:neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3
+$SPARK_HOME/bin/spark-shell --packages org.neo4j:neo4j-connector-apache-spark_{scala-version}:{exact-connector-version}_for_spark_3
 ----
 =====
 
 [.include-with-Python]
 =====
 [source, shell, subs="attributes+"]
 ----
-$SPARK_HOME/bin/pyspark --packages org.neo4j:neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3
+$SPARK_HOME/bin/pyspark --packages org.neo4j:neo4j-connector-apache-spark_{scala-version}:{exact-connector-version}_for_spark_3
 ----
 =====
 ====
@@ -57,15 +57,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_2.12-{exact-connector-version}_for_spark_3.jar
+$SPARK_HOME/bin/spark-shell --jars neo4j-connector-apache-spark_{scala-version}-{exact-connector-version}_for_spark_3.jar
 ----
 =====
 
 [.include-with-Python]
 =====
 [source, shell, subs="attributes+"]
 ----
-$SPARK_HOME/bin/pyspark --jars neo4j-connector-apache-spark_2.12-{exact-connector-version}_for_spark_3.jar
+$SPARK_HOME/bin/pyspark --jars neo4j-connector-apache-spark_{scala-version}-{exact-connector-version}_for_spark_3.jar
 ----
 =====
 ====
@@ -98,7 +98,7 @@ If you use the link:https://github.com/databricks/sbt-spark-package[sbt-spark-pa
 
 [source, shell, subs="attributes+"]
 ----
-scala spDependencies += "org.neo4j/neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3"
+scala spDependencies += "org.neo4j/neo4j-connector-apache-spark_{scala-version}:{exact-connector-version}_for_spark_3"
 ----
 =====
 
@@ -119,6 +119,6 @@ include::example$java/pom.xml[]
 ----
 dependencies {
     // list of dependencies
-    compile "org.neo4j:neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3"
+    compile "org.neo4j:neo4j-connector-apache-spark_{scala-version}:{exact-connector-version}_for_spark_3"
 }
 ----
diff --git a/modules/ROOT/pages/quickstart.adoc b/modules/ROOT/pages/quickstart.adoc
@@ -95,9 +95,9 @@ include::example$scala/SparkApp.scala[]
 [source, shell, subs="attributes+"]
 ----
 $SPARK_HOME/bin/spark-submit \
-  --packages org.neo4j:neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3 \
+  --packages org.neo4j:neo4j-connector-apache-spark_{scala-version}:{exact-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
 ----
 
 =====
@@ -124,7 +124,7 @@ include::example$python/spark_app.py[]
 [source, shell, subs="attributes+"]
 ----
 $SPARK_HOME/bin/spark-submit \
-  --packages org.neo4j:neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3 \
+  --packages org.neo4j:neo4j-connector-apache-spark_{scala-version}:{exact-connector-version}_for_spark_3 \
   spark_app.py
 ----
 
@@ -153,7 +153,7 @@ include::example$java/SparkApp.java[]
 [source, shell, subs="attributes+"]
 ----
 $SPARK_HOME/bin/spark-submit \
-  --packages org.neo4j:neo4j-connector-apache-spark_2.12:{exact-connector-version}_for_spark_3 \
+  --packages org.neo4j:neo4j-connector-apache-spark_{scala-version}:{exact-connector-version}_for_spark_3 \
   --class SparkApp \
   target/spark-app-1.0.jar
 ----