Remove duplicate BC provider jars

[odlparent.git] / karaf / opendaylight-karaf-resources / pom.xml

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index bd58ae39e1397f4ecaa2ca6d9c94fd2b5a6a9d43..bc9468a61289cc34b8b59df98b4e57510763a4f9 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>4.0.3-SNAPSHOT</version>
+    <version>4.0.8-SNAPSHOT</version>
     <relativePath>../../odlparent</relativePath>
   </parent>
   <artifactId>opendaylight-karaf-resources</artifactId>
@@ -107,8 +107,7 @@
                 <echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
 # The following are added by opendaylight-karaf-resources
 mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7
-mvn\:org.apache.felix/org.apache.felix.metatype/1.2.0 = 8
-mvn\:org.bouncycastle/bcprov-jdk15on/${bouncycastle.version} = 14
+mvn\:org.apache.felix/org.apache.felix.metatype/1.2.2 = 8
 mvn\:org.bouncycastle/bcpkix-jdk15on/${bouncycastle.version} = 14
 mvn\:org.bouncycastle/bcprov-ext-jdk15on/${bouncycastle.version} = 14
 mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 = 14
@@ -135,13 +134,6 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
             <configuration>
               <artifactItems>
                 <!-- Needs to be copied to lib/ext in order to start bouncy provider for mina sshd -->
-                <artifactItem>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <version>${bouncycastle.version}</version>
-                    <outputDirectory>target/classes/lib/ext</outputDirectory>
-                    <destFileName>bcprov-jdk15on-${bouncycastle.version}.jar</destFileName>
-                </artifactItem>
                 <artifactItem>
                     <groupId>org.bouncycastle</groupId>
                     <artifactId>bcprov-ext-jdk15on</artifactId>
@@ -204,7 +196,7 @@ mvn\:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.
       <plugin>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-plugin</artifactId>
-        <version>4.0.3-SNAPSHOT</version>
+        <version>4.0.8-SNAPSHOT</version>
         <executions>
           <execution>
             <id>populate-local-repo</id>