apex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From david...@apache.org
Subject incubator-apex-malhar git commit: Rename header, update NOTICE, fix license check.
Date Thu, 22 Oct 2015 22:00:22 GMT
Repository: incubator-apex-malhar
Updated Branches:
  refs/heads/devel-3 d05966203 -> b764aa68f


Rename header, update NOTICE, fix license check.


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/b764aa68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/b764aa68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/b764aa68

Branch: refs/heads/devel-3
Commit: b764aa68f27f5038e235e1ab3c892b552885216a
Parents: d059662
Author: Thomas Weise <thomas@datatorrent.com>
Authored: Thu Oct 22 10:33:51 2015 -0700
Committer: Thomas Weise <thomas@datatorrent.com>
Committed: Thu Oct 22 13:24:29 2015 -0700

----------------------------------------------------------------------
 NOTICE      |  3 +++
 header.txt  | 16 ++++++++++++++++
 license.txt | 16 ----------------
 pom.xml     |  8 ++++----
 4 files changed, 23 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b764aa68/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index d834235..eef5e86 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,3 +4,6 @@ Copyright (c) 2015 The Apache Software Foundation
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+The initial developer of the original code is
+DataTorrent, Inc. (http://www.datatorrent.com)
+Copyright (c) 2012 - 2015. All Rights Reserved.

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b764aa68/header.txt
----------------------------------------------------------------------
diff --git a/header.txt b/header.txt
new file mode 100644
index 0000000..60b675e
--- /dev/null
+++ b/header.txt
@@ -0,0 +1,16 @@
+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.

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b764aa68/license.txt
----------------------------------------------------------------------
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 60b675e..0000000
--- a/license.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-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.

http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/b764aa68/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3512d81..a6befc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,9 +60,9 @@
         <artifactId>license-maven-plugin</artifactId>
         <configuration>
           <excludes combine.children="append">
-            <exclude>src/test/resources/**/sample_logs/**</exclude>
+            <exclude>**/src/test/resources/**/sample_logs/**</exclude>
             <exclude>src/test/resources/*.csv</exclude>
-            <exclude>src/main/resources/com/datatorrent/apps/logstream/**</exclude>
+            <exclude>**/src/main/resources/com/datatorrent/apps/logstream/**</exclude>
             <exclude>src/main/c/zmq_push/Makefile</exclude>
             <exclude>src/test/resources/com/datatorrent/contrib/romesyndication/*.rss</exclude>
           </excludes>
@@ -76,9 +76,9 @@
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes combine.children="append">
-            <exclude>src/test/resources/**/sample_logs/**</exclude>
+            <exclude>**/src/test/resources/**/sample_logs/**</exclude>
             <exclude>src/test/resources/*.csv</exclude>
-            <exclude>src/main/resources/com/datatorrent/apps/logstream/**</exclude>
+            <exclude>**/src/main/resources/com/datatorrent/apps/logstream/**</exclude>
             <exclude>src/main/c/zmq_push/Makefile</exclude>
             <exclude>src/test/resources/com/datatorrent/contrib/romesyndication/*.rss</exclude>
             <exclude>src/main/resources/**/*.txt</exclude>


Mime
View raw message