Repository: karaf Updated Branches: refs/heads/karaf-4.0.x a7695e497 -> 3c2291b00
[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/3c2291b0 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3c2291b0 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3c2291b0 Branch: refs/heads/karaf-4.0.x Commit: 3c2291b00fd9226a5ef3d6d85ab1d92a90ddd4da Parents: a7695e4 Author: Andrea Cosentino <[email protected]> Authored: Tue Mar 8 16:51:31 2016 +0100 Committer: Andrea Cosentino <[email protected]> Committed: Wed Mar 9 09:26:26 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/3c2291b0/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>
