Author: jbonofre
Date: Thu Sep 12 07:03:23 2013
New Revision: 1522462
URL: http://svn.apache.org/r1522462
Log:
[KARAF-2462] Remove jetty dependency as it's now provided by pax-web
Modified:
karaf/trunk/assemblies/features/standard/pom.xml
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/standard/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/pom.xml?rev=1522462&r1=1522461&r2=1522462&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/pom.xml (original)
+++ karaf/trunk/assemblies/features/standard/pom.xml Thu Sep 12 07:03:23 2013
@@ -252,11 +252,6 @@
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- package deps -->
<dependency>
Modified: karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml?rev=1522462&r1=1522461&r2=1522462&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
(original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Thu
Sep 12 07:03:23 2013
@@ -87,10 +87,6 @@
<bundle
start-level="30">mvn:org.apache.karaf.region/org.apache.karaf.region.command/${project.version}</bundle>
</feature>
- <feature name="jetty" description="Provide Jetty engine support"
version="${jetty.version}" resolver="(obr)">
- <feature version="${jetty.version}">pax-jetty</feature>
- </feature>
-
<feature name="package" version="${project.version}" resolver="(obr)"
description="Package commands and mbeans">
<bundle
start-level="30">mvn:org.apache.karaf.package/org.apache.karaf.package.core/${project.version}</bundle>
<bundle
start-level="30">mvn:org.apache.karaf.package/org.apache.karaf.package.command/${project.version}</bundle>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1522462&r1=1522461&r2=1522462&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Thu Sep 12 07:03:23 2013
@@ -128,7 +128,6 @@
<commons-jexl.version>2.1.1</commons-jexl.version>
<commons-lang.version>2.6</commons-lang.version>
<jasypt.bundle.version>1.9.1_1</jasypt.bundle.version>
- <jetty.version>8.1.9.v20130131</jetty.version>
<servlet.spec.groupId>org.apache.geronimo.specs</servlet.spec.groupId>
<servlet.spec.artifactId>geronimo-servlet_3.0_spec</servlet.spec.artifactId>
<servlet.spec.version>1.0</servlet.spec.version>
@@ -1123,12 +1122,6 @@
</dependency>
<dependency>
- <groupId>org.eclipse.jetty.aggregate</groupId>
- <artifactId>jetty-all-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
<version>${geronimo.annotation-spec.version}</version>
