Migrate to odlparent 2.0.0

Change-Id: I7b7533e928a3265dfc72f00c21e8df6f0baffddc
Signed-off-by: Daniel Malachovsky <dmalacho@cisco.com>

diff --git a/features/features-dluxapps/pom.xml b/features/features-dluxapps/pom.xml
index a0aed352a0178f63561f5cc88c54b122e4d5eed8..f2fa75616b8e9d1b50a1a975bc2314c837654692 100644 (file)
--- a/features/features-dluxapps/pom.xml
+++ b/features/features-dluxapps/pom.xml
@@ -1,81 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.
+
+ This program and the accompanying materials are made available under the
+ 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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>features-parent</artifactId>
-        <version>1.9.0</version>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
+
     <groupId>org.opendaylight.dluxapps</groupId>
-    <artifactId>features-dluxapps</artifactId>
+    <artifactId>features4-dluxapps</artifactId>
     <version>0.6.0-SNAPSHOT</version>
+    <packaging>feature</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. -->
     <name>ODL :: dluxapps :: ${project.artifactId}</name>
-    <packaging>jar</packaging>
-
-    <properties>
-        <features.file>features.xml</features.file>
-        <dlux.version>0.6.0-SNAPSHOT</dlux.version>
-        <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    </properties>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>1.9.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>features-dlux</artifactId>
-            <version>${dlux.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>nodes-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-applications</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>sigmatopology-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-nodes</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>topology-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-topology</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>yangman-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-yangman</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>yangvisualizer-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-yangui</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>yangui-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-yangutils</artifactId>
             <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>yangutils-bundle</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dluxapps-yangvisualizer</artifactId>
             <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <version>${restconf.version}</version>
-            <classifier>features</classifier>
             <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
     </dependencies>
+
 </project>

diff --git a/features/features-dluxapps/src/main/features/features.xml b/features/features-dluxapps/src/main/features/features.xml
deleted file mode 100644 (file)
index 750b099..0000000
--- a/features/features-dluxapps/src/main/features/features.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="odl-dlux-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
-
-    <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-    <feature name='odl-dluxapps-applications' version='${project.version}' description="Opendaylight DluxApps all applications">
-        <feature>odl-dluxapps-nodes</feature>
-        <feature>odl-dluxapps-topology</feature>
-        <feature>odl-dluxapps-yangui</feature>
-        <feature>odl-dluxapps-yangvisualizer</feature>
-        <feature>odl-dluxapps-yangman</feature>
-    </feature>
-
-    <feature name="odl-dluxapps-nodes" version='${project.version}' description="Enable nodes in Opendaylight dlux">
-        <feature version="${dlux.version}">odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dluxapps/nodes-bundle/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-dluxapps-topology" version='${project.version}' description="Enable nodes in Opendaylight dlux">
-        <feature version="${dlux.version}">odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dluxapps/topology-bundle/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-dluxapps-yangui" version='${project.version}' description="Enable Yang UI in Opendaylight dlux">
-        <feature version="${dlux.version}">odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dluxapps/yangui-bundle/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dluxapps/yangutils-bundle/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dluxapps/sigmatopology-bundle/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-dluxapps-yangman" version='${project.version}' description="Enable Yangman in Opendaylight dlux">
-        <feature version="${dlux.version}">odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dluxapps/yangman-bundle/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dluxapps/yangutils-bundle/{{VERSION}}</bundle>
-    </feature>
-
-       <feature name="odl-dluxapps-yangvisualizer" version='${project.version}' description="Enable Yang visualizer in Opendaylight dlux">
-        <feature>odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dluxapps/yangvisualizer-bundle/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dluxapps/yangutils-bundle/{{VERSION}}</bundle>
-               <bundle>mvn:org.opendaylight.dluxapps/sigmatopology-bundle/{{VERSION}}</bundle>
-    </feature>
-
-    <feature name="odl-dluxapps-yangutils" version='${project.version}' description="Loads Yangutils library in Opendaylight dlux">
-        <feature version="${dlux.version}">odl-dlux-core</feature>
-        <bundle>mvn:org.opendaylight.dluxapps/yangutils-bundle/{{VERSION}}</bundle>
-    </feature>
-
-</features>

diff --git a/features/features4-dluxapps/pom.xml b/features/features4-dluxapps/pom.xml
deleted file mode 100644 (file)
index 283f8a2..0000000
--- a/features/features4-dluxapps/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- 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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.dluxapps</groupId>
-    <artifactId>features4-dluxapps</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-    <packaging>feature</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. -->
-    <name>ODL :: dluxapps :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-applications</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-nodes</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-topology</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-yangman</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-yangui</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-yangutils</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dluxapps-yangvisualizer</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/features/odl-dluxapps-applications/pom.xml b/features/odl-dluxapps-applications/pom.xml
index 17721b25e892f8f9b36c9702a377b5e3fac77086..030b7ac045f0d30273b6cf59a515f298af0dc55e 100644 (file)
--- a/features/odl-dluxapps-applications/pom.xml
+++ b/features/odl-dluxapps-applications/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dluxapps-nodes/pom.xml b/features/odl-dluxapps-nodes/pom.xml
index 54440a868cb929c3234644a50c0f2f0973b52f2b..672a6a317ccfe4b51c8fddd25e3e285b3018581e 100644 (file)
--- a/features/odl-dluxapps-nodes/pom.xml
+++ b/features/odl-dluxapps-nodes/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dluxapps-topology/pom.xml b/features/odl-dluxapps-topology/pom.xml
index 98372a7ed3913017a062ad469ed75d83556653c8..5796edc2869cc2cf98b92b7c7bc4813848659bf7 100644 (file)
--- a/features/odl-dluxapps-topology/pom.xml
+++ b/features/odl-dluxapps-topology/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dluxapps-yangman/pom.xml b/features/odl-dluxapps-yangman/pom.xml
index 7bd6bbe945ec6623d88f0c55b34f69cc31ffaa5f..2a743ba9667bf60d144a8cb527a41f5323cd5a29 100644 (file)
--- a/features/odl-dluxapps-yangman/pom.xml
+++ b/features/odl-dluxapps-yangman/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dluxapps-yangui/pom.xml b/features/odl-dluxapps-yangui/pom.xml
index 24057163d7197845e331923e4226e261b170a7fc..fe56512415f35f145cdd7925812533466182399c 100644 (file)
--- a/features/odl-dluxapps-yangui/pom.xml
+++ b/features/odl-dluxapps-yangui/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dluxapps-yangutils/pom.xml b/features/odl-dluxapps-yangutils/pom.xml
index 2d9594e0f5fa622f2a135e3ddc3aa5ef63023ce0..55bd07e0033bfe0f433e135f5306a9c4002ab15f 100644 (file)
--- a/features/odl-dluxapps-yangutils/pom.xml
+++ b/features/odl-dluxapps-yangutils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-dluxapps-yangvisualizer/pom.xml b/features/odl-dluxapps-yangvisualizer/pom.xml
index 86bcafd26f30ecc27334ac493e3ebd39bc76e9e1..daf31e33454403f8d8f5cc8c3bce4a3938cc4a35 100644 (file)
--- a/features/odl-dluxapps-yangvisualizer/pom.xml
+++ b/features/odl-dluxapps-yangvisualizer/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index b63574de913b36b6a53b28cdc25c0da7ccf46a2f..97e3ab7aed509fe19e97042df392654b3ca9246c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.dluxapps</groupId>
@@ -25,7 +25,6 @@
 
     <modules>
         <module>features-dluxapps</module>
-        <module>features4-dluxapps</module>
         <module>odl-dluxapps-applications</module>
         <module>odl-dluxapps-nodes</module>
         <module>odl-dluxapps-topology</module>

diff --git a/pom.xml b/pom.xml
index 5ad027296e71803b01cbe6204a8ef350ed3c990c..a6a1b25575acac9e3ddc938b926083cf6d6aa771 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>