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:34 UTC
[1/5] incubator-apex-core git commit: APEX-218 Modify project names
for NOTICE.
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 3b3d068ff -> 7f1f81fd5
APEX-218 Modify project names for NOTICE.
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/62513101
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/62513101
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/62513101
Branch: refs/heads/devel-3
Commit: 625131017d4ba01cc542ff6d787f52c450c95abe
Parents: 3b3d068
Author: Thomas Weise <th...@datatorrent.com>
Authored: Thu Oct 22 20:35:32 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 23 12:45:05 2015 -0700
----------------------------------------------------------------------
apex-app-archetype/pom.xml | 2 +-
apex-conf-archetype/pom.xml | 2 +-
api/pom.xml | 2 +-
bufferserver/pom.xml | 2 +-
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
pom.xml | 4 ++--
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/apex-app-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-app-archetype/pom.xml b/apex-app-archetype/pom.xml
index d9095cd..b70cfeb 100644
--- a/apex-app-archetype/pom.xml
+++ b/apex-app-archetype/pom.xml
@@ -31,7 +31,7 @@
<artifactId>apex-app-archetype</artifactId>
<packaging>maven-archetype</packaging>
- <name>Apache Apex Application Maven Archetype</name>
+ <name>Apache Apex (incubating) Application Maven Archetype</name>
<build>
<extensions>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/apex-conf-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-conf-archetype/pom.xml b/apex-conf-archetype/pom.xml
index 4af8d16..2e6f78b 100644
--- a/apex-conf-archetype/pom.xml
+++ b/apex-conf-archetype/pom.xml
@@ -31,7 +31,7 @@
<artifactId>apex-conf-archetype</artifactId>
<packaging>maven-archetype</packaging>
- <name>Apache Apex App Configuration Maven Archetype</name>
+ <name>Apache Apex (incubating) App Configuration Maven Archetype</name>
<build>
<extensions>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 9224e63..9447c78 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -30,7 +30,7 @@
</parent>
<artifactId>apex-api</artifactId>
- <name>Apache Apex API</name>
+ <name>Apache Apex (incubating) API</name>
<packaging>jar</packaging>
<repositories>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index a45723b..acb93c9 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -31,7 +31,7 @@
<artifactId>apex-bufferserver</artifactId>
<description>Interface for nodes from 2 different containers to talk to each other.</description>
- <name>Apache Apex Buffer Server</name>
+ <name>Apache Apex (incubating) Buffer Server</name>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 1f7080d..6fb4852 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>apex-common</artifactId>
- <name>Apache Apex Common Library</name>
+ <name>Apache Apex (incubating) Common Library</name>
<packaging>jar</packaging>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index 8e75151..5545e27 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -31,7 +31,7 @@
<artifactId>apex-engine</artifactId>
<packaging>jar</packaging>
- <name>Apache Apex Stream Processing Engine</name>
+ <name>Apache Apex (incubating) Stream Processing Engine</name>
<build>
<finalName>${project.artifactId}</finalName>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/62513101/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f797805..05d66e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,8 @@
<version>3.3.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Apex</name>
- <url>http://apex.apache.org</url>
+ <name>Apache Apex (incubating)</name>
+ <url>http://apex.incubator.apache.org</url>
<organization>
<name>Apache Software Foundation</name>
[2/5] incubator-apex-core git commit: Remove stray Copyright line.
Posted by vr...@apache.org.
Remove stray Copyright line.
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/a190e86e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/a190e86e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/a190e86e
Branch: refs/heads/devel-3
Commit: a190e86e8f508308af539f5b473996e5fd4d6834
Parents: 6251310
Author: Thomas Weise <th...@datatorrent.com>
Authored: Thu Oct 22 21:14:05 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 23 12:45:08 2015 -0700
----------------------------------------------------------------------
.../resources/archetype-resources/XmlJavadocCommentsExtractor.xsl | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/a190e86e/apex-app-archetype/src/main/resources/archetype-resources/XmlJavadocCommentsExtractor.xsl
----------------------------------------------------------------------
diff --git a/apex-app-archetype/src/main/resources/archetype-resources/XmlJavadocCommentsExtractor.xsl b/apex-app-archetype/src/main/resources/archetype-resources/XmlJavadocCommentsExtractor.xsl
index 975ef1f..08075a9 100644
--- a/apex-app-archetype/src/main/resources/archetype-resources/XmlJavadocCommentsExtractor.xsl
+++ b/apex-app-archetype/src/main/resources/archetype-resources/XmlJavadocCommentsExtractor.xsl
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (C) 2015 DataTorrent, Inc.
-
Licensed 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
[4/5] incubator-apex-core git commit: Add (incubating) to NOTICE
Posted by vr...@apache.org.
Add (incubating) to NOTICE
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/40fba973
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/40fba973
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/40fba973
Branch: refs/heads/devel-3
Commit: 40fba973ea333c8c10d3d5fa0e2b6a876d917e6f
Parents: b44c646
Author: Thomas Weise <th...@datatorrent.com>
Authored: Thu Oct 22 22:22:27 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 23 12:46:22 2015 -0700
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/40fba973/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 1dfedde..d0f6855 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Apex
+Apache Apex (incubating)
Copyright (c) 2015 The Apache Software Foundation
This product includes software developed at
[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.
Posted by vr...@apache.org.
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
DataTorrent, Inc. (http://www.datatorrent.com)
Copyright (c) 2012 - 2015. All Rights Reserved.</postNoticeText>
</properties>
<distributionManagement>
<repository>
[5/5] incubator-apex-core git commit: APEX-219 Skip creation of
DEPENDENCIES for the source archive.
Posted by vr...@apache.org.
APEX-219 Skip creation of DEPENDENCIES for the source archive.
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/7f1f81fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/7f1f81fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/7f1f81fd
Branch: refs/heads/devel-3
Commit: 7f1f81fd5326cd4ac776c33cb18c16d5cf41d90f
Parents: 40fba97
Author: Thomas Weise <th...@datatorrent.com>
Authored: Thu Oct 22 23:02:31 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Fri Oct 23 12:46:22 2015 -0700
----------------------------------------------------------------------
pom.xml | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/7f1f81fd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9501807..cbb6a81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,6 +394,15 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <activation>
+ <file>
+ <missing>${basedir}/src/main</missing>
+ </file>
+ </activation>
+ <properties>
+ <remoteresources.skip>true</remoteresources.skip>
+ </properties>
+ </profile>
</profiles>
</project>