Bump versions to 6.0.3-SNAPSHOT

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

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index 6ba3e5359e7c0255f647dd6f562b1726d081e73f..5ccef027e1e89593ffdcacfd15476b318adfe65c 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.0-SNAPSHOT</version>
+        <version>6.0.3-SNAPSHOT</version>
         <relativePath>../../odlparent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
+    <version>6.0.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
@@ -122,7 +122,7 @@
                 <plugin>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>karaf-plugin</artifactId>
-                    <version>6.0.0-SNAPSHOT</version>
+                    <version>6.0.3-SNAPSHOT</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -139,7 +139,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy</id>
+                        <id>apply-branding</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -149,11 +149,12 @@
                                 <artifactItem>
                                     <groupId>org.opendaylight.odlparent</groupId>
                                     <artifactId>karaf.branding</artifactId>
-                                    <version>6.0.0-SNAPSHOT</version>
+                                    <version>6.0.3-SNAPSHOT</version>
                                     <outputDirectory>target/assembly/lib</outputDirectory>
-                                    <destFileName>karaf.branding-3.0.0-SNAPSHOT.jar</destFileName>
+                                    <destFileName>karaf.branding-3.0.3-SNAPSHOT.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
+                            <silent>true</silent>
                         </configuration>
                     </execution>
                     <execution>
@@ -169,6 +170,7 @@
                             <excludes>META-INF\/**</excludes>
                             <excludeTransitive>true</excludeTransitive>
                             <ignorePermissions>false</ignorePermissions>
+                            <silent>true</silent>
                         </configuration>
                     </execution>
                     <execution>
@@ -193,6 +195,38 @@
                             <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>
@@ -259,13 +293,29 @@
                             </target>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>remove-pax-logging-1.10.2</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"/>
+                            </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>