Remove obsolete patched dependencies

karaf4-parent pulls in a number of dependencies which we used to patch
in the underlying feature files; but the upstream features have since
been updated and we no longer patch them, which means we no longer
need to manually depend on these artifacts.

Change-Id: I67c5d7377b5ac85d51b5934e83adc8d90f0d0233
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 823c49f9554a676487eb52f7270ad38f5f023fb2..4f7f56fdb21750d3edadb50c43fbfc0a316e91c9 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -110,26 +110,6 @@
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>opendaylight-karaf-resources</artifactId>
         </dependency>
-
-        <!-- Patched dependencies (see opendaylight-karaf-resources) -->
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>5.0.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4.4</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 
     <build>