You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by do...@apache.org on 2018/08/27 23:09:59 UTC
predictionio git commit: [PIO-158] Deprecate Scala 2.10 and Spark 1.x
Repository: predictionio
Updated Branches:
refs/heads/develop 7ad9be474 -> ff6a076a5
[PIO-158] Deprecate Scala 2.10 and Spark 1.x
Closes #459
Project: http://git-wip-us.apache.org/repos/asf/predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/predictionio/commit/ff6a076a
Tree: http://git-wip-us.apache.org/repos/asf/predictionio/tree/ff6a076a
Diff: http://git-wip-us.apache.org/repos/asf/predictionio/diff/ff6a076a
Branch: refs/heads/develop
Commit: ff6a076a5079232e383be3ccb7b7d96366190a53
Parents: 7ad9be4
Author: shimamoto <sh...@apache.org>
Authored: Mon Aug 27 16:08:44 2018 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Mon Aug 27 16:09:29 2018 -0700
----------------------------------------------------------------------
bin/pio-class | 2 +-
build.sbt | 8 ++++++--
docs/manual/source/install/index.html.md.erb | 3 +++
docs/manual/source/install/install-sourcecode.html.md.erb | 6 +++---
docs/manual/source/system/index.html.md | 7 -------
docs/scaladoc/README.md | 2 +-
.../org/apache/predictionio/tools/commands/Management.scala | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/bin/pio-class
----------------------------------------------------------------------
diff --git a/bin/pio-class b/bin/pio-class
index 94cc520..9e01a40 100755
--- a/bin/pio-class
+++ b/bin/pio-class
@@ -44,7 +44,7 @@ fi
# Make sure the Apache Spark version meets the prerequisite if it is a binary
# distribution
-MIN_SPARK_VERSION="1.3.0"
+MIN_SPARK_VERSION="1.6.3"
if [ -z "$SPARK_HOME" ]; then
echo -e "\033[0;31mSPARK_HOME must be set in conf/pio-env.sh, or in the environment!\033[0m"
exit 1
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index ec54104..0243610 100644
--- a/build.sbt
+++ b/build.sbt
@@ -50,7 +50,7 @@ lazy val scalaSparkDepsVersion = Map(
name := "apache-predictionio-parent"
-version in ThisBuild := "0.12.1"
+version in ThisBuild := "0.13.0-SNAPSHOT"
organization in ThisBuild := "org.apache.predictionio"
@@ -65,7 +65,7 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-unchecked", "-feature")
scalacOptions in (ThisBuild, Test) ++= Seq("-Yrangepos")
fork in (ThisBuild, run) := true
-javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.7", "-target", "1.7",
+javacOptions in (ThisBuild, compile) ++= Seq("-source", "1.8", "-target", "1.8",
"-Xlint:deprecation", "-Xlint:unchecked")
// Ignore differentiation of Spark patch levels
@@ -323,6 +323,10 @@ parallelExecution in Global := false
testOptions in Test += Tests.Argument("-oDF")
printBuildInfo := {
+ if (scalaBinaryVersion.value == "2.10")
+ streams.value.log.warn("Support for Scala 2.10 is deprecated. Please upgrade to a newer version of Scala.")
+ if (sparkBinaryVersion.value == "1.6")
+ streams.value.log.warn("Support for Spark 1.6 is deprecated. Please upgrade to a newer version of Spark.")
println(s"PIO_SCALA_VERSION=${scalaVersion.value}")
println(s"PIO_SPARK_VERSION=${sparkVersion.value}")
println(s"PIO_ELASTICSEARCH_VERSION=${elasticsearchVersion.value}")
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/manual/source/install/index.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/manual/source/install/index.html.md.erb b/docs/manual/source/install/index.html.md.erb
index 167d3bf..3b34871 100644
--- a/docs/manual/source/install/index.html.md.erb
+++ b/docs/manual/source/install/index.html.md.erb
@@ -41,6 +41,9 @@ or
* Apache HBase 0.98.5
* Elasticsearch 1.7.6
+WARNING: **Note that support for Scala 2.10 and Spark 1.6.x are deprecated as of PredictionIO 0.13.0,
+and may be removed in a future release.**
+
If you are running on a single machine, we recommend a minimum of 2GB memory.
INFO: If you are using Linux, Apache Spark local mode, which is the default
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/manual/source/install/install-sourcecode.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/manual/source/install/install-sourcecode.html.md.erb b/docs/manual/source/install/install-sourcecode.html.md.erb
index a16acde..8abc448 100644
--- a/docs/manual/source/install/install-sourcecode.html.md.erb
+++ b/docs/manual/source/install/install-sourcecode.html.md.erb
@@ -108,9 +108,9 @@ Starting from version 0.11.0, PredictionIO can be built against different
versions of dependencies. As of writing, one could build PredictionIO against
these different dependencies:
-* Scala 2.10.x, 2.11.x
-* Spark 1.6.x, 2.0.x, 2.1.x
-* Hadoop 2.4.x to 2.7.x
+* Scala 2.10.x(deprecated), 2.11.x
+* Spark 1.6.x(deprecated), 2.0.x, 2.1.x
+* Hadoop 2.6.x, 2.7.x
* Elasticsearch 1.7.x, 5.x
As an example, if you want to build PredictionIO to support Scala 2.11.8,
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/manual/source/system/index.html.md
----------------------------------------------------------------------
diff --git a/docs/manual/source/system/index.html.md b/docs/manual/source/system/index.html.md
index 1030fec..dcff342 100644
--- a/docs/manual/source/system/index.html.md
+++ b/docs/manual/source/system/index.html.md
@@ -19,13 +19,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-During the [installation](/install), you have installed the latest stable versions of the following software:
-
-* Apache Hadoop up to 2.7.2 (required only if YARN and HDFS are needed)
-* Apache HBase up to 1.2.4
-* Apache Spark up to 1.6.3 for Hadoop 2.6 (not Spark 2.x version)
-* Elasticsearch up to 1.7.5 (not the Elasticsearch 2.x version)
-
This section explains general rules-of-thumb for how they are used in PredictionIO. The actual implementation of the Template will define how much of this applies. PredictionIO is flexible about much of this configuration but its Templates generally fit the Lambda model for integrating real-time serving with background periodic model updates.
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/docs/scaladoc/README.md
----------------------------------------------------------------------
diff --git a/docs/scaladoc/README.md b/docs/scaladoc/README.md
index 2f64966..2faa7e3 100644
--- a/docs/scaladoc/README.md
+++ b/docs/scaladoc/README.md
@@ -23,4 +23,4 @@ Scala API Documentation
$ sbt/sbt pioUnidoc
```
-2. Point your web browser at `target/scala-2.10/unidoc/index.html`.
+2. Point your web browser at `target/scala-2.11/unidoc/index.html`.
http://git-wip-us.apache.org/repos/asf/predictionio/blob/ff6a076a/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
----------------------------------------------------------------------
diff --git a/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala b/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
index ee8cd50..cd71fdd 100644
--- a/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
+++ b/tools/src/main/scala/org/apache/predictionio/tools/commands/Management.scala
@@ -109,7 +109,7 @@ object Management extends EitherLogging {
val sparkHomePath = Common.getSparkHome(sparkHome)
if (new File(s"$sparkHomePath/bin/spark-submit").exists) {
info(s"Apache Spark is installed at $sparkHomePath")
- val sparkMinVersion = "1.3.0"
+ val sparkMinVersion = "1.6.3"
pioStatus = pioStatus.copy(
sparkHome = sparkHomePath,
sparkMinVersion = sparkMinVersion)