X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fkaraf4-parent%2Fpom.xml;h=10b4fb1324500c77ba13e68e365e9b174e2f56f9;hb=939bd7884a0f9a358bd3a2bc36d3a7b73a330d42;hp=c044f7d05044642c393ce136db08a0205c3625ae;hpb=8d9be3ff35e9d3b0ba9c9754ec6cc26f3676a3cb;p=odlparent.git

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index c044f7d05..10b4fb132 100644
--- 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>4.0.10-SNAPSHOT</version>
+        <version>9.0.4-SNAPSHOT</version>
         <relativePath>../../odlparent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>4.0.10-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>4.0.10-SNAPSHOT</version>
+                    <version>9.0.4-SNAPSHOT</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -139,7 +144,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy</id>
+                        <id>apply-branding</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -149,11 +154,12 @@
                                 <artifactItem>
                                     <groupId>org.opendaylight.odlparent</groupId>
                                     <artifactId>karaf.branding</artifactId>
-                                    <version>4.0.10-SNAPSHOT</version>
+                                    <version>9.0.4-SNAPSHOT</version>
                                     <outputDirectory>target/assembly/lib</outputDirectory>
-                                    <destFileName>karaf.branding-3.0.0-SNAPSHOT.jar</destFileName>
+                                    <destFileName>karaf.branding-9.0.4-SNAPSHOT.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
+                            <silent>true</silent>
                         </configuration>
                     </execution>
                     <execution>
@@ -169,6 +175,7 @@
                             <excludes>META-INF\/**</excludes>
                             <excludeTransitive>true</excludeTransitive>
                             <ignorePermissions>false</ignorePermissions>
+                            <silent>true</silent>
                         </configuration>
                     </execution>
                     <execution>
@@ -259,13 +266,25 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>remove-system-bc</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <delete dir="${project.build.directory}/assembly/system/org/bouncycastle"
+                                    includeemptydirs="true" failonerror="true"/>
+                            </target>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <!-- Revert to ${karaf.version} once the POM deployment issue is fixed -->
-                <version>4.2.1</version>
+                <version>${karaf.version}</version>
                 <executions>
                     <execution>
                         <id>process-resources</id>
@@ -289,10 +308,11 @@
                         <feature>standard</feature>
                         <!-- Features always assumed to be present. Keep in sync with feature parent exclusions. -->
                         <feature>ssh</feature>
+                        <feature>scr</feature>
                         <!-- 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>