From commits-return-1093-apmail-apex-commits-archive=apex.apache.org@apex.incubator.apache.org Fri Oct 23 21:30:45 2015 Return-Path: X-Original-To: apmail-apex-commits-archive@minotaur.apache.org Delivered-To: apmail-apex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ABD7518737 for ; Fri, 23 Oct 2015 21:30:45 +0000 (UTC) Received: (qmail 1861 invoked by uid 500); 23 Oct 2015 21:30:45 -0000 Delivered-To: apmail-apex-commits-archive@apex.apache.org Received: (qmail 1819 invoked by uid 500); 23 Oct 2015 21:30:45 -0000 Mailing-List: contact commits-help@apex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@apex.incubator.apache.org Delivered-To: mailing list commits@apex.incubator.apache.org Received: (qmail 1808 invoked by uid 99); 23 Oct 2015 21:30:45 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Oct 2015 21:30:45 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 285D01A2B6C for ; Fri, 23 Oct 2015 21:30:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id k5PYn2ze0e62 for ; Fri, 23 Oct 2015 21:30:36 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 4F96427DB4 for ; Fri, 23 Oct 2015 21:30:35 +0000 (UTC) Received: (qmail 1348 invoked by uid 99); 23 Oct 2015 21:30:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Oct 2015 21:30:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 64ACBE04C8; Fri, 23 Oct 2015 21:30:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vrozov@apache.org To: commits@apex.incubator.apache.org Date: Fri, 23 Oct 2015 21:30:36 -0000 Message-Id: In-Reply-To: <5b8b41c9536747bd8d9f5cc9a8e06513@git.apache.org> References: <5b8b41c9536747bd8d9f5cc9a8e06513@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Oct 22 21:17:51 2015 -0700 Committer: Thomas Weise 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 @@ DISCLAIMER LICENSE NOTICE + **/NOTICE.vm **/*.md **/*.txt **/*.importorder @@ -192,6 +193,7 @@ **/*.txt **/*.importorder misc/ide-templates/** + **/NOTICE.vm @@ -362,6 +364,7 @@ source-release-zip-tar /opt/datatorrent dtorrent + The initial developer of the original code is DataTorrent, Inc. (http://www.datatorrent.com) Copyright (c) 2012 - 2015. All Rights Reserved.