From: thomaslees <thomaslee.s@tcs.com>
Date: Fri, 10 Jun 2016 06:26:45 +0000 (+0530)
Subject: Removing Existing Usecplugin Features for New Feature Addition
X-Git-Tag: release/boron~41
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=f637d346fc7b1901157536e9bf1053c87b8fed9e

Removing Existing Usecplugin Features for New Feature Addition

Change-Id: I103264047d2b59c12b5fefba83ab3848fd1a4293
Signed-off-by: thomaslees <thomaslee.s@tcs.com>
---

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 80d13153..d5cde535 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -97,7 +97,8 @@
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
+    <!--issue with adding new features needs to comment out usecplugin features for time being -->
+    <!--repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository-->
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.yang-push/yangpush-features/${feature.yang-push.version}/xml/features</repository>
 </features>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 47f502a1..f1b4d0ec 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -128,8 +128,10 @@
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
-        <feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature>
-        <feature version='${feature.usecplugin.version}'>odl-usecplugin</feature>
+
+        <!-- Addition of new features mandates existing usecplugin features to be commented out-->
+        <!--feature version='${feature.usecplugin.version}'>odl-usecplugin-api</feature-->
+        <!--feature version='${feature.usecplugin.version}'>odl-usecplugin</feature-->
     </feature>
 
     <!-- Please use alphabetical order for non-compatible features -->
diff --git a/version/src/main/config/maven-metadata-local.xml b/version/src/main/config/maven-metadata-local.xml
new file mode 100644
index 00000000..526cec2d
--- /dev/null
+++ b/version/src/main/config/maven-metadata-local.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>org.opendaylight.integration</groupId>
+  <artifactId>version</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20160610060204</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <classifier>config</classifier>
+        <extension>xml</extension>
+        <value>0.5.0-SNAPSHOT</value>
+        <updated>20160610060204</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>
diff --git a/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java b/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java
new file mode 100644
index 00000000..a768b79b
--- /dev/null
+++ b/version/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/integration/distribution/version/rev160316/OdlVersionModuleFactory.java
@@ -0,0 +1,13 @@
+/*
+* Generated file
+*
+* Generated from: yang module name: odl-distribution-version yang module local name: odl-version
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Fri Jun 10 11:25:09 IST 2016
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316;
+public class OdlVersionModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.integration.distribution.version.rev160316.AbstractOdlVersionModuleFactory {
+
+}