You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ac...@apache.org on 2016/03/09 09:25:39 UTC

karaf git commit: [KARAF-4406] Use javax.servlet-api 3.1.0 instead of Geronimo servlet spec

Repository: karaf
Updated Branches:
  refs/heads/master a9af4f002 -> 0bd7158dc


[KARAF-4406] Use javax.servlet-api 3.1.0 instead of Geronimo servlet spec


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0bd7158d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0bd7158d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0bd7158d

Branch: refs/heads/master
Commit: 0bd7158dce1a9fe1800b8315a1bb6522a5f7aba5
Parents: a9af4f0
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Mar 8 16:51:31 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Mar 9 09:24:58 2016 +0100

----------------------------------------------------------------------
 assemblies/features/standard/src/main/feature/feature.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/0bd7158d/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index 9ad1051..6dad422 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -358,7 +358,7 @@
 
     <feature name="jetty" version="8.1.14.v20131031">
         <bundle dependency="true" start-level="30">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
-        <bundle dependency="false" start-level="30">mvn:org.apache.geronimo.specs/geronimo-servlet_3.0_spec/1.0</bundle>
+        <bundle dependency="false" start-level="30">mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
         <bundle dependency="true" start-level="30">mvn:javax.mail/mail/${javax.mail.version}</bundle>
         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
         <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0.1</bundle>