You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2013/04/24 05:40:27 UTC
svn commit: r1471237 - in /karaf/branches/karaf-2.x:
assemblies/apache-karaf/pom.xml
assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
assemblies/apache-karaf/src/main/descriptors/windows-bin.xml pom.xml
Author: ffang
Date: Wed Apr 24 03:40:26 2013
New Revision: 1471237
URL: http://svn.apache.org/r1471237
Log:
[KARAF-2290]should also endorse activation-api spec jar
Modified:
karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.x/pom.xml
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml?rev=1471237&r1=1471236&r2=1471237&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml Wed Apr 24 03:40:26 2013
@@ -433,6 +433,10 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.activation-api-1.1</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.2</artifactId>
</dependency>
</dependencies>
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?rev=1471237&r1=1471236&r2=1471237&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Wed Apr 24 03:40:26 2013
@@ -127,6 +127,7 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
</includes>
</dependencySet>
Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?rev=1471237&r1=1471236&r2=1471237&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Wed Apr 24 03:40:26 2013
@@ -123,6 +123,7 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxws-api-2.2</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.saaj-api-1.3</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.stax-api-1.2</include>
+ <include>org.apache.servicemix.specs:org.apache.servicemix.specs.activation-api-1.1</include>
</includes>
</dependencySet>
Modified: karaf/branches/karaf-2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1471237&r1=1471236&r2=1471237&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Wed Apr 24 03:40:26 2013
@@ -181,7 +181,7 @@
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<plexus.utils.version>2.1</plexus.utils.version>
<portlet-api.version>2.0</portlet-api.version>
- <servicemix.specs.version>2.2.0</servicemix.specs.version>
+ <servicemix.specs.version>2.3-SNAPSHOT</servicemix.specs.version>
<servlet.api.version>2.5</servlet.api.version>
<slf4j.version>1.7.2</slf4j.version>
<spring.osgi.version>1.2.1</spring.osgi.version>