Bump odlparent for next dev cycle

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

diff --git a/karaf/karaf-parent/pom.xml b/karaf/karaf-parent/pom.xml
index 99b0eb14bb2800b6b2812f375a9ec5017f2d447c..c4835abe85681665183e03ed80aa3bd5a1979cfc 100644 (file)
--- a/karaf/karaf-parent/pom.xml
+++ b/karaf/karaf-parent/pom.xml
@@ -11,15 +11,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.9.1-SNAPSHOT</version>
+    <relativePath>../../odlparent</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>karaf-parent</artifactId>
   <packaging>pom</packaging>
+  <name>ODL :: odlparent :: ${project.artifactId}</name>
 
   <properties>
-    <branding.version>1.7.0-SNAPSHOT</branding.version>
-    <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
+    <branding.version>1.9.1-SNAPSHOT</branding.version>
     <karaf.localFeature>standard</karaf.localFeature>
     <!--  Karaf Maven plugin 3.0.3 reinstalls already installed
           boot features to container, which could be observed
@@ -89,12 +90,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>opendaylight-karaf-resources</artifactId>
-      <version>${karaf.resources.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>karaf.branding</artifactId>
-      <version>${branding.version}</version>
+      <version>1.9.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Aries Proxy 1.0.5 contains important bug fixes -->
@@ -338,23 +334,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <overWriteSnapshots>true</overWriteSnapshots>
               </configuration>
             </execution>
-            <execution>
-              <id>copy-dependencies</id>
-              <phase>prepare-package</phase>
-              <goals>
-                <goal>copy-dependencies</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
-                <excludeArtifactIds>distribution.vtn-coordinator</excludeArtifactIds>
-                <overWriteReleases>false</overWriteReleases>
-                <overWriteSnapshots>true</overWriteSnapshots>
-                <overWriteIfNewer>true</overWriteIfNewer>
-                <useRepositoryLayout>true</useRepositoryLayout>
-                <addParentPoms>true</addParentPoms>
-                <copyPom>true</copyPom>
-              </configuration>
-            </execution>
           </executions>
         </plugin>
         <plugin>
@@ -412,29 +391,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             </execution>
           </executions>
         </plugin>
+        <plugin>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>karaf-plugin</artifactId>
+            <version>1.9.1-SNAPSHOT</version>
+            <executions>
+                <execution>
+                    <id>populate-local-repo</id>
+                    <goals>
+                        <goal>populate-local-repo</goal>
+                    </goals>
+                    <configuration>
+                        <localRepo>${project.build.directory}/assembly/system</localRepo>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>${enforcer.version}</version>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>3.1.1</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
       </plugin>
@@ -454,6 +429,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>karaf-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>