activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-1129: Fixing tests after client all
Date Thu, 18 May 2017 16:10:52 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 28314f3ca -> a05e36ece


ARTEMIS-1129: Fixing tests after client all

Clean up shaded jar
Ensure aggregated notice
Ensure correct license file, 
remove noise from jgroups dependency (taken from infinispans shade config)
remove other loose ends.

Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1bd0a348
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1bd0a348
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1bd0a348

Branch: refs/heads/master
Commit: 1bd0a348a256297ccb691122611b0ba92c63fb6f
Parents: 28314f3
Author: Michael Andre Pearce <Michael.Andre.Pearce@me.com>
Authored: Thu May 18 05:20:23 2017 +0100
Committer: Michael Andre Pearce <Michael.Andre.Pearce@me.com>
Committed: Thu May 18 15:57:25 2017 +0100

----------------------------------------------------------------------
 artemis-core-client-all/pom.xml | 31 +++++++++++++++++++++++++++++++
 artemis-jms-client-all/pom.xml  | 31 +++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1bd0a348/artemis-core-client-all/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-core-client-all/pom.xml b/artemis-core-client-all/pom.xml
index 8a9e91e..84ccd44 100644
--- a/artemis-core-client-all/pom.xml
+++ b/artemis-core-client-all/pom.xml
@@ -58,12 +58,43 @@
                         <filter>
                            <artifact>*:*</artifact>
                            <excludes>
+                              <exclude>INSTALL.html</exclude>
+                              <exclude>LICENSE</exclude>
+                              <exclude>README</exclude>
                               <exclude>META-INF/*.SF</exclude>
                               <exclude>META-INF/*.DSA</exclude>
                               <exclude>META-INF/*.RSA</exclude>
+                              <exclude>META-INF/ASL2.0</exclude>
+                              <exclude>META-INF/DEPENDENCIES.txt</exclude>
+                              <exclude>META-INF/LICENSE.txt</exclude>
+                              <exclude>META-INF/NOTICE.txt</exclude>
+                              <exlude>overview.html</exlude>
                            </excludes>
                         </filter>
+                        <filter>
+                           <artifact>org.jgroups:jgroups</artifact>
+                           <includes>
+                              <include>org/jgroups/**</include>
+                              <include>jg-magic-map.xml</include>
+                              <include>jg-protocol-ids.xml</include>
+                              <include>*.properties</include>
+                              <include>*.xsd</include>
+                           </includes>
+                        </filter>
                      </filters>
+                     <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                           <resource>META-INF/DEPENDENCIES</resource>
+                        </transformer>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                           <addHeader>false</addHeader>
+                        </transformer>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                           <resource>.txt</resource>
+                           <resource>features.xml</resource>
+                        </transformer>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                     </transformers>
                      <relocations>
                         <relocation>
                            <pattern>org.apache.activemq</pattern>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1bd0a348/artemis-jms-client-all/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-jms-client-all/pom.xml b/artemis-jms-client-all/pom.xml
index e8e4f0d..12d3b5c 100644
--- a/artemis-jms-client-all/pom.xml
+++ b/artemis-jms-client-all/pom.xml
@@ -58,12 +58,43 @@
                         <filter>
                            <artifact>*:*</artifact>
                            <excludes>
+                              <exclude>INSTALL.html</exclude>
+                              <exclude>LICENSE</exclude>
+                              <exclude>README</exclude>
                               <exclude>META-INF/*.SF</exclude>
                               <exclude>META-INF/*.DSA</exclude>
                               <exclude>META-INF/*.RSA</exclude>
+                              <exclude>META-INF/ASL2.0</exclude>
+                              <exclude>META-INF/DEPENDENCIES.txt</exclude>
+                              <exclude>META-INF/LICENSE.txt</exclude>
+                              <exclude>META-INF/NOTICE.txt</exclude>
+                              <exlude>overview.html</exlude>
                            </excludes>
                         </filter>
+                        <filter>
+                           <artifact>org.jgroups:jgroups</artifact>
+                           <includes>
+                              <include>org/jgroups/**</include>
+                              <include>jg-magic-map.xml</include>
+                              <include>jg-protocol-ids.xml</include>
+                              <include>*.properties</include>
+                              <include>*.xsd</include>
+                           </includes>
+                        </filter>
                      </filters>
+                     <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                           <resource>META-INF/DEPENDENCIES</resource>
+                        </transformer>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                           <addHeader>false</addHeader>
+                        </transformer>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                           <resource>.txt</resource>
+                           <resource>features.xml</resource>
+                        </transformer>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                     </transformers>
                      <relocations>
                         <relocation>
                            <pattern>org.apache.activemq</pattern>


Mime
View raw message