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 5ccef027e1e89593ffdcacfd15476b318adfe65c..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>6.0.3-SNAPSHOT</version>
+        <version>9.0.4-SNAPSHOT</version>
         <relativePath>../../odlparent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>6.0.3-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>6.0.3-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>6.0.3-SNAPSHOT</version>
+                                    <version>9.0.4-SNAPSHOT</version>
                                     <outputDirectory>target/assembly/lib</outputDirectory>
-                                    <destFileName>karaf.branding-3.0.3-SNAPSHOT.jar</destFileName>
+                                    <destFileName>karaf.branding-9.0.4-SNAPSHOT.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                             <silent>true</silent>
@@ -195,38 +200,6 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                         </configuration>
                     </execution>
-                    <execution>
-                        <!-- Override karaf-4.2.6+ use of pax-logging-1.10.2+ -->
-                        <id>add-pax-logging-1.10.1</id>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <phase>prepare-package</phase>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-api</artifactId>
-                                    <version>1.10.1</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-api/1.10.1</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-logback</artifactId>
-                                    <version>1.10.1</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback/1.10.1</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.ops4j.pax.logging</groupId>
-                                    <artifactId>pax-logging-log4j2</artifactId>
-                                    <version>1.10.1</version>
-                                    <outputDirectory>${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-log4j2/1.10.1</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWriteReleases>true</overWriteReleases>
-                            <overWriteSnapshots>true</overWriteSnapshots>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -294,19 +267,15 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>remove-pax-logging-1.10.2</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/ops4j/pax/logging/pax-logging-api/1.10.2"
-                                    includeemptydirs="true"/>
-                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback/1.10.2"
-                                    includeemptydirs="true"/>
-                                <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-log4j2/1.10.2"
-                                    includeemptydirs="true"/>
+                                <delete dir="${project.build.directory}/assembly/system/org/bouncycastle"
+                                    includeemptydirs="true" failonerror="true"/>
                             </target>
                         </configuration>
                     </execution>
@@ -339,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>