Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[KARAF-1106] Jetty feature uses ServiceMix Specs for activation in pl…

…ace of Geronimo Specs

git-svn-id: https://svn.apache.org/repos/asf/karaf/branches/karaf-2.2.x@1214068 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit b795dcad97d7da0ca475b0c220d2289b58fe18e9 1 parent f708310
@jbonofre jbonofre authored
View
2  assemblies/features/standard/src/main/resources/features.xml
@@ -148,7 +148,7 @@
<bundle start-level="30">mvn:org.apache.karaf.shell/org.apache.karaf.shell.config/${project.version}</bundle>
</feature>
<feature name="jetty" version="${jetty.version}" resolver="(obr)">
- <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle dependency='true'>mvn:javax.mail/mail/${javax.mail.version}</bundle>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta-spec.version}</bundle>
View
6 etc/appended-resources/supplemental-models.xml
@@ -823,9 +823,9 @@
</supplement>
<supplement>
<project>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <name>Apache Geronimo Specs :: Activation 1.1</name>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ <name>Apache ServiceMix Specs :: Activation 1.1</name>
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
View
12 pom.xml
@@ -113,7 +113,6 @@
<jasypt.bundle.version>1.8_1</jasypt.bundle.version>
<jetty.version>7.5.4.v20111024</jetty.version>
<junit.bundle.version>4.7_3</junit.bundle.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>
@@ -154,6 +153,7 @@
<pax.web.version>1.0.8</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<plexus.utils.version>2.1</plexus.utils.version>
+ <servicemix.specs.version>1.9.0</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.6.1</slf4j.version>
<spring.osgi.version>1.2.1</spring.osgi.version>
@@ -826,11 +826,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>
@@ -840,6 +835,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>
View
6 tooling/features-maven-plugin/pom.xml
@@ -143,9 +143,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ <version>1.9.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Please sign in to comment.
Something went wrong with that request. Please try again.