홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
Committed by Gerrit Code Review
016bef72 1 parent 399a0b36

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

Change-Id: I1f4b8bc956f24d422af06e02330f5de8bb4873c2
Inline Side-by-side
Showing 15 changed files with 1 additions and 16 deletions
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="onos-app-sdnip" version="${project.version}" 18 <feature name="onos-app-sdnip" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle> 20 <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle> 20 <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
18 name="onos-@FEATURE-VERSION"> 18 name="onos-@FEATURE-VERSION">
19 - <repository>mvn:org.onosproject/onos-features/@ONOS-VERSION/xml/features 19 + <repository>mvn:org.apache.karaf.features/standard/3.0.3/xml/features</repository>
20 - </repository>
21 20
22 <feature name="onos-thirdparty-base" version="@FEATURE-VERSION" 21 <feature name="onos-thirdparty-base" version="@FEATURE-VERSION"
23 description="ONOS 3rd party dependencies"> 22 description="ONOS 3rd party dependencies">
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
15 ~ limitations under the License. 15 ~ limitations under the License.
16 --> 16 -->
17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}"> 17 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 - <repository>mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features</repository>
19 <feature name="${project.artifactId}" version="${project.version}" 18 <feature name="${project.artifactId}" version="${project.version}"
20 description="${project.description}"> 19 description="${project.description}">
21 <feature>onos-api</feature> 20 <feature>onos-api</feature>
......