Pull in feat-jetty instead of feat-war

feat-war pulls in jetty 9.2, we need 8.1 for the transition.

Change-Id: I6cdd1354c80a5fe8b9e9c34100c4e68259122d2d
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml
index feabc57179043d5c84365d6fba26df266d568151..8f9a1a77007f164a05abf49c83583c826a9a13e8 100644 (file)
--- a/features/restconf/odl-restconf-noauth/pom.xml
+++ b/features/restconf/odl-restconf-noauth/pom.xml
@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-karaf-feat-war</artifactId>
+            <artifactId>odl-karaf-feat-jetty</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml
index 2ae5b95e21911b9d492b36624875742a2c5a823d..c80c9387bf21fbcd993b2ca8dff178572c0d98e4 100644 (file)
--- a/features/yanglib/odl-yanglib/pom.xml
+++ b/features/yanglib/odl-yanglib/pom.xml
@@ -60,7 +60,7 @@
 
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-karaf-feat-war</artifactId>
+            <artifactId>odl-karaf-feat-jetty</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>