Revert "upgrade mapper-asl"

The old version is a newer version of the dependency.

This reverts commit 651430451d2134d14daab15ebae29eccc878b52b.

Change-Id: I410e9debc0207c12ffa024ff48a69b5f482006de
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1531

diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
index d3bc04b..2dca3f5 100644 (file)
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml
@@ -108,17 +108,6 @@
                <groupId>org.codehaus.jackson</groupId>
                <artifactId>jackson-jaxrs</artifactId>
                <version>1.9.13</version>
-               <exclusions>
-                    <exclusion>
-                          <groupId>org.codehaus.jackson</groupId>
-                          <artifactId>jackson-mapper-asl</artifactId>
-                    </exclusion>
-               </exclusions>
-          </dependency>
-          <dependency>
-               <groupId>org.codehaus.jackson</groupId>
-               <artifactId>jackson-mapper-asl</artifactId>
-               <version>1.9.3</version>
           </dependency>
 
           <dependency>

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
index 73bb76c..7d68fa8 100644 (file)
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml
@@ -130,17 +130,6 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
-            <exclusions>
-                 <exclusion>
-                       <groupId>org.codehaus.jackson</groupId>
-                       <artifactId>jackson-mapper-asl</artifactId>
-                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.3</version>
         </dependency>
 
         <dependency>

diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
index 7963645..c4e2561 100644 (file)
--- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml
@@ -92,18 +92,7 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
-            <exclusions>
-                 <exclusion>
-                      <groupId>org.codehaus.jackson</groupId>
-                      <artifactId>jackson-mapper-asl</artifactId>
-                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.3</version>
-        </dependency>
+            </dependency>
 
         <dependency>
             <groupId>javax.xml.bind</groupId>

diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
index 456f0be..43b9d17 100644 (file)
--- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml
@@ -103,20 +103,9 @@
                <artifactId>json</artifactId>
                </dependency>
                <dependency>
-                    <groupId>com.sun.jersey</groupId>
-                    <artifactId>jersey-json</artifactId>
-                     <exclusions>
-                         <exclusion>
-                               <groupId>org.codehaus.jackson</groupId>
-                               <artifactId>jackson-mapper-asl</artifactId>
-                         </exclusion>
-                     </exclusions>
-               </dependency>
-               <dependency>
-                     <groupId>org.codehaus.jackson</groupId>
-                     <artifactId>jackson-mapper-asl</artifactId>
-                     <version>1.9.3</version>
-               </dependency>
+                       <groupId>com.sun.jersey</groupId>
+                       <artifactId>jersey-json</artifactId>
+                       </dependency>
 
                <dependency>
                        <groupId>javax.xml.bind</groupId>

diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
index 4b5a00a..c6badc4 100644 (file)
--- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
+++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml
@@ -106,17 +106,6 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
-            <exclusions>
-                 <exclusion>
-                      <groupId>org.codehaus.jackson</groupId>
-                      <artifactId>jackson-mapper-asl</artifactId>
-                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.3</version>
         </dependency>
 
         <dependency>

diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml
index 35a8ba2..009f835 100644 (file)
--- a/appc-dg-util/appc-dg-util-bundle/pom.xml
+++ b/appc-dg-util/appc-dg-util-bundle/pom.xml
@@ -68,17 +68,6 @@
         <dependency>
             <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
-            <exclusions>
-                 <exclusion>
-                      <groupId>org.codehaus.jackson</groupId>
-                      <artifactId>jackson-mapper-asl</artifactId>
-                 </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.3</version>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>