brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [07/19] incubator-brooklyn git commit: Clean up maven-shade-plugin configuration
Date Tue, 21 Apr 2015 20:50:28 GMT
Clean up maven-shade-plugin configuration

Removes the special case for Whirr - since Brooklyn no longer shades
anything involving Whirr, this configuration can be removed.
maven-shade-plugin poorly handles transformers configured in the root
pom and more transformers defined in a module pom so it is best to
avoiding defining transformers in the root pom.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e567366a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e567366a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e567366a

Branch: refs/heads/master
Commit: e567366a6197f29c21e32d35cc423c2599962a57
Parents: 6de3d74
Author: Richard Downer <richard@apache.org>
Authored: Fri Apr 17 09:47:36 2015 +0100
Committer: Richard Downer <richard@apache.org>
Committed: Fri Apr 17 09:47:36 2015 +0100

----------------------------------------------------------------------
 pom.xml                           | 4 ----
 utils/jmx/jmxmp-ssl-agent/pom.xml | 6 ------
 2 files changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e567366a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b6d1fc..7de32ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -777,10 +777,6 @@
                                         </excludes>
                                     </filter>
                                 </filters>
-                                <transformers>
-                                    <!-- whirr, among others, uses services which need
careful attention -->
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
-                                </transformers>
                             </configuration>
                         </execution>
                     </executions>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e567366a/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index bf1923f..aad0abe 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -73,12 +73,6 @@
                     <artifactId>maven-shade-plugin</artifactId>
                     <configuration>
                         <transformers>
-                            <!-- So we need to copy the transformers configuration out
of the root pom, otherwise we
-                               - expose bugs in the plugin. That sucks. -->
-                            <!-- whirr, among others, uses services which need careful
attention -->
-                            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
-                            <!-- end copy from root pom -->
-
                             <!-- Cut out the license/notice for the unshaded artifact
-->
                             <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
                                 <resources>


Mime
View raw message