You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by vr...@apache.org on 2015/10/23 23:30:36 UTC

[3/5] incubator-apex-core git commit: APEX-217 #resolve added NOTICE.vm that generates original copyright in NOTICE. The workaround suggested in https://issues.apache.org/jira/browse/MASFRES-5.

APEX-217 #resolve added NOTICE.vm that generates original copyright in NOTICE. The workaround suggested in https://issues.apache.org/jira/browse/MASFRES-5.


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/b44c6468
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/b44c6468
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/b44c6468

Branch: refs/heads/devel-3
Commit: b44c6468f1b30570898c257c922543d9fb417dd6
Parents: a190e86
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Thu Oct 22 21:17:51 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 23 12:46:22 2015 -0700

----------------------------------------------------------------------
 NOTICE                                                            | 1 +
 apex-app-archetype/src/main/appended-resources/META-INF/NOTICE.vm | 3 +++
 .../src/main/appended-resources/META-INF/NOTICE.vm                | 3 +++
 api/src/main/appended-resources/META-INF/NOTICE.vm                | 3 +++
 bufferserver/src/main/appended-resources/META-INF/NOTICE.vm       | 3 +++
 common/src/main/appended-resources/META-INF/NOTICE.vm             | 3 +++
 engine/src/main/appended-resources/META-INF/NOTICE.vm             | 3 +++
 pom.xml                                                           | 3 +++
 8 files changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index eef5e86..1dfedde 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,6 +4,7 @@ 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/b44c6468/apex-app-archetype/src/main/appended-resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/apex-app-archetype/src/main/appended-resources/META-INF/NOTICE.vm b/apex-app-archetype/src/main/appended-resources/META-INF/NOTICE.vm
new file mode 100644
index 0000000..7edf492
--- /dev/null
+++ b/apex-app-archetype/src/main/appended-resources/META-INF/NOTICE.vm
@@ -0,0 +1,3 @@
+#if($project.properties.postNoticeText)
+$project.properties.postNoticeText
+#end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/apex-conf-archetype/src/main/appended-resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/apex-conf-archetype/src/main/appended-resources/META-INF/NOTICE.vm b/apex-conf-archetype/src/main/appended-resources/META-INF/NOTICE.vm
new file mode 100644
index 0000000..7edf492
--- /dev/null
+++ b/apex-conf-archetype/src/main/appended-resources/META-INF/NOTICE.vm
@@ -0,0 +1,3 @@
+#if($project.properties.postNoticeText)
+$project.properties.postNoticeText
+#end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/api/src/main/appended-resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/api/src/main/appended-resources/META-INF/NOTICE.vm b/api/src/main/appended-resources/META-INF/NOTICE.vm
new file mode 100644
index 0000000..7edf492
--- /dev/null
+++ b/api/src/main/appended-resources/META-INF/NOTICE.vm
@@ -0,0 +1,3 @@
+#if($project.properties.postNoticeText)
+$project.properties.postNoticeText
+#end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/bufferserver/src/main/appended-resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/bufferserver/src/main/appended-resources/META-INF/NOTICE.vm b/bufferserver/src/main/appended-resources/META-INF/NOTICE.vm
new file mode 100644
index 0000000..7edf492
--- /dev/null
+++ b/bufferserver/src/main/appended-resources/META-INF/NOTICE.vm
@@ -0,0 +1,3 @@
+#if($project.properties.postNoticeText)
+$project.properties.postNoticeText
+#end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/common/src/main/appended-resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/common/src/main/appended-resources/META-INF/NOTICE.vm b/common/src/main/appended-resources/META-INF/NOTICE.vm
new file mode 100644
index 0000000..7edf492
--- /dev/null
+++ b/common/src/main/appended-resources/META-INF/NOTICE.vm
@@ -0,0 +1,3 @@
+#if($project.properties.postNoticeText)
+$project.properties.postNoticeText
+#end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/engine/src/main/appended-resources/META-INF/NOTICE.vm
----------------------------------------------------------------------
diff --git a/engine/src/main/appended-resources/META-INF/NOTICE.vm b/engine/src/main/appended-resources/META-INF/NOTICE.vm
new file mode 100644
index 0000000..7edf492
--- /dev/null
+++ b/engine/src/main/appended-resources/META-INF/NOTICE.vm
@@ -0,0 +1,3 @@
+#if($project.properties.postNoticeText)
+$project.properties.postNoticeText
+#end
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/b44c6468/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 05d66e0..9501807 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,7 @@
             <exclude>DISCLAIMER</exclude>
             <exclude>LICENSE</exclude>
             <exclude>NOTICE</exclude>
+            <exclude>**/NOTICE.vm</exclude>
             <exclude>**/*.md</exclude>
             <exclude>**/*.txt</exclude>
             <exclude>**/*.importorder</exclude>
@@ -192,6 +193,7 @@
             <exclude>**/*.txt</exclude>
             <exclude>**/*.importorder</exclude>
             <exclude>misc/ide-templates/**</exclude>
+            <exclude>**/NOTICE.vm</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -362,6 +364,7 @@
         <sourceReleaseAssemblyDescriptor>source-release-zip-tar</sourceReleaseAssemblyDescriptor>
         <package.prefix>/opt/datatorrent</package.prefix>
         <package.groupname>dtorrent</package.groupname>
+        <postNoticeText>The initial developer of the original code is&#xA;DataTorrent, Inc. (http://www.datatorrent.com)&#xA;Copyright (c) 2012 - 2015. All Rights Reserved.</postNoticeText>
       </properties>
       <distributionManagement>
         <repository>