Bump odlparent dependency to 2.0.0

This patch updates the dependency to 2.0.0.

and remove karaf3 related files.

Change-Id: I578d280d0525577ae27db44a747956d530409437
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9e376f32b14c11942358c1c97d5012bf268e923f..5dd67c03be5415b24cdd7290f4c50589fb9f7a64 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/features/production/features-neutron/pom.xml b/features/production/features-neutron/pom.xml
deleted file mode 100644 (file)
index 5406253..0000000
--- a/features/production/features-neutron/pom.xml
+++ /dev/null
@@ -1,168 +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>features-parent</artifactId>
-    <version>1.9.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.neutron</groupId>
-  <artifactId>features-neutron</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <properties>
-      <aaa.version>0.6.0-SNAPSHOT</aaa.version>
-      <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-      <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-      <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-      <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-      <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>
-      <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-  </properties>
-  <dependencyManagement>
-    <dependencies>
-      <!-- project specific dependencies -->
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>${netconf.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <type>xml</type>
-      <classifier>features</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa-shiro</artifactId>
-      <version>${aaa.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.moxy</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.persistence</groupId>
-      <artifactId>org.eclipse.persistence.antlr</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutron-spi</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>northbound-api</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>model</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>transcriber</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutron-logger</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>southbound-features</artifactId>
-      <version>${ovsdb.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>utils.mdsal-utils</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutron-hostconfig-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutron-hostconfig-ovs</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutron-hostconfig-vpp</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/NeutronNorthBound:Main</url>
-  </scm>
-</project>

diff --git a/features/production/features-neutron/src/main/features/features.xml b/features/production/features-neutron/src/main/features/features.xml
deleted file mode 100644 (file)
index 8ac4cd8..0000000
--- a/features/production/features-neutron/src/main/features/features.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="odl-neutron-${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.aaa/features-aaa-shiro/{{VERSION}}/xml/features</repository>
-   <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-   <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
-   <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-   <repository>mvn:org.opendaylight.ovsdb/southbound-features/{{VERSION}}/xml/features</repository>
-   <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-   <repository>mvn:org.opendaylight.netconf/features-netconf-connector/{{VERSION}}/xml/features</repository>
-
-   <feature name='odl-neutron-service' version='${project.version}' description="OpenDaylight :: Neutron :: API">
-     <feature version='${project.version}'>odl-neutron-spi</feature>
-     <feature version='${project.version}'>odl-neutron-northbound-api</feature>
-     <feature version='${project.version}'>odl-neutron-transcriber</feature>
-   </feature>
-
-   <feature name='odl-neutron-northbound-api' version='${project.version}' description="OpenDaylight :: Neutron :: Northbound">
-     <feature version='${aaa.version}'>odl-aaa-shiro</feature>
-     <feature>war</feature>
-     <feature version='${project.version}'>odl-neutron-spi</feature>
-     <bundle>mvn:org.opendaylight.neutron/northbound-api/{{VERSION}}</bundle>
-     <bundle>mvn:com.sun.jersey/jersey-core/{{VERSION}}</bundle>
-     <bundle>mvn:com.sun.jersey/jersey-server/{{VERSION}}</bundle>
-     <bundle>mvn:com.sun.jersey/jersey-servlet/{{VERSION}}</bundle>
-     <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.moxy/{{VERSION}}</bundle>
-     <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.core/{{VERSION}}</bundle>
-     <bundle>mvn:org.eclipse.persistence/org.eclipse.persistence.antlr/{{VERSION}}</bundle>
-     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-     <bundle>mvn:javax.validation/validation-api/{{VERSION}}</bundle>
-   </feature>
-   <feature name='odl-neutron-spi' version='${project.version}' description="OpenDaylight :: Neutron :: API">
-     <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
-     <bundle>mvn:org.opendaylight.neutron/neutron-spi/{{VERSION}}</bundle>
-     <bundle>mvn:commons-net/commons-net/{{VERSION}}</bundle>
-     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-     <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/{{VERSION}}</bundle>
-   </feature>
-   <feature name='odl-neutron-transcriber' version='${project.version}' description="OpenDaylight :: Neutron :: Implementation">
-     <feature version='${project.version}'>odl-neutron-northbound-api</feature>
-     <feature version='${project.version}'>odl-neutron-spi</feature>
-     <feature>war</feature>
-     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-     <bundle>mvn:org.opendaylight.neutron/transcriber/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
-     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-   </feature>
-   <feature name='odl-neutron-logger' version='${project.version}' description="OpenDaylight :: Neutron :: Logger">
-     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.neutron/neutron-logger/{{VERSION}}</bundle>
-     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-   </feature>
-   <feature name='odl-neutron-hostconfig-ovs' version='${project.version}' description="OpenDaylight :: Neutron :: HostconfigOvs">
-     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-     <feature version="${ovsdb.version}">odl-ovsdb-southbound-api</feature>
-     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.neutron/neutron-hostconfig-utils/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.neutron/neutron-hostconfig-ovs/{{VERSION}}</bundle>
-     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-   </feature>
-   <feature name='odl-neutron-hostconfig-vpp' version='${project.version}' description="OpenDaylight :: Neutron :: HostconfigVpp">
-     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-     <feature version="${netconf.version}">odl-netconf-clustered-topology</feature>
-     <bundle>mvn:org.opendaylight.neutron/model/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.neutron/neutron-hostconfig-utils/{{VERSION}}</bundle>
-     <bundle>mvn:org.opendaylight.neutron/neutron-hostconfig-vpp/{{VERSION}}</bundle>
-     <bundle>mvn:org.osgi/org.osgi.core/{{VERSION}}</bundle>
-     <configfile finalname="/etc/org.opendaylight.neutron.hostconfig.vpp.startup.cfg">mvn:org.opendaylight.neutron/neutron-hostconfig-vpp/{{VERSION}}/cfg/config</configfile>
-   </feature>
-</features>

diff --git a/features/production/features4-neutron/pom.xml b/features/production/features4-neutron/pom.xml
index cff7d84405b5ec8e9d5598b32376d1f8e86dc009..ea3a727b081b90ce39427ab0d3581d7d68c914fb 100644 (file)
--- a/features/production/features4-neutron/pom.xml
+++ b/features/production/features4-neutron/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/production/odl-neutron-hostconfig-ovs/pom.xml b/features/production/odl-neutron-hostconfig-ovs/pom.xml
index 377429bec43cade64e0d0abc150944584932f091..3b4c46eed39a4d7da7687c6bd7ce21d899982b0b 100644 (file)
--- a/features/production/odl-neutron-hostconfig-ovs/pom.xml
+++ b/features/production/odl-neutron-hostconfig-ovs/pom.xml
@@ -8,7 +8,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/production/odl-neutron-hostconfig-vpp/pom.xml b/features/production/odl-neutron-hostconfig-vpp/pom.xml
index 1b2b77f2d92d13d923e29daf57a8d4025f9a9a72..18d743c9e60c45c13c587cdbb99415e762488ed5 100644 (file)
--- a/features/production/odl-neutron-hostconfig-vpp/pom.xml
+++ b/features/production/odl-neutron-hostconfig-vpp/pom.xml
@@ -8,7 +8,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/production/odl-neutron-logger/pom.xml b/features/production/odl-neutron-logger/pom.xml
index ef8eaf4721201003a0e12a940a5cdc2f5f5d282d..b8571e9a5d10ec233bf1cf27075b71e127726312 100644 (file)
--- a/features/production/odl-neutron-logger/pom.xml
+++ b/features/production/odl-neutron-logger/pom.xml
@@ -8,7 +8,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/production/odl-neutron-northbound-api/pom.xml b/features/production/odl-neutron-northbound-api/pom.xml
index d7a8d6d0592393c57b146c356dd98b2437957ee9..82649b2931c458473e3299d34e94dc6680d40192 100644 (file)
--- a/features/production/odl-neutron-northbound-api/pom.xml
+++ b/features/production/odl-neutron-northbound-api/pom.xml
@@ -8,7 +8,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/production/odl-neutron-service/pom.xml b/features/production/odl-neutron-service/pom.xml
index 5636f2b8118171d809857ea090ab8fe9261528ae..00e420d33fa15fd15b1c56fafb93e36df2013f8b 100644 (file)
--- a/features/production/odl-neutron-service/pom.xml
+++ b/features/production/odl-neutron-service/pom.xml
@@ -8,7 +8,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/production/odl-neutron-spi/pom.xml b/features/production/odl-neutron-spi/pom.xml
index e70670593260da1c19d7aee4b8480461352ac7ed..a7acb1043dd38afc5abbf24567caa9170504dc1e 100644 (file)
--- a/features/production/odl-neutron-spi/pom.xml
+++ b/features/production/odl-neutron-spi/pom.xml
@@ -8,7 +8,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/production/odl-neutron-transcriber/pom.xml b/features/production/odl-neutron-transcriber/pom.xml
index 8f2b17cbbb1ccbedbf5d72b713593f3341cf2783..8b65a4089ad9521e27eecfbafdb83accfca2526e 100644 (file)
--- a/features/production/odl-neutron-transcriber/pom.xml
+++ b/features/production/odl-neutron-transcriber/pom.xml
@@ -8,7 +8,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/production/pom.xml b/features/production/pom.xml
index fc7aca940b8641a63cf65c45063c473372966754..231856b2f75bd017dcc8e5e9b0992a38af31f65e 100644 (file)
--- a/features/production/pom.xml
+++ b/features/production/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>
 
@@ -14,7 +14,6 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>features-neutron</module>
     <module>features4-neutron</module>
     <module>odl-neutron-spi</module>
     <module>odl-neutron-hostconfig-ovs</module>

diff --git a/features/test/features-neutron-test/pom.xml b/features/test/features-neutron-test/pom.xml
deleted file mode 100644 (file)
index ff19338..0000000
--- a/features/test/features-neutron-test/pom.xml
+++ /dev/null
@@ -1,35 +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>features-parent</artifactId>
-    <version>1.9.0</version>
-    <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.neutron</groupId>
-  <artifactId>features-neutron-test</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>features-neutron</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>neutron-logger</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/neutron.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/NeutronNorthBound:Main</url>
-  </scm>
-</project>

diff --git a/features/test/features-neutron-test/src/main/features/features.xml b/features/test/features-neutron-test/src/main/features/features.xml
deleted file mode 100644 (file)
index e1b2a44..0000000
--- a/features/test/features-neutron-test/src/main/features/features.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="odl-neutron-test-${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.neutron/features-neutron/{{VERSION}}/xml/features</repository>
-   <feature name='odl-neutron-neutron-logger-test' version='${project.version}' description="OpenDaylight :: Neutron :: Neutron Logger Test">
-    <feature version='${project.version}'>odl-neutron-service</feature>
-    <bundle>mvn:org.opendaylight.neutron/neutron-logger/{{VERSION}}</bundle>
-  </feature>
-</features>

diff --git a/features/test/features4-neutron-test/pom.xml b/features/test/features4-neutron-test/pom.xml
index d4f2497429784776083f6798bb3ae7c06d05ce78..d8d6f276c0fc08ae8bf41ecd17eade371f25c179 100644 (file)
--- a/features/test/features4-neutron-test/pom.xml
+++ b/features/test/features4-neutron-test/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/test/odl-neutron-logger-test/pom.xml b/features/test/odl-neutron-logger-test/pom.xml
index 4c26b8bd91b2f8ebbe18d2315facf204eaec06ce..b9a850be3ec0e0beab10424c0710c0e15049db48 100644 (file)
--- a/features/test/odl-neutron-logger-test/pom.xml
+++ b/features/test/odl-neutron-logger-test/pom.xml
@@ -8,7 +8,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/test/pom.xml b/features/test/pom.xml
index 17802a95a38c3f11a699677236811847e2d3a77c..c1ee4583f2738d82ddbff93c8ad72c3383956d52 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/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>
 
@@ -14,7 +14,6 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>features-neutron-test</module>
     <module>features4-neutron-test</module>
     <module>odl-neutron-logger-test</module>
   </modules>

diff --git a/karaf/pom.xml b/karaf/pom.xml
deleted file mode 100644 (file)
index ee792a3..0000000
--- a/karaf/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2014 Cisco Systems 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 INTERNAL
--->
-<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">
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.9.0</version>
-    <relativePath/>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.neutron</groupId>
-  <artifactId>neutron-karaf</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
-  <!-- <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 :: neutron :: ${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-  <properties>
-    <karaf.localFeature>odl-neutron-neutron-logger-test</karaf.localFeature>
-    <checkstyle.location>${project.parent.basedir}/src/main/resources</checkstyle.location>
-  </properties>
-  <dependencies>
-    <dependency>
-      <!-- scope is compile so all features (there is only one) are installed
-      into startup.properties and the feature repo itself is not installed -->
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>features-neutron-test</artifactId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <!-- DO NOT deploy the karaf artifact -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

diff --git a/karaf4/pom.xml b/karaf4/pom.xml
index d03288e53ea887fb934a849914892bef01691f6f..60a75cce62182970ad9999c0acdad3de6855340b 100644 (file)
--- a/karaf4/pom.xml
+++ b/karaf4/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/parent/pom.xml b/parent/pom.xml
index 5442d16742a6c6881ff47dbdbb531c89ed5e18a8..763693c6a07dae2d7b80b26af704a9aad70c3d69 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.9.0</version>
+    <version>2.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 56da3ae2010749abc2fd82942776892669d5eaf8..fcdf139e523874864c2c141ff2b70f2777ce3da1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,6 @@
     <module>artifacts</module>
     <module>features/production</module>
     <module>features/test</module>
-    <module>karaf</module>
     <module>karaf4</module>
     <module>integration/test</module>
     <module>model</module>