Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Bump patch versions for akka and hadoop #490

Merged
merged 5 commits into from
Oct 27, 2018
Merged

Bump patch versions for akka and hadoop #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
823c441
Bump patch versions for akka and hadoop
EmergentOrder Oct 27, 2018
c0d5682
Use gitbox for developerConnection
EmergentOrder Oct 27, 2018
74b304d
Fix LICENSE
EmergentOrder Oct 27, 2018
37a2df6
Bump akka minor version; fix developerConnection
EmergentOrder Oct 27, 2018
0faf78a
Fix LICENSE
EmergentOrder Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,22 @@ env:
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
PIO_SPARK_VERSION=2.0.2
PIO_HADOOP_VERSION=2.7.3
PIO_HADOOP_VERSION=2.7.7
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
PIO_SPARK_VERSION=2.1.3
PIO_HADOOP_VERSION=2.7.3
PIO_HADOOP_VERSION=2.7.7
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=PGSQL
PIO_SCALA_VERSION=2.11.12
PIO_SPARK_VERSION=2.2.2
PIO_HADOOP_VERSION=2.7.3
PIO_HADOOP_VERSION=2.7.7
- BUILD_TYPE=Integration
METADATA_REP=PGSQL EVENTDATA_REP=PGSQL MODELDATA_REP=HDFS
PIO_SCALA_VERSION=2.11.12
PIO_SPARK_VERSION=2.3.2
PIO_HADOOP_VERSION=2.7.3
PIO_HADOOP_VERSION=2.7.7

- BUILD_TYPE=LicenseCheck

Expand Down
4 changes: 1 addition & 3 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,8 +1356,6 @@ Binary distribution bundles
Binary distribution bundles

org.slf4j # slf4j-api # 1.7.25 (https://www.slf4j.org/)
org.slf4j # slf4j-api # 1.7.18 (https://www.slf4j.org/)
org.slf4j # slf4j-api # 1.7.16 (https://www.slf4j.org/)
org.slf4j # slf4j-api # 1.7.10 (https://www.slf4j.org/)
org.slf4j # slf4j-api # 1.7.2 (https://www.slf4j.org/)
org.slf4j # slf4j-log4j12 # 1.7.18 (https://www.slf4j.org/)
Expand Down Expand Up @@ -1669,7 +1667,7 @@ DAMAGE.
--------------------------------------------------------------------------------
Binary distribution bundles

com.jcraft # jsch # 0.1.42 (http://www.jcraft.com/jsch/)
com.jcraft # jsch # 0.1.54 (http://www.jcraft.com/jsch/)

which is available under the BSD license (http://www.jcraft.com/jsch/LICENSE.txt)

Expand Down
16 changes: 8 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ import PIOBuild._
lazy val scalaSparkDepsVersion = Map(
"2.11" -> Map(
"2.0" -> Map(
"akka" -> "2.4.17",
"hadoop" -> "2.7.3",
"akka" -> "2.5.16",
"hadoop" -> "2.7.7",
"json4s" -> "3.2.11"),
"2.1" -> Map(
"akka" -> "2.4.17",
"hadoop" -> "2.7.3",
"akka" -> "2.5.17",
"hadoop" -> "2.7.7",
"json4s" -> "3.2.11"),
"2.2" -> Map(
"akka" -> "2.4.17",
"hadoop" -> "2.7.3",
"akka" -> "2.5.17",
"hadoop" -> "2.7.7",
"json4s" -> "3.2.11"),
"2.3" -> Map(
"akka" -> "2.4.17",
"hadoop" -> "2.7.3",
"akka" -> "2.5.17",
"hadoop" -> "2.7.7",
"json4s" -> "3.2.11")))

name := "apache-predictionio-parent"
Expand Down
2 changes: 1 addition & 1 deletion conf/pio-vendors.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if [ -z "$PIO_SPARK_VERSION" ]; then
fi

if [ -z "$PIO_HADOOP_VERSION" ]; then
PIO_HADOOP_VERSION="2.7.3"
PIO_HADOOP_VERSION="2.7.7"
fi

if [ -z "$PIO_ELASTICSEARCH_VERSION" ]; then
Expand Down
4 changes: 2 additions & 2 deletions docs/manual/source/install/install-sourcecode.html.md.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ building against

* Scala 2.11.8
* Spark 2.1.1
* Hadoop 2.7.3
* Hadoop 2.7.7
* Elasticsearch 5.6.9

Download [binary release from an Apache
Expand Down Expand Up @@ -104,7 +104,7 @@ Apache PredictionIO®. By default, the build will be against

* Scala 2.11.8
* Spark 2.1.1
* Hadoop 2.7.3
* Hadoop 2.7.7
* Elasticsearch 5.6.9

```
Expand Down