Repository: incubator-predictionio Updated Branches: refs/heads/release/0.10.0 57e3f3dde -> 1bd4a046d
Fixed license info Moved MySQL connector to provided scope Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/1bd4a046 Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/1bd4a046 Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/1bd4a046 Branch: refs/heads/release/0.10.0 Commit: 1bd4a046d1f4c2ebb874f72157d1fb9f5a63c7f7 Parents: 57e3f3d Author: Donald Szeto <[email protected]> Authored: Thu Sep 29 15:55:57 2016 -0700 Committer: Donald Szeto <[email protected]> Committed: Thu Sep 29 15:55:57 2016 -0700 ---------------------------------------------------------------------- LICENSE.txt | 26 ++++---------------------- data/build.sbt | 2 +- tests/.rat-excludes | 1 + 3 files changed, 6 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/1bd4a046/LICENSE.txt ---------------------------------------------------------------------- diff --git a/LICENSE.txt b/LICENSE.txt index b835acd..36565a1 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -204,29 +204,11 @@ ================================================================================ PredictionIO Subcomponents: -================================================================================ - -The PredictionIO project contains subcomponents with separate copyright notices -and license terms. Your use of the source code for these subcomponents is -subject to the terms and conditions of the following licenses. - - -================================================================================ -Some code in this project has been adapted from Apache Spark: -================================================================================ -Copyright 2014 The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +The Apache PredictionIO (incubating) project contains subcomponents with +separate copyright notices and license terms. Your use of the source code for +these subcomponents is subject to the terms and conditions of the following +licenses. ================================================================================ http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/1bd4a046/data/build.sbt ---------------------------------------------------------------------- diff --git a/data/build.sbt b/data/build.sbt index 21c8d65..0c33851 100644 --- a/data/build.sbt +++ b/data/build.sbt @@ -23,7 +23,7 @@ libraryDependencies ++= Seq( "io.spray" %% "spray-can" % "1.3.3", "io.spray" %% "spray-routing" % "1.3.3", "io.spray" %% "spray-testkit" % "1.3.3" % "test", - "mysql" % "mysql-connector-java" % "5.1.37", + "mysql" % "mysql-connector-java" % "5.1.37" % "provided", "org.apache.hadoop" % "hadoop-common" % "2.6.2" exclude("javax.servlet", "servlet-api"), "org.apache.hbase" % "hbase-common" % "0.98.5-hadoop2", http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/1bd4a046/tests/.rat-excludes ---------------------------------------------------------------------- diff --git a/tests/.rat-excludes b/tests/.rat-excludes index f21d112..9f65cd1 100644 --- a/tests/.rat-excludes +++ b/tests/.rat-excludes @@ -27,6 +27,7 @@ dist/* vendors/* .logs/* sbt/* +bin/semver.sh .*md .*md.erb
