Skip to content

Commit 6c477a5

Browse files
authored
Updated the scala version (#71)
DOCSP-15683
1 parent edab584 commit 6c477a5

File tree

7 files changed

+15
-11
lines changed

7 files changed

+15
-11
lines changed

conf.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
source_constants = {
6565
'current-version': '3.0.1',
6666
'spark-core-version': '3.0.1',
67-
'spark-sql-version': '3.0.1'
67+
'spark-sql-version': '3.0.1',
68+
'scala-version': '2.12',
69+
'scala-version-full': '2.12.13'
6870
}
6971

7072
intersphinx_mapping = {}

snooty.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ toc_landing_pages = ["/java-api", "/python-api", "/scala-api", "/r-api"]
99
current-version = "3.0.1"
1010
spark-core-version = "3.0.1"
1111
spark-sql-version = "3.0.1"
12+
scala-version = "2.12"
13+
scala-version-full = "2.12.13"
1214

1315
[substitutions]
1416
copy = "unicode:: U+000A9"

source/includes/extracts-command-line.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ content: |
33
- the ``--packages`` option to download the MongoDB Spark Connector
44
package. The following package is available:
55
6-
- ``mongo-spark-connector_2.11`` for use with Scala 2.11.x
6+
- ``mongo-spark-connector_{+scala-version+}`` for use with Scala 2.12.x
77
88
- the ``--conf`` option to configure the MongoDB Spark Connnector.
99
These settings configure the ``SparkConf`` object.
@@ -39,7 +39,7 @@ content: |
3939
4040
./bin/spark-shell --conf "spark.mongodb.input.uri=mongodb://127.0.0.1/test.myCollection?readPreference=primaryPreferred" \
4141
--conf "spark.mongodb.output.uri=mongodb://127.0.0.1/test.myCollection" \
42-
--packages org.mongodb.spark:mongo-spark-connector_2.11:{+current-version+}
42+
--packages org.mongodb.spark:mongo-spark-connector_{+scala-version+}:{+current-version+}
4343
4444
.. include:: /includes/extracts/list-configuration-explanation.rst
4545
@@ -56,7 +56,7 @@ content: |
5656
5757
./bin/pyspark --conf "spark.mongodb.input.uri=mongodb://127.0.0.1/test.myCollection?readPreference=primaryPreferred" \
5858
--conf "spark.mongodb.output.uri=mongodb://127.0.0.1/test.myCollection" \
59-
--packages org.mongodb.spark:mongo-spark-connector_2.11:{+current-version+}
59+
--packages org.mongodb.spark:mongo-spark-connector_{+scala-version+}:{+current-version+}
6060
6161
.. include:: /includes/extracts/list-configuration-explanation.rst
6262
@@ -73,7 +73,7 @@ content: |
7373
7474
./bin/sparkR --conf "spark.mongodb.input.uri=mongodb://127.0.0.1/test.myCollection?readPreference=primaryPreferred" \
7575
--conf "spark.mongodb.output.uri=mongodb://127.0.0.1/test.myCollection" \
76-
--packages org.mongodb.spark:mongo-spark-connector_2.11:{+current-version+}
76+
--packages org.mongodb.spark:mongo-spark-connector_{+scala-version+}:{+current-version+}
7777
7878
.. include:: /includes/extracts/list-configuration-explanation.rst
7979
...

source/includes/list-prerequisites.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
- Spark 2.4.x.
88

9-
- Scala 2.11.x or 2.12.x
9+
- Scala 2.12.x

source/index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ versions of Apache Spark and MongoDB:
110110
r-api
111111
faq
112112
release-notes
113-
API Docs <https://www.javadoc.io/doc/org.mongodb.spark/mongo-spark-connector_2.11/{+current-version+}>
113+
API Docs <https://www.javadoc.io/doc/org.mongodb.spark/mongo-spark-connector_{+scala-version+}/{+current-version+}>

source/java-api.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ The following excerpt is from a Maven ``pom.xml`` file:
3232
<dependencies>
3333
<dependency>
3434
<groupId>org.mongodb.spark</groupId>
35-
<artifactId>mongo-spark-connector_2.11</artifactId>
35+
<artifactId>mongo-spark-connector_{+scala-version+}</artifactId>
3636
<version>{+current-version+}</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.apache.spark</groupId>
40-
<artifactId>spark-core_2.11</artifactId>
40+
<artifactId>spark-core_{+scala-version+}</artifactId>
4141
<version>{+spark-core-version+}</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.apache.spark</groupId>
45-
<artifactId>spark-sql_2.11</artifactId>
45+
<artifactId>spark-sql_{+scala-version+}</artifactId>
4646
<version>{+spark-sql-version+}</version>
4747
</dependency>
4848
</dependencies>

source/scala-api.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ a `SBT <http://www.scala-sbt.org/documentation.html>`_ ``build.scala`` file:
6262

6363
.. code-block:: scala
6464

65-
scalaVersion := "2.11.7",
65+
scalaVersion := "{+scala-version-full+}",
6666
libraryDependencies ++= Seq(
6767
"org.mongodb.spark" %% "mongo-spark-connector" % "{+current-version+}",
6868
"org.apache.spark" %% "spark-core" % "{+spark-core-version+}",

0 commit comments

Comments
 (0)