activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [1/5] activemq-6 git commit: Removing extra dependencies brought by transitivity on rest
Date Mon, 16 Mar 2015 09:42:00 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master ab1c585ac -> 3bd35d8d1


Removing extra dependencies brought by transitivity on rest


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/4afa19b3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/4afa19b3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/4afa19b3

Branch: refs/heads/master
Commit: 4afa19b348c4a28ceed3890173b1b2ac38e32a7c
Parents: ab1c585
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Fri Mar 13 18:37:23 2015 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Sat Mar 14 15:13:21 2015 -0400

----------------------------------------------------------------------
 activemq-rest/pom.xml                           | 35 ++++++++++++++++++++
 examples/jms/rest/dup-send/pom.xml              | 12 +++++++
 examples/jms/rest/javascript-chat/pom.xml       | 12 +++++++
 examples/jms/rest/jms-to-rest/pom.xml           | 12 +++++++
 examples/jms/rest/push/pom.xml                  | 12 +++++++
 .../activemq-aerogear-integration/pom.xml       |  6 ++++
 6 files changed, 89 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4afa19b3/activemq-rest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index 4e2772d..ae069e1 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -49,12 +49,22 @@
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
          <exclusions>
             <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+            <exclusion>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-impl</artifactId>
             </exclusion>
@@ -67,14 +77,32 @@
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jackson-provider</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-atom-provider</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>tjws</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>io.netty</groupId>
@@ -95,8 +123,15 @@
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
+         <groupId>org.jboss.spec.javax.annotation</groupId>
+         <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+         <version>1.0.1.Final</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
+         <scope>test</scope>
       </dependency>
    </dependencies>
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4afa19b3/examples/jms/rest/dup-send/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/pom.xml b/examples/jms/rest/dup-send/pom.xml
index ce546ab..65e242a 100644
--- a/examples/jms/rest/dup-send/pom.xml
+++ b/examples/jms/rest/dup-send/pom.xml
@@ -151,10 +151,22 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4afa19b3/examples/jms/rest/javascript-chat/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/pom.xml b/examples/jms/rest/javascript-chat/pom.xml
index 89e3968..787627d 100644
--- a/examples/jms/rest/javascript-chat/pom.xml
+++ b/examples/jms/rest/javascript-chat/pom.xml
@@ -165,11 +165,23 @@ under the License.
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
          <version>${resteasy.version}</version>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
          <version>${resteasy.version}</version>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4afa19b3/examples/jms/rest/jms-to-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/pom.xml b/examples/jms/rest/jms-to-rest/pom.xml
index 0c36696..d583a55 100644
--- a/examples/jms/rest/jms-to-rest/pom.xml
+++ b/examples/jms/rest/jms-to-rest/pom.xml
@@ -151,10 +151,22 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4afa19b3/examples/jms/rest/push/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/pom.xml b/examples/jms/rest/push/pom.xml
index 5d497a0..14713ee 100644
--- a/examples/jms/rest/push/pom.xml
+++ b/examples/jms/rest/push/pom.xml
@@ -157,10 +157,22 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/4afa19b3/integration/activemq-aerogear-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index d109a9d..c0c40cd 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -63,6 +63,12 @@
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jackson-provider</artifactId>
          <version>2.3.2.Final</version>
+         <exclusions>
+            <exclusion>
+               <groupId>org.jboss.spec.javax.annotation</groupId>
+               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
    </dependencies>
 


Mime
View raw message