From 7e8e7b82d01ad684b3260c12cde7cb68f087d6fe Mon Sep 17 00:00:00 2001
From: Jozef Bacigal <jozef.bacigal@pantheon.tech>
Date: Thu, 22 Jun 2017 10:23:42 +0200
Subject: [PATCH] Bump to odlparent 2.0.0

Change-Id: I9ec83c0f0e28f22185ffa0c50a055a6daa951fa6
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             |   2 +-
 features/features-openflowjava/pom.xml        | 165 +-----------------
 .../src/main/features/features.xml            |  30 ----
 features/features4-openflowjava/pom.xml       |  36 ----
 features/odl-openflowjava-all/pom.xml         |   2 +-
 features/odl-openflowjava-protocol/pom.xml    |   2 +-
 features/pom.xml                              |   3 +-
 parent/pom.xml                                |   2 +-
 8 files changed, 14 insertions(+), 228 deletions(-)
 delete mode 100644 features/features-openflowjava/src/main/features/features.xml
 delete mode 100644 features/features4-openflowjava/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index bcf62e1f..54204e90 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
diff --git a/features/features-openflowjava/pom.xml b/features/features-openflowjava/pom.xml
index 09d56933..036501c4 100644
--- a/features/features-openflowjava/pom.xml
+++ b/features/features-openflowjava/pom.xml
@@ -3,180 +3,33 @@
   <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.openflowjava</groupId>
   <artifactId>features-openflowjava</artifactId>
   <version>0.10.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <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 :: openflowjava :: ${project.artifactId}</name>
 
-  <properties>
-    <config.version>0.7.0-SNAPSHOT</config.version>
-    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-    <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <!-- This project -->
-      <dependency>
-        <groupId>org.opendaylight.openflowjava</groupId>
-        <artifactId>openflowjava-artifacts</artifactId>
-        <version>${project.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <!-- This project -->
-      <dependency>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-artifacts</artifactId>
-        <version>1.9.0</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <!-- MD-SAL -->
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>${mdsal.model.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <!-- Controller infrastructure -->
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${config.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-
   <dependencies>
-    <!-- feature dependencies -->
     <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-config</artifactId>
-      <classifier>features</classifier>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-openflowjava-all</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${controller.mdsal.version}</version>
       <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.odlparent</groupId>
-      <artifactId>features-odlparent</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-
-    <!-- bundle dependencies -->
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflow-protocol-impl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflowjava-blueprint-config</artifactId>
-      <type>xml</type>
-      <classifier>config</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflowjava-blueprint-config</artifactId>
-      <type>xml</type>
-      <classifier>legacyConfig</classifier>
-    </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.openflowjava</groupId>
-      <artifactId>openflowjava-util</artifactId>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>openflowjava-config</artifactId>
+      <artifactId>odl-openflowjava-protocol</artifactId>
+      <version>${project.version}</version>
       <type>xml</type>
-      <classifier>configstats</classifier>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-handler</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-buffer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-      <!-- Explicitly bring in the linux classifier, test may fail on 32-bit linux -->
-      <classifier>linux-x86_64</classifier>
+      <classifier>features</classifier>
     </dependency>
   </dependencies>
 
diff --git a/features/features-openflowjava/src/main/features/features.xml b/features/features-openflowjava/src/main/features/features.xml
deleted file mode 100644
index f1b58ba6..00000000
--- a/features/features-openflowjava/src/main/features/features.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="odl-openflowjava-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
-    <feature name='odl-openflowjava-all' description="OpenDaylight :: Openflow Java :: All">
-        <feature version='${project.version}'>odl-openflowjava-protocol</feature>
-    </feature>
-    <feature name='odl-openflowjava-protocol' version='${project.version}' description="OpenDaylight :: Openflow Java :: Protocol">
-        <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
-        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-        <feature version='${config.version}'>odl-config-api</feature>
-        <feature version='${controller.mdsal.version}'>odl-mdsal-common</feature>
-        <feature version='[4.0.30,5.0.0)'>odl-netty</feature>
-        <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-api/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-spi/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.openflowjava/openflow-protocol-impl/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.openflowjava/openflowjava-util/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.openflowjava/openflowjava-blueprint-config/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/45-openflowjava-stats.xml">mvn:org.opendaylight.openflowjava/openflowjava-config/${project.version}/xml/configstats</configfile>
-        <configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowjava/openflowjava-blueprint-config/${project.version}/xml/config</configfile>
-        <configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowjava/openflowjava-blueprint-config/${project.version}/xml/legacyConfig</configfile>
-    </feature>
-</features>
\ No newline at end of file
diff --git a/features/features4-openflowjava/pom.xml b/features/features4-openflowjava/pom.xml
deleted file mode 100644
index 11f44198..00000000
--- a/features/features4-openflowjava/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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>feature-repo-parent</artifactId>
-    <version>1.9.0</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.openflowjava</groupId>
-  <artifactId>features4-openflowjava</artifactId>
-  <version>0.10.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 :: openflowjava :: ${project.artifactId}</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-openflowjava-all</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>odl-openflowjava-protocol</artifactId>
-      <version>${project.version}</version>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/features/odl-openflowjava-all/pom.xml b/features/odl-openflowjava-all/pom.xml
index 38f886c6..38d7c4fe 100644
--- a/features/odl-openflowjava-all/pom.xml
+++ b/features/odl-openflowjava-all/pom.xml
@@ -7,7 +7,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-openflowjava-protocol/pom.xml b/features/odl-openflowjava-protocol/pom.xml
index 5779f1c9..9092873c 100644
--- a/features/odl-openflowjava-protocol/pom.xml
+++ b/features/odl-openflowjava-protocol/pom.xml
@@ -7,7 +7,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 2c07ddc6..44633fb4 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 
@@ -18,7 +18,6 @@
 
   <modules>
     <module>features-openflowjava</module>
-    <module>features4-openflowjava</module>
     <module>odl-openflowjava-protocol</module>
     <module>odl-openflowjava-all</module>
   </modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 418743ef..4238e080 100644
--- a/parent/pom.xml
+++ b/parent/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/>
     </parent>
 
-- 
2.36.6