Fix to features to fix problem breaking autorelease.

Currently plugin2oc is using base-features... this is an
old (no longer used) name for what became
features-base.

Because features-base is no longer in controller, when we build
non-SNAPSHOT features in autorelease, this breaks plugin2oc.

The reason this was not seen outside of autorelease, is because
there are still ancient SNAPSHOT artifacts for base-features
in nexus.

Change-Id: I3eacbf464c9fd4899c72b9bb23e1e610a75944a8
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 8e33553bbc50e09ab149e0d51619f8160c80e6f1..d8a6e88c2bcca2eeaf122ddce37e4058f73503b3 100755 (executable)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -44,7 +44,7 @@
       </dependency>\r
     <dependency>\r
         <groupId>org.opendaylight.controller</groupId>\r
-        <artifactId>base-features</artifactId>\r
+        <artifactId>features-base</artifactId>\r
         <version>1.4.2-SNAPSHOT</version>\r
         <classifier>features</classifier>\r
         <type>xml</type>\r

diff --git a/features-plugin2oc/pom.xml b/features-plugin2oc/pom.xml
index da89b94946c15d8ade6472dac7be3420d47504ee..cf4349004e8de5d57853ff8fb7020b4b73ae2675 100755 (executable)
--- a/features-plugin2oc/pom.xml
+++ b/features-plugin2oc/pom.xml
@@ -49,7 +49,7 @@
         </dependency>\r
         <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
-          <artifactId>base-features</artifactId>\r
+          <artifactId>features-base</artifactId>\r
           <version>1.4.2-SNAPSHOT</version>\r
           <classifier>features</classifier>\r
           <type>xml</type>\r

diff --git a/features-plugin2oc/src/main/resources/features.xml b/features-plugin2oc/src/main/resources/features.xml
index abdf565022f48949fcf7858bd9acca74cb1ca826..ea9e8df9c8cee2a1ebedc1f5ebc17f242f16fb77 100755 (executable)
--- a/features-plugin2oc/src/main/resources/features.xml
+++ b/features-plugin2oc/src/main/resources/features.xml
@@ -11,7 +11,7 @@
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.6.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/0.4.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/0.8.1-SNAPSHOT/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/base-features/1.4.2-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-base/1.4.2-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/1.1-SNAPSHOT/xml/features</repository>
     <feature name='odl-plugin2oc' description="OpenDaylight :: plugin2oc :: Plugin" version='${project.version}'>
         <feature>odl-nsf-all</feature>