Upgrade to odlparent 2.0.2

[integration/distribution.git] / artifacts / distribution / pom.xml

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 8771d54e15287a7e10ff78ce67276985c37a90e3..082a41d64be9d76beaa47c3967448a4241878da3 100644 (file)
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -7,17 +7,19 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.8.0-SNAPSHOT</version>
+      <version>2.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>distribution-artifacts</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -38,8 +40,9 @@
         <tag>HEAD</tag>
     </scm>
     <dependencyManagement>
+        <!-- TODO: Hardcode versions when moving to semantic versioning. -->
         <dependencies>
-            <!-- Version -->
+            <!-- Version artifacts. -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>version</artifactId>
@@ -52,7 +55,29 @@
                 <type>xml</type>
                 <classifier>config</classifier>
             </dependency>
-            <!-- Karaf 3 features -->
+            <!-- Karaf 4 single features. -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-distribution-version</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-integration-compatible-with-all</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-integration-all</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <!-- Karaf 4 feature repositories. -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-distribution</artifactId>
@@ -62,14 +87,14 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-integration-index</artifactId>
+                <artifactId>features-index</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>features-integration-test</artifactId>
+                <artifactId>features-test</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>