Fixing features.xml so that they don't self-reference.

Change-Id: I1f4b8bc956f24d422af06e02330f5de8bb4873c2

Fixing features.xml so that they don't self-reference.
Change-Id: I1f4b8bc956f24d422af06e02330f5de8bb4873c2
Thomas Vachuska · Gerrit Code Review
Commit 016bef721f3e0f1e360e3cc7bad581e94dc822c0 016bef72 1 parent 399a0b36
Showing 15 changed files with 1 additions and 16 deletions
apps/aaa/features.xml
apps/bgprouter/features.xml
apps/dhcp/app/features.xml
apps/sdnip/features.xml
apps/virtualbng/features.xml
apps/vtn/app/features.xml
apps/xos-integration/features.xml
drivers/features.xml
features/features.xml
providers/bgp/app/features.xml
providers/netconf/app/features.xml
providers/openflow/base/features.xml
providers/ovsdb/app/features.xml
providers/pcep/app/features.xml
tools/package/maven-plugin/src/main/resources/org/onosproject/maven/features.xml
--- a/apps/aaa/features.xml
View file @016bef7
+++ b/apps/aaa/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/apps/bgprouter/features.xml
View file @016bef7
+++ b/apps/bgprouter/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/apps/dhcp/app/features.xml
View file @016bef7
+++ b/apps/dhcp/app/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/apps/sdnip/features.xml
View file @016bef7
+++ b/apps/sdnip/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="onos-app-sdnip" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/apps/virtualbng/features.xml
View file @016bef7
+++ b/apps/virtualbng/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
--- a/apps/vtn/app/features.xml
View file @016bef7
+++ b/apps/vtn/app/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/apps/xos-integration/features.xml
View file @016bef7
+++ b/apps/xos-integration/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
--- a/drivers/features.xml
View file @016bef7
+++ b/drivers/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/features/features.xml
View file @016bef7
+++ b/features/features.xml
View file @016bef7
@@ -16,8 +16,7 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           name="onos-@FEATURE-VERSION">
-     <repository>mvn:org.onosproject/onos-features/@ONOS-VERSION/xml/features
-     </repository>
+     <repository>mvn:org.apache.karaf.features/standard/3.0.3/xml/features</repository>
 
     <feature name="onos-thirdparty-base" version="@FEATURE-VERSION"
              description="ONOS 3rd party dependencies">
--- a/providers/bgp/app/features.xml
View file @016bef7
+++ b/providers/bgp/app/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/providers/netconf/app/features.xml
View file @016bef7
+++ b/providers/netconf/app/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/providers/openflow/base/features.xml
View file @016bef7
+++ b/providers/openflow/base/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/providers/ovsdb/app/features.xml
View file @016bef7
+++ b/providers/ovsdb/app/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/providers/pcep/app/features.xml
View file @016bef7
+++ b/providers/pcep/app/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
--- a/tools/package/maven-plugin/src/main/resources/org/onosproject/maven/features.xml
View file @016bef7
+++ b/tools/package/maven-plugin/src/main/resources/org/onosproject/maven/features.xml
View file @016bef7
@@ -15,7 +15,6 @@
   ~ limitations under the License.
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
-     <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>