You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/12/13 21:57:46 UTC
svn commit: r1213924 - in /karaf/trunk:
assemblies/features/standard/src/main/feature/feature.xml pom.xml
Author: jbonofre
Date: Tue Dec 13 20:57:46 2011
New Revision: 1213924
URL: http://svn.apache.org/viewvc?rev=1213924&view=rev
Log:
[KARAF-1106] Jetty feature uses ServiceMix Specs for Activation API in place of Geronimo Specs
Modified:
karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml
karaf/trunk/pom.xml
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=1213924&r1=1213923&r2=1213924&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml (original)
+++ karaf/trunk/assemblies/features/standard/src/main/feature/feature.xml Tue Dec 13 20:57:46 2011
@@ -44,7 +44,7 @@
</feature>
<feature name="jetty" description="Provide Jetty engine support" version="${jetty.version}" resolver="(obr)">
- <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
+ <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="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle dependency="true" start-level="30">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}</bundle>
<bundle dependency="true" start-level="30">mvn:javax.mail/mail/${javax.mail.version}</bundle>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1213924&r1=1213923&r2=1213924&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Dec 13 20:57:46 2011
@@ -126,7 +126,6 @@
<injection.bundle.version>1.0</injection.bundle.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
- <geronimo.activation.version>1.1</geronimo.activation.version>
<geronimo.jms-spec.version>1.1.1</geronimo.jms-spec.version>
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
@@ -182,6 +181,7 @@
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.6.1</slf4j.version>
+ <servicemix.specs.version>1.9.0</servicemix.specs.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
<spring.version>3.0.6.RELEASE</spring.version>
<sshd.version>0.6.0</sshd.version>
@@ -1116,11 +1116,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>${geronimo.activation.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>${geronimo.servlet.version}</version>
</dependency>
@@ -1130,6 +1125,11 @@
<version>${easymock.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>${sshd.version}</version>