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:46 UTC

[45/50] [abbrv] incubator-apex-core git commit: Merge branch 'APEX-217' of https://github.com/vrozov/incubator-apex-core into release-3.2

Merge branch 'APEX-217' of https://github.com/vrozov/incubator-apex-core into release-3.2


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

Branch: refs/heads/master
Commit: 8ef3f6e514f0fd84dbace789cae9ef01d9270cb9
Parents: d9b2af0 eb8cc74
Author: Thomas Weise <th...@datatorrent.com>
Authored: Thu Oct 22 21:50:13 2015 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Thu Oct 22 21:50:13 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/8ef3f6e5/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index ee77ae6,f20e85f..5be2636
--- a/pom.xml
+++ b/pom.xml
@@@ -358,9 -360,9 +360,10 @@@
          <distMgmtReleaseId>apache.staging.https</distMgmtReleaseId>
          <distMgmtReleaseUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtReleaseUrl>
          <distMgmtDevUrl>file://${project.build.directory}/mvn-repo</distMgmtDevUrl>
 +        <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>