You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by em...@apache.org on 2018/10/07 14:56:08 UTC
[predictionio] branch develop updated (af4d6e6 -> 17eb046)
This is an automated email from the ASF dual-hosted git repository.
emergentorder pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/predictionio.git.
from af4d6e6 Add missing license header
add 23e66b7 Update dependencies (sbt, scala, spark, elasticsearch)
add 4f8ad32 bump spark patch version
add 5d805c4 Update ES to 5.6.9 everywhere
add 37616a0 Fix LICENSE.txt
add f72ef17 Fix .travis.yml
add 9645220 Merge branch 'develop' into updateDeps
add f049783 Merge branch 'develop' into updateDeps
add 9d60870 Fix LICENSE.txt
add 24937d3 [PIO-168] ES 6.X support + patch version dependency updates; Make dependency on commons-lang3 explicit to fix build.
new 22e3d6d Revert build.sbt change
new 17eb046 Merge branch 'updateDeps' of https://github.com/goldstar/predictionio into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 44 +++++++++++-----------
LICENSE.txt | 10 ++---
bin/install.sh | 2 +-
build.sbt | 8 ++--
conf/pio-env.sh.template | 2 +-
conf/pio-vendors.sh | 4 +-
docs/manual/data/versions.yml | 2 +-
.../source/install/install-sourcecode.html.md.erb | 4 +-
project/build.properties | 2 +-
storage/elasticsearch/build.sbt | 4 +-
.../data/storage/elasticsearch/ESAccessKeys.scala | 37 +++++++++---------
.../data/storage/elasticsearch/ESApps.scala | 38 ++++++++++---------
.../data/storage/elasticsearch/ESChannels.scala | 35 ++++++++---------
.../storage/elasticsearch/ESEngineInstances.scala | 4 +-
.../elasticsearch/ESEvaluationInstances.scala | 39 +++++++++----------
.../data/storage/elasticsearch/ESSequences.scala | 15 ++++----
16 files changed, 128 insertions(+), 122 deletions(-)
[predictionio] 01/02: Revert build.sbt change
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emergentorder pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/predictionio.git
commit 22e3d6d1e91fe8bdce382104ebb34d358a0110a8
Author: Alex Merritt <le...@gmail.com>
AuthorDate: Sat Oct 6 19:59:20 2018 -0500
Revert build.sbt change
---
common/build.sbt | 1 -
1 file changed, 1 deletion(-)
diff --git a/common/build.sbt b/common/build.sbt
index 89b578d..19e4f04 100644
--- a/common/build.sbt
+++ b/common/build.sbt
@@ -22,7 +22,6 @@ name := "apache-predictionio-common"
libraryDependencies ++= Seq(
"io.spray" %% "spray-can" % "1.3.3",
"io.spray" %% "spray-routing" % "1.3.3",
- "org.apache.commons" % "commons-lang3" % "3.5",
"com.typesafe.akka" %% "akka-actor" % akkaVersion.value,
"com.typesafe.akka" %% "akka-slf4j" % akkaVersion.value)
[predictionio] 02/02: Merge branch 'updateDeps' of
https://github.com/goldstar/predictionio into develop
Posted by em...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
emergentorder pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/predictionio.git
commit 17eb04645e62fcaebbcbcf4a51a4dff2122089bb
Merge: af4d6e6 22e3d6d
Author: Alex Merritt <le...@gmail.com>
AuthorDate: Sun Oct 7 09:55:32 2018 -0500
Merge branch 'updateDeps' of https://github.com/goldstar/predictionio into develop
.travis.yml | 44 +++++++++++-----------
LICENSE.txt | 10 ++---
bin/install.sh | 2 +-
build.sbt | 8 ++--
conf/pio-env.sh.template | 2 +-
conf/pio-vendors.sh | 4 +-
docs/manual/data/versions.yml | 2 +-
.../source/install/install-sourcecode.html.md.erb | 4 +-
project/build.properties | 2 +-
storage/elasticsearch/build.sbt | 4 +-
.../data/storage/elasticsearch/ESAccessKeys.scala | 37 +++++++++---------
.../data/storage/elasticsearch/ESApps.scala | 38 ++++++++++---------
.../data/storage/elasticsearch/ESChannels.scala | 35 ++++++++---------
.../storage/elasticsearch/ESEngineInstances.scala | 4 +-
.../elasticsearch/ESEvaluationInstances.scala | 39 +++++++++----------
.../data/storage/elasticsearch/ESSequences.scala | 15 ++++----
16 files changed, 128 insertions(+), 122 deletions(-)