Fix BouncyCastle packaging

[odlparent.git] / karaf / karaf4-parent / pom.xml

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index c0a7ca72a4aa9b2502dae0a6ed0aca6515e0150b..10b4fb1324500c77ba13e68e365e9b174e2f56f9 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.0-SNAPSHOT</version>
+        <version>9.0.4-SNAPSHOT</version>
         <relativePath>../../odlparent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>8.1.0-SNAPSHOT</version>
+    <version>9.0.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
@@ -114,6 +114,11 @@
             <artifactId>bcprov-framework-ext</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>bcutil-framework-ext</artifactId>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -122,7 +127,7 @@
                 <plugin>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>karaf-plugin</artifactId>
-                    <version>8.1.0-SNAPSHOT</version>
+                    <version>9.0.4-SNAPSHOT</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -149,9 +154,9 @@
                                 <artifactItem>
                                     <groupId>org.opendaylight.odlparent</groupId>
                                     <artifactId>karaf.branding</artifactId>
-                                    <version>8.1.0-SNAPSHOT</version>
+                                    <version>9.0.4-SNAPSHOT</version>
                                     <outputDirectory>target/assembly/lib</outputDirectory>
-                                    <destFileName>karaf.branding-8.1.0-SNAPSHOT.jar</destFileName>
+                                    <destFileName>karaf.branding-9.0.4-SNAPSHOT.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                             <silent>true</silent>
@@ -262,15 +267,14 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <!-- FIXME: remove this once we have karaf-4.3.0+ -->
-                        <id>remove-scr-2.1.20</id>
+                        <id>remove-system-bc</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <target>
-                                <delete dir="${project.build.directory}/assembly/system/org/apache/felix/org.apache.felix.scr/2.1.20"
+                                <delete dir="${project.build.directory}/assembly/system/org/bouncycastle"
                                     includeemptydirs="true" failonerror="true"/>
                             </target>
                         </configuration>
@@ -308,7 +312,7 @@
                         <!-- Local feature if any -->
                         <feature>${karaf.localFeature}</feature>
                     </bootFeatures>
-                    <javase>1.8</javase>
+                    <javase>${maven.compiler.release}</javase>
                     <archiveTarGz>${karaf.archiveTarGz}</archiveTarGz>
                     <archiveZip>${karaf.archiveZip}</archiveZip>
                 </configuration>