[WFLY-7459] Upgrade Artemis 1.5.0

JIRA: https://issues.jboss.org/browse/WFLY-7459
wildfly · Nov 8, 2016 · 6172cf2 · 6172cf2
1 parent 8aef4f8
commit 6172cf2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
@@ -1655,17 +1655,6 @@
             <artifactId>artemis-native</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-proton-plug</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-ra</artifactId>

diff --git a/...rces/modules/system/layers/base/org/apache/activemq/artemis/protocol/amqp/main/module.xml b/...rces/modules/system/layers/base/org/apache/activemq/artemis/protocol/amqp/main/module.xml
@@ -25,7 +25,6 @@
 <module xmlns="urn:jboss:module:1.5" name="org.apache.activemq.artemis.protocol.amqp">
     <resources>
         <artifact name="${org.apache.activemq:artemis-amqp-protocol}"/>
-        <artifact name="${org.apache.activemq:artemis-proton-plug}"/>
     </resources>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,7 @@
         <version.jsoup>1.8.3</version.jsoup>
         <version.net.jcip>1.0</version.net.jcip>
         <version.net.shibboleth.utilities.java-support>7.1.1</version.net.shibboleth.utilities.java-support>
-        <version.org.apache.activemq.artemis>1.4.0</version.org.apache.activemq.artemis>
+        <version.org.apache.activemq.artemis>1.5.0</version.org.apache.activemq.artemis>
         <version.org.apache.avro>1.7.6</version.org.apache.avro>
         <version.org.apache.cxf>3.1.8</version.org.apache.cxf>
         <version.org.apache.cxf.xjcplugins>3.0.5</version.org.apache.cxf.xjcplugins>
@@ -1852,8 +1852,20 @@
                 <version>${version.org.apache.activemq.artemis}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-lang3</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-configuration2</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.jboss.logging</groupId>
+                        <artifactId>jboss-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>io.airlift</groupId>
+                        <artifactId>airline</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -1981,18 +1993,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.activemq</groupId>
-                <artifactId>artemis-proton-plug</artifactId>
-                <version>${version.org.apache.activemq.artemis}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.jboss.logging</groupId>
-                        <artifactId>jboss-logging</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.activemq</groupId>
                 <artifactId>artemis-ra</artifactId>