From: Robert Varga <rovarga@cisco.com>
Date: Thu, 16 Feb 2017 13:19:44 +0000 (+0100)
Subject: Pull in feat-jetty instead of feat-war
X-Git-Tag: release/carbon~68
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=8b3e3b6921616ed42fca2475075164becf59ac90;p=netconf.git

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 feabc57179..8f9a1a7700 100644
--- 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 2ae5b95e21..c80c9387bf 100644
--- 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>