X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=features%2Fbase%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=c335600e21d35b33e90a09e977b8a9b505dc509c;hp=b9107b9f62881d1fc2799ddbecc238559add943a;hb=19ebaaaa8f6c4286f84379067599e48d20e44c57;hpb=17d82f582a6bc13c78be3b19954ff8c021180e93
diff --git a/features/base/src/main/resources/features.xml b/features/base/src/main/resources/features.xml
index b9107b9f62..c335600e21 100644
--- a/features/base/src/main/resources/features.xml
+++ b/features/base/src/main/resources/features.xml
@@ -13,6 +13,7 @@
base-tomcat
base-netty
base-jersey
+ base-jackson
base-spring-security
@@ -44,7 +45,6 @@
mvn:com.sun.jersey/jersey-core/${jersey.version}
mvn:com.sun.jersey/jersey-client/${jersey.version}
mvn:com.sun.jersey/jersey-servlet/${jersey.version}
- mvn:javax.ws.rs/javax.ws.rs-api/2.0
http
@@ -110,20 +110,21 @@
mvn:orbit/javax.servlet.jsp.jstl/1.2.0.v201105211821
mvn:orbit/javax.servlet.jsp.jstl.impl/1.2.0.v201210211230
-
+
base-gemini-web
base-eclipselink-persistence
- mvn:orbit/org.apache.catalina/7.0.32.v201211201336
+ mvn:orbit/org.apache.catalina/${commons.karaf.catalina}
mvn:geminiweb/org.eclipse.gemini.web.tomcat/${geminiweb.version}
- mvn:orbit/org.apache.catalina.ha/7.0.32.v201211201952
- mvn:orbit/org.apache.catalina.tribes/7.0.32.v201211201952
- mvn:orbit/org.apache.coyote/7.0.32.v201211201952
- mvn:orbit/org.apache.el/7.0.32.v201211081135
- mvn:orbit/org.apache.jasper/7.0.32.v201211201952
- mvn:orbit/org.apache.juli.extras/7.0.32.v201211081135
- mvn:orbit/org.apache.tomcat.api/7.0.32.v201211081135
- mvn:orbit/org.apache.tomcat.util/7.0.32.v201211201952
- wrap:mvn:virgomirror/org.eclipse.jdt.core.compiler.batch/3.8.0.I20120518-2145
+ mvn:orbit/org.apache.catalina.ha/${commons.karaf.catalina.ha}
+ mvn:orbit/org.apache.catalina.tribes/${commons.karaf.catalina.tribes}
+ mvn:orbit/org.apache.coyote/${commons.karaf.coyote}
+ mvn:orbit/org.apache.el/${commons.karaf.el}
+ mvn:orbit/org.apache.jasper/${commons.karaf.jasper}
+ mvn:orbit/org.apache.juli.extras/${commons.karaf.juli.version}
+ mvn:orbit/org.apache.tomcat.api/${commons.karaf.tomcat.api}
+ mvn:orbit/org.apache.tomcat.util/${commons.karaf.tomcat.util}
+ mvn:org.opendaylight.controller/karaf-tomcat-security/${karaf.security.version}
+ wrap:mvn:virgomirror/org.eclipse.jdt.core.compiler.batch/${eclipse.jdt.core.compiler.batch.version}
mvn:org.ow2.asm/asm-all/${asm.version}