Repository: incubator-apex-malhar Updated Branches: refs/heads/release-3.2 9587b03e2 -> 0bb959941
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/0bb95994 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/0bb95994 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/0bb95994 Branch: refs/heads/release-3.2 Commit: 0bb9599417f3e4226de43f4009dc3a808877fa67 Parents: 9587b03 Author: Thomas Weise <[email protected]> Authored: Thu Oct 22 10:33:51 2015 -0700 Committer: Thomas Weise <[email protected]> Committed: Thu Oct 22 10:33:51 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/0bb95994/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/0bb95994/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/0bb95994/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/0bb95994/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 1afdf3c..207304e 100644 --- a/pom.xml +++ b/pom.xml @@ -59,9 +59,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> @@ -75,9 +75,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>
