Use Karaf 4 and ODLparent 2.0 migration

- Use Karaf 4 for the distribution
- Migrate ODLParent to version 2.0

Change-Id: I771d780edfab79def68a10fa1e4821e06a84ea58
Signed-off-by: Mufaddal Makati <m.makati@cablelabs.com>

diff --git a/features-packetcable-policy/features-packetcable-policy/pom.xml b/features-packetcable-policy/features-packetcable-policy/pom.xml
deleted file mode 100644 (file)
index 96811fc..0000000
--- a/features-packetcable-policy/features-packetcable-policy/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 CableLabs, 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>features-parent</artifactId>
-        <version>1.9.0</version>
-        <relativePath />
-    </parent>
-    <artifactId>features-packetcable-policy</artifactId>
-    <groupId>org.opendaylight.packetcable</groupId>
-    <name>${project.artifactId}</name>
-    <version>1.6.0-SNAPSHOT</version>
-    <properties>
-        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-        <mdsal.version>1.6.0-SNAPSHOT</mdsal.version>
-        <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-        <feature.test.version>1.9.0</feature.test.version>
-        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <version>${yangtools.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <version>${mdsal.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.mdsal.model</groupId>
-          <artifactId>features-mdsal-model</artifactId>
-          <version>${mdsal.model.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-          <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <classifier>features</classifier>
-            <version>${restconf.version}</version>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.packetcable</groupId>
-          <artifactId>packetcable-policy-server</artifactId>
-          <version>${project.version}</version>
-          <classifier>config</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>packetcable-policy-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>packetcable-policy-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>packetcable-driver</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${feature.test.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features-packetcable-policy/features-packetcable-policy/src/main/features/features.xml b/features-packetcable-policy/features-packetcable-policy/src/main/features/features.xml
deleted file mode 100644 (file)
index 2ea8684..0000000
--- a/features-packetcable-policy/features-packetcable-policy/src/main/features/features.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 CableLabs, 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
--->
-<features name="odl-packetcable-${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-mdsal/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
-    <feature name='odl-packetcable-policy-server-all' version='${project.version}'
-        description='OpenDaylight :: packetcable :: policy :: All'>
-        <feature version='${project.version}'>odl-packetcable-policy-server</feature>
-    </feature>
-    <feature name='odl-packetcable-policy-model' version='${project.version}'
-        description='OpenDaylight :: packetcable :: policy :: Model'>
-        <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-        <bundle>mvn:org.opendaylight.packetcable/packetcable-policy-model/{{VERSION}}</bundle>
-    </feature>
-    <feature name='odl-packetcable-policy-server' version='${project.version}'
-        description='OpenDaylight :: packetcable :: policy :: Provider'>
-        <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-        <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-        <feature version='${project.version}'>odl-packetcable-policy-model</feature>
-        <bundle>mvn:org.opendaylight.packetcable/packetcable-policy-server/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.packetcable/packetcable-driver/{{VERSION}}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/80-packetcable.xml">mvn:org.opendaylight.packetcable/packetcable-policy-server/{{VERSION}}/xml/config</configfile>
-    </feature>
-</features>

diff --git a/features-packetcable-policy/features4-packetcable-policy/pom.xml b/features-packetcable-policy/features4-packetcable-policy/pom.xml
index d1793d77e3d73d4210c2a9ae36e46d32fde2d2b3..d215c14e7df9c21100b09fd5f246f1ade6a290bb 100644 (file)
--- a/features-packetcable-policy/features4-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/features4-packetcable-policy/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
     </parent>
     
     <groupId>org.opendaylight.packetcable</groupId>

diff --git a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
index 6ff1bc73212f946fcb659952b7e75f50936e911b..0a90ba10efcbb18e2f2f1b3b5d40e178ac474440 100644 (file)
--- a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-model/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-packetcable-policy/odl-packetcable-policy-server-all/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
index 7b750388c88a79a0b68f9d78f5c61f5ac1676dc7..e6465f2a378e89260cd8af004d2ba17f7e3b9b2f 100644 (file)
--- a/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-server-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-packetcable-policy/odl-packetcable-policy-server/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
index 00a9707327e138368349797774c63b5357beff6a..887ae0b89c0eeb1159bc200d3d20429c7c05d5c7 100644 (file)
--- a/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-server/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-packetcable-policy/pom.xml b/features-packetcable-policy/pom.xml
index 4d52cb2554fbdddf47b835e85b40d60c2fadfc07..cf9d2b51de7edf1a6784276cde0b82e3e7dded63 100644 (file)
--- a/features-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/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>
     <artifactId>features-packetcable-policy-aggregator</artifactId>
@@ -21,7 +21,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>features-packetcable-policy</module>
         <module>features4-packetcable-policy</module>
         <module>odl-packetcable-policy-model</module>
         <module>odl-packetcable-policy-server</module>

diff --git a/packetcable-policy-karaf/pom.xml b/packetcable-policy-karaf/pom.xml
index a221e2180c2d9802374900177334be2915fa4658..98a88e19840a3072ede77629e1605f6ac224e5db 100644 (file)
--- a/packetcable-policy-karaf/pom.xml
+++ b/packetcable-policy-karaf/pom.xml
@@ -4,17 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>karaf-parent</artifactId>
-        <version>1.9.0</version>
+        <artifactId>karaf4-parent</artifactId>
+        <version>2.0.0</version>
         <relativePath />
     </parent>
     <artifactId>packetcable-policy-karaf</artifactId>
     <groupId>org.opendaylight.packetcable</groupId>
     <name>${project.artifactId}</name>
     <version>1.6.0-SNAPSHOT</version>
-    <prerequisites>
-        <maven>3.1.1</maven>
-    </prerequisites>
+
     <properties>
         <karaf.localFeature>odl-packetcable-policy-server-all</karaf.localFeature>
     </properties>
@@ -26,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.packetcable</groupId>
-            <artifactId>features-packetcable-policy</artifactId>
+            <artifactId>features4-packetcable-policy</artifactId>
             <classifier>features</classifier>
             <version>${project.version}</version>
             <type>xml</type>

diff --git a/pom.xml b/pom.xml
index 5ec4382c9efccf2b5119ca7bc95b62401e9fdb31..0a11e345052a7c8d5d3164e1eb0948ad8d4c977a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.packetcable</groupId>