Use odl-apache-commons-codec

odlparent is packaging commons-codec in a feature, use that rather
than packaging it ourselves.

Change-Id: Ic8162e2c9e7bd8767d5e8985b8d6f37fc66dbf01
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index e27118be2b1283856ac74498976aa5e05ec236d0..3d970e18857ed1c44d77f59ee9d92d8e315e324c 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -128,10 +128,6 @@
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.oltu.oauth2</groupId>
             <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
@@ -164,6 +160,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-apache-commons-codec</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
 
         <!-- EhCache -->
         <dependency>

diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index dd46007e5c58507e1d0a21379ca21c5100398be9..5f52cb863b355a91f9a513d541d57d9e6001d327 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -25,5 +25,6 @@
         </configfile>
         <feature version="[4,5)">odl-karaf-feat-jdbc</feature>
         <feature version="[4,5)">odl-karaf-feat-jetty</feature>
+        <feature version="[4,5)">odl-apache-commons-codec</feature>
     </feature>
 </features>