You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/11/03 03:27:32 UTC
[31/50] [abbrv] incubator-apex-core git commit: APEX-189 Add original
copyright owner to NOTICE, rename license header template for clarity.
APEX-189 Add original copyright owner to NOTICE, rename license header template for clarity.
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/979a0efd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/979a0efd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/979a0efd
Branch: refs/heads/master
Commit: 979a0efd282f3c2b26889767e72b5b25921775ac
Parents: d2bf3e5
Author: Thomas Weise <th...@datatorrent.com>
Authored: Sun Oct 18 22:33:20 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Sun Oct 18 22:33:20 2015 -0700
----------------------------------------------------------------------
NOTICE | 3 +++
header.txt | 16 ++++++++++++++++
license.txt | 16 ----------------
pom.xml | 4 ++--
4 files changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/979a0efd/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-core/blob/979a0efd/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-core/blob/979a0efd/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-core/blob/979a0efd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6aad8c7..1fdabcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<version>3.2.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Apex Core</name>
+ <name>Apache Apex</name>
<url>http://apex.apache.org</url>
<organization>
@@ -100,7 +100,7 @@
<artifactId>license-maven-plugin</artifactId>
<version>2.11</version>
<configuration>
- <header>license.txt</header>
+ <header>header.txt</header>
<properties>
<owner>Apache Software Foundation</owner>
<email>dev@apex.incubator.apache.org</email>