You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2014/04/25 20:57:11 UTC
[1/2] git commit: STORM-238: prevent duplicate LICENSE and NOTICE
files in storm-core.jar
Repository: incubator-storm
Updated Branches:
refs/heads/master 618337e2e -> 7a389d2e6
STORM-238: prevent duplicate LICENSE and NOTICE files in storm-core.jar
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/c868aca4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/c868aca4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/c868aca4
Branch: refs/heads/master
Commit: c868aca4813511a5addcdd0e9e043b5c3e4036c6
Parents: 920955b
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 14:12:55 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 14:12:55 2014 -0400
----------------------------------------------------------------------
storm-core/pom.xml | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/c868aca4/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 648fe74..fec6218 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -183,6 +183,19 @@
<resource>
<directory>../conf</directory>
</resource>
+ <resource>
+ <directory>../</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <!--
+ storm-core doesn't package jquery, etc. so the stock
+ apache LICENSE file is okay. We do want our version
+ of the NOTICE file, however
+ -->
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+
</resources>
<testResources>
<testResource>
@@ -272,7 +285,15 @@
<transformers>
<transformer implementation="org.apache.storm.maven.shade.clojure.ClojureTransformer" />
</transformers>
- <filters />
+ <filters>
+ <filter>
+ <artifact>org.apache.thrift:*</artifact>
+ <excludes>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>META-INF/NOTICE.txt</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
<dependencies>
<dependency>
[2/2] git commit: Merge branch 'STORM-238'
Posted by pt...@apache.org.
Merge branch 'STORM-238'
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7a389d2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7a389d2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7a389d2e
Branch: refs/heads/master
Commit: 7a389d2e64bb4db6bb060149c679367a0fba69a8
Parents: 618337e c868aca
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Fri Apr 25 14:56:21 2014 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Fri Apr 25 14:56:21 2014 -0400
----------------------------------------------------------------------
storm-core/pom.xml | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------