Bug 6051: Temporarly disable Neutron in build

The Neutron project deprecated the I*Aware interfaces during Beryllium
and is removing them now in Boron. Until migration is finished, disable
our Neutron service in the build.

Change-Id: I7a63d0055b84a3d6f6ef5ffe3fb8423e658a0ad7
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index ae6624e6c78dcba59c5ec276700e8261a0847355..ead6c3af4fc6fee3141531fa5ce240f7090a4848 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -49,11 +49,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>mappingservice.mapcache</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <!--
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>mappingservice.neutron</artifactId>
         <version>${project.version}</version>
       </dependency>
+      -->
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>mappingservice.shell</artifactId>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index cdd3488ccabb702e7ab7dbddca260fcd065c3f1c..61831c2df95fe4446d1c87aded8ff0b8c4cba917 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -191,11 +191,13 @@
         <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
+      <!--
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.neutron</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
+      -->
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.northbound</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index c7c1ed59912fbd52efefc8e2ec6b5eebef2ddcb8..4d567aae620bdaa5e9bd2e73d4c6bbc99fa98f23 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -135,11 +135,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
+    <!--
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.neutron</artifactId>
       <version>${project.version}</version>
     </dependency>
+    -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.shell</artifactId>
@@ -155,6 +157,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>lispflowmapping-ui-bundle</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!--
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
@@ -162,6 +165,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    -->
   </dependencies>
 
   <!--

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 0b92ebb7e466f85df9ac51b0f161baacd50704d8..caf1ee6197db5eaf62b441b2e5f9836b8e5f6f57 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -18,7 +18,9 @@
     <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
     <!-- Needed for odl-config-api -->
     <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
+    <!--
     <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
+    -->
     <repository>mvn:org.opendaylight.dlux/features-dlux/{{VERSION}}/xml/features</repository>
 
     <feature name="odl-lispflowmapping-msmr" description="OpenDaylight :: LISP Flow Mapping :: Map-Server/Map-Resolver" version='${project.version}'>
@@ -66,11 +68,13 @@
         </configfile>
     </feature>
 
+    <!--
     <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
         <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/{{VERSION}}</bundle>
     </feature>
+    -->
 
     <feature name="odl-lispflowmapping-ui" description="OpenDaylight :: LISP Flow Mapping :: User Interface" version='${project.version}'>
         <feature version="${dlux.core.version}">odl-dlux-core</feature>

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index bfb25a03222ec3204a14b3a1391ff2560de310a2..8e9c67d896295094238d5a9aacac5c96b0d22a66 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -23,7 +23,9 @@
     <module>mapcache</module>
     <module>implementation</module>
     <module>southbound</module>
+    <!--
     <module>neutron</module>
+    -->
     <module>shell</module>
   </modules>
 
@@ -69,11 +71,13 @@
         <scope>test</scope>
       </dependency>
       -->
+      <!--
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>neutron-spi</artifactId>
         <version>0.7.0-SNAPSHOT</version>
       </dependency>
+      -->
     </dependencies>
   </dependencyManagement>