Bump odlparent to 2.0.0

Change-Id: I4f054217ce3dbfc068925938fcb613e04a51868b
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>

diff --git a/features/features-dlux/pom.xml b/features/features-dlux/pom.xml
index f86b308be75df2f7facbd9b3e05e533a2b3b5489..24284160e9be06435420e1ae568f699a25ad0ebe 100644 (file)
--- a/features/features-dlux/pom.xml
+++ b/features/features-dlux/pom.xml
@@ -1,86 +1,36 @@
 <?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" 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>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.dlux</groupId>
-  <artifactId>features-dlux</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
-  <name>DLUX - Features </name>
-  <packaging>jar</packaging>
+<!--
+ Copyright © 2017 Red Hat, Inc. and others.  All rights reserved.
 
-  <properties>
-    <features.file>features.xml</features.file>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-  </properties>
+ 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>2.0.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.dlux</groupId>
+    <artifactId>features-dlux</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-dlux-core</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
 
-  <dependencies>
-      <dependency>
-         <groupId>org.opendaylight.odlparent</groupId>
-         <artifactId>features-test</artifactId>
-         <version>1.9.0</version>
-      </dependency>
-      <dependency>
-         <groupId>org.opendaylight.odlparent</groupId>
-         <artifactId>opendaylight-karaf-empty</artifactId>
-         <version>1.9.0</version>
-         <type>zip</type>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>loader</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>loader.implementation</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.core</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.common.layout</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.common.login</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.common.authentication</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.common.navigation</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.common.topbar</artifactId>
-          <version>${project.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.opendaylight.dlux</groupId>
-          <artifactId>dlux.common.general</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>
-      </dependency>
-  </dependencies>
 </project>

diff --git a/features/features-dlux/src/main/features/features.xml b/features/features-dlux/src/main/features/features.xml
deleted file mode 100644 (file)
index b02f1b9..0000000
--- a/features/features-dlux/src/main/features/features.xml
+++ /dev/null
@@ -1,23 +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.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-
-    <feature name='odl-dlux-core' version='${project.version}' description="Opendaylight dlux minimal feature">
-        <feature>http</feature>
-        <feature version="${restconf.version}">odl-restconf</feature>
-        <bundle>mvn:org.opendaylight.dlux/loader/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/loader.implementation/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.core/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.login/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.authentication/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.navigation/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.topbar/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.dlux/dlux.common.general/{{VERSION}}</bundle>
-        <bundle start-level="90">mvn:org.opendaylight.dlux/dlux.common.layout/{{VERSION}}</bundle>
-    </feature>
-
-</features>

diff --git a/features/features4-dlux/pom.xml b/features/features4-dlux/pom.xml
deleted file mode 100644 (file)
index eb58e48..0000000
--- a/features/features4-dlux/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 Red Hat, Inc. and others.  All rights reserved.
-
- 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.dlux</groupId>
-    <artifactId>features4-dlux</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-dlux-core</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/features/odl-dlux-core/pom.xml b/features/odl-dlux-core/pom.xml
index 8fe36535e4864ea94963696e507f02a9b5e77a36..4fcf21c67bca10ce5e5a821b0b241b0e1ee871d4 100644 (file)
--- a/features/odl-dlux-core/pom.xml
+++ b/features/odl-dlux-core/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 1827a06bb29b816082d7a1813052c3575093d44c..8b0db2c5cf929e3afbab2809340ce915d7122da6 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.dlux</groupId>
@@ -23,7 +23,6 @@
 
     <modules>
         <module>features-dlux</module>
-        <module>features4-dlux</module>
         <module>odl-dlux-core</module>
     </modules>
 

diff --git a/pom.xml b/pom.xml
index fdb93b6491bdb460e7be8c024ef4ecd21972eff5..f8a475c56dd64596b862e2ec832d3eb166f746a2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath></relativePath>
   </parent>