You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ma...@apache.org on 2017/02/16 18:35:38 UTC
[6/7] incubator-toree git commit: Add misssing license headers
Add misssing license headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/c00b4a37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/c00b4a37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/c00b4a37
Branch: refs/heads/master
Commit: c00b4a37f8c74f7ed2bf29f4176a743ba445497d
Parents: 8bdfe01
Author: Jakob Odersky <ja...@odersky.com>
Authored: Tue Feb 14 15:24:36 2017 -0800
Committer: Jakob Odersky <ja...@odersky.com>
Committed: Wed Feb 15 15:24:09 2017 -0800
----------------------------------------------------------------------
.gitattributes | 17 ++++++++++++++
project/CommonPlugin.scala | 16 +++++++++++++
project/Dependencies.scala | 51 ++++++++++++++++++++++++++---------------
3 files changed, 66 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c00b4a37/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
index a8edefd..2098a15 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+#
+
# Set the default behavior to have all files normalized to Unix-style
# line endings upon check-in.
* text=auto
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c00b4a37/project/CommonPlugin.scala
----------------------------------------------------------------------
diff --git a/project/CommonPlugin.scala b/project/CommonPlugin.scala
index a75a9a7..58358d5 100644
--- a/project/CommonPlugin.scala
+++ b/project/CommonPlugin.scala
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ */
import sbt._
import sbt.Keys._
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/c00b4a37/project/Dependencies.scala
----------------------------------------------------------------------
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 508461f..c827760 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ */
import sbt._
import sbt.Keys._
import scala.util.Properties
@@ -6,26 +22,25 @@ object Dependencies {
// Libraries
- val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.17"
- val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.4.17"
- val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.4.17"
+ val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.4.17" // Apache v2
+ val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % "2.4.17 "// Apache v2
+ val akkaTestkit = "com.typesafe.akka" %% "akka-testkit" % "2.4.17" // Apache v2
val clapper = "org.clapper" %% "classutil" % "1.0.12" // BSD 3-clause license, used for detecting plugins
- val commonsExec = "org.apache.commons" % "commons-exec" % "1.3"
+ val commonsExec = "org.apache.commons" % "commons-exec" % "1.3" // Apache v2
- val config = "com.typesafe" % "config" % "1.3.0"
+ val config = "com.typesafe" % "config" % "1.3.0" // Apache v2
- // Apache v2
- val coursier = "io.get-coursier" %% "coursier" % "1.0.0-M15-1"
- val coursierCache = "io.get-coursier" %% "coursier-cache" % "1.0.0-M15-1"
+ val coursier = "io.get-coursier" %% "coursier" % "1.0.0-M15-1" // Apache v2
+ val coursierCache = "io.get-coursier" %% "coursier-cache" % "1.0.0-M15-1" // Apache v2
val ivy = "org.apache.ivy" % "ivy" % "2.4.0-rc1" // Apache v2
// use the same jackson version in test than the one provided at runtime by Spark 2.0.0
val jacksonDatabind = "com.fasterxml.jackson.core" % "jackson-databind" % "2.6.5" // Apache v2
- val jeroMq = "org.zeromq" % "jeromq" % "0.3.6"
+ val jeroMq = "org.zeromq" % "jeromq" % "0.3.6" // MPL v2
val joptSimple = "net.sf.jopt-simple" % "jopt-simple" % "4.6" // MIT
@@ -33,21 +48,21 @@ object Dependencies {
val playJson = "com.typesafe.play" %% "play-json" % "2.3.10" // Apache v2
- val scalaCompiler = Def.setting{ "org.scala-lang" % "scala-compiler" % scalaVersion.value }
- val scalaLibrary = Def.setting{ "org.scala-lang" % "scala-library" % scalaVersion.value }
- val scalaReflect = Def.setting{ "org.scala-lang" % "scala-reflect" % scalaVersion.value }
+ val scalaCompiler = Def.setting{ "org.scala-lang" % "scala-compiler" % scalaVersion.value } // BSD 3-clause
+ val scalaLibrary = Def.setting{ "org.scala-lang" % "scala-library" % scalaVersion.value } // BSD 3-clause
+ val scalaReflect = Def.setting{ "org.scala-lang" % "scala-reflect" % scalaVersion.value } // BSD 3-clause
val scalaTest = "org.scalatest" %% "scalatest" % "2.2.6" // Apache v2
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.21" // MIT
val sparkVersion = settingKey[String]("Version of Apache Spark to use in Toree") // defined in root build
- val sparkCore = Def.setting{ "org.apache.spark" %% "spark-core" % sparkVersion.value }
- val sparkGraphX = Def.setting{ "org.apache.spark" %% "spark-graphx" % sparkVersion.value }
- val sparkMllib = Def.setting{ "org.apache.spark" %% "spark-mllib" % sparkVersion.value }
- val sparkRepl = Def.setting{ "org.apache.spark" %% "spark-repl" % sparkVersion.value }
- val sparkSql = Def.setting{ "org.apache.spark" %% "spark-sql" % sparkVersion.value }
- val sparkStreaming = Def.setting{ "org.apache.spark" %% "spark-streaming" % sparkVersion.value }
+ val sparkCore = Def.setting{ "org.apache.spark" %% "spark-core" % sparkVersion.value } // Apache v2
+ val sparkGraphX = Def.setting{ "org.apache.spark" %% "spark-graphx" % sparkVersion.value } // Apache v2
+ val sparkMllib = Def.setting{ "org.apache.spark" %% "spark-mllib" % sparkVersion.value } // Apache v2
+ val sparkRepl = Def.setting{ "org.apache.spark" %% "spark-repl" % sparkVersion.value } // Apache v2
+ val sparkSql = Def.setting{ "org.apache.spark" %% "spark-sql" % sparkVersion.value } // Apache v2
+ val sparkStreaming = Def.setting{ "org.apache.spark" %% "spark-streaming" % sparkVersion.value } // Apache v2
val springCore = "org.springframework" % "spring-core" % "4.1.1.RELEASE"// Apache v2