You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2016/08/30 14:06:46 UTC
incubator-s2graph git commit: [S2GRAPH-92]: Add proper license
headers on files with unknown licenses.
Repository: incubator-s2graph
Updated Branches:
refs/heads/master 1ef29fd3c -> 414ad88f9
[S2GRAPH-92]: Add proper license headers on files with unknown licenses.
JIRA:
[S2GRAPH-92] https://issues.apache.org/jira/browse/S2GRAPH-92
Pull Request:
Closes #70
Authors:
DO YUNG YOON: steamshon@apache.org
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/414ad88f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/414ad88f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/414ad88f
Branch: refs/heads/master
Commit: 414ad88f933c7a6168d64425b9bf2ec9141fe086
Parents: 1ef29fd
Author: DO YUNG YOON <st...@apache.org>
Authored: Tue Aug 30 23:09:23 2016 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Tue Aug 30 23:09:23 2016 +0900
----------------------------------------------------------------------
.rat-excludes | 5 -----
CHANGES | 2 ++
README.md | 20 ++++++++++++++++++++
Vagrantfile | 15 +++++++++++++++
build.sbt | 7 +++++--
dev/run-rat.sh | 4 +++-
dev_support/README.md | 21 +++++++++++++++++++++
dev_support/docker-compose.yml | 15 +++++++++++++++
lib/apache-rat-0.11.jar | Bin 1415335 -> 0 bytes
project/Common.scala | 19 +++++++++++++++++++
project/Packager.scala | 19 +++++++++++++++++++
project/assembly.sbt | 19 +++++++++++++++++++
project/build.properties | 17 +++++++++++++++++
project/plugins.sbt | 19 +++++++++++++++++++
s2core/README.md | 4 ----
15 files changed, 174 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/.rat-excludes
----------------------------------------------------------------------
diff --git a/.rat-excludes b/.rat-excludes
index 370a741..1976fcc 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -1,20 +1,15 @@
rat.out
.rat-excludes
-Vagrantfile
-docker-compose.yml
rat.out
sbt
sbt.boot.lock
-README.md
s2core/README.md
.gitignore
.git
.svn
logs
-project
target
lib/apache-rat-0.11.jar
-s2core/lib
s2rest_play/logs
s2rest_play/target
s2rest_play/project
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ba7f3e3..ee4b5c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -162,6 +162,8 @@ Release 0.12.1 - unreleased
S2GRAPH-95: Add sbt-pgp plugin on plugins.sbt (Committed by DOYUNG YOON).
+ S2GRAPH-92: Add proper license headers on files with unknown licenses (Committed by DOYUNG YOON).
+
TEST
S2GRAPH-21: Change PostProcessBenchmarkSpec not to store and fetch test data from storage. (Committed by DOYUNG YOON).
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 409b120..1f8f104 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,23 @@
+<!---
+/*
+ * 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.
+ */
+--->
**S2Graph**
===================
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index cc27fbf..6dfb43a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,3 +1,18 @@
+# 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.
+
# -*- mode: ruby -*-
# vi: set ft=ruby :
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/build.sbt
----------------------------------------------------------------------
diff --git a/build.sbt b/build.sbt
index 8aef7c4..c315771 100755
--- a/build.sbt
+++ b/build.sbt
@@ -18,6 +18,7 @@
*/
import ReleaseTransformations._
+import sbt.complete.Parsers.spaceDelimited
name := "s2graph"
@@ -63,10 +64,12 @@ lazy val root = (project in file("."))
.dependsOn(s2rest_play, s2rest_netty, loader, s2counter_loader) // this enables packaging on the root project
.settings(commonSettings: _*)
-lazy val runRatTask = taskKey[Unit]("Runs Apache rat on S2Graph")
+lazy val runRatTask = inputKey[Unit]("Runs Apache rat on S2Graph")
runRatTask := {
- "sh dev/run-rat.sh" !
+ // pass absolute path for apache-rat jar.
+ val args: Seq[String] = spaceDelimited("<arg>").parsed
+ s"sh dev/run-rat.sh ${args.head}" !
}
Packager.defaultSettings
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/dev/run-rat.sh
----------------------------------------------------------------------
diff --git a/dev/run-rat.sh b/dev/run-rat.sh
index c22c938..2ca8de7 100644
--- a/dev/run-rat.sh
+++ b/dev/run-rat.sh
@@ -15,6 +15,8 @@
# limitations under the License.
base_dir=$(dirname $0)/..
+rat_jar=$1
+
rat_excludes_file=$base_dir/.rat-excludes
echo "Base Directory = $base_dir"
@@ -25,7 +27,7 @@ else
JAVA="$JAVA_HOME/bin/java"
fi
-rat_command="$JAVA -jar $base_dir/lib/apache-rat-0.11.jar --dir $base_dir --exclude-file ${rat_excludes_file} -f -a"
+rat_command="$JAVA -jar $rat_jar --dir $base_dir --exclude-file ${rat_excludes_file} -f -a"
echo "Running " $rat_command
$rat_command > $base_dir/rat.out
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/dev_support/README.md
----------------------------------------------------------------------
diff --git a/dev_support/README.md b/dev_support/README.md
index 556a7d9..50b04ee 100644
--- a/dev_support/README.md
+++ b/dev_support/README.md
@@ -1,3 +1,24 @@
+<!---
+/*
+ * 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.
+ */
+--->
+
# Run S2Graph using Docker
1. Build a docker image of the s2graph in the project's root directory
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/dev_support/docker-compose.yml
----------------------------------------------------------------------
diff --git a/dev_support/docker-compose.yml b/dev_support/docker-compose.yml
index 156c3fa..c757e1d 100644
--- a/dev_support/docker-compose.yml
+++ b/dev_support/docker-compose.yml
@@ -1,3 +1,18 @@
+# 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.
+
graph:
image: s2rest_play:0.1.0
container_name: graph
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/lib/apache-rat-0.11.jar
----------------------------------------------------------------------
diff --git a/lib/apache-rat-0.11.jar b/lib/apache-rat-0.11.jar
deleted file mode 100644
index 1bce767..0000000
Binary files a/lib/apache-rat-0.11.jar and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/project/Common.scala
----------------------------------------------------------------------
diff --git a/project/Common.scala b/project/Common.scala
index d6469bf..0f1fefb 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
object Common {
// lazy val sparkVersion = "1.4.1-cdh5.3.3"
lazy val sparkVersion = "1.4.1"
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/project/Packager.scala
----------------------------------------------------------------------
diff --git a/project/Packager.scala b/project/Packager.scala
index 2bf4f64..cd260cf 100644
--- a/project/Packager.scala
+++ b/project/Packager.scala
@@ -1,3 +1,22 @@
+/*
+ * 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 java.nio.file.attribute.BasicFileAttributes
import java.nio.file.{FileVisitResult, Files, Path, Paths, SimpleFileVisitor, StandardCopyOption}
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/project/assembly.sbt
----------------------------------------------------------------------
diff --git a/project/assembly.sbt b/project/assembly.sbt
index 54c3252..558b67e 100644
--- a/project/assembly.sbt
+++ b/project/assembly.sbt
@@ -1 +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.
+ */
+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.11.2")
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/project/build.properties
----------------------------------------------------------------------
diff --git a/project/build.properties b/project/build.properties
index 8f28b8b..d5c2d89 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -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.
+
#Activator-generated Properties
#Wed Sep 24 14:14:39 KST 2014
template.uuid=a855816c-0367-44ba-9adb-6a903f6ad599
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/project/plugins.sbt
----------------------------------------------------------------------
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 340c88a..d98d1cb 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
// use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.10")
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/414ad88f/s2core/README.md
----------------------------------------------------------------------
diff --git a/s2core/README.md b/s2core/README.md
deleted file mode 100644
index 78826c9..0000000
--- a/s2core/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Core library for S2graph.
-
-
-