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 2012/09/18 04:32:01 UTC
svn commit: r1386971 - in /karaf/branches/karaf-2.3.x: ./
assemblies/apache-karaf/ assemblies/apache-karaf/src/main/descriptors/
assemblies/apache-karaf/src/main/filtered-resources/etc/
Author: ffang
Date: Tue Sep 18 02:32:00 2012
New Revision: 1386971
URL: http://svn.apache.org/viewvc?rev=1386971&view=rev
Log:
[KARAF-1840]should also endorse saaj-api
Modified:
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
karaf/branches/karaf-2.3.x/pom.xml
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml?rev=1386971&r1=1386970&r2=1386971&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/pom.xml Tue Sep 18 02:32:00 2012
@@ -423,6 +423,10 @@
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml?rev=1386971&r1=1386970&r2=1386971&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/unix-bin.xml Tue Sep 18 02:32:00 2012
@@ -129,6 +129,7 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
<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>
</includes>
</dependencySet>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml?rev=1386971&r1=1386970&r2=1386971&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/descriptors/windows-bin.xml Tue Sep 18 02:32:00 2012
@@ -119,6 +119,7 @@
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxp-api-1.4</include>
<include>org.apache.servicemix.specs:org.apache.servicemix.specs.jaxb-api-2.2</include>
<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>
</includes>
</dependencySet>
Modified: karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties?rev=1386971&r1=1386970&r2=1386971&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties (original)
+++ karaf/branches/karaf-2.3.x/assemblies/apache-karaf/src/main/filtered-resources/etc/jre.properties Tue Sep 18 02:32:00 2012
@@ -120,7 +120,7 @@ jre-1.6= \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
- javax.xml.soap, \
+ javax.xml.soap;version="1.3", \
javax.xml.stream;version="1.2", \
javax.xml.stream.events;version="1.2", \
javax.xml.stream.util;version="1.2", \
@@ -283,7 +283,7 @@ jre-1.7= \
javax.xml.datatype, \
javax.xml.namespace, \
javax.xml.parsers, \
- javax.xml.soap, \
+ javax.xml.soap;version="1.3", \
javax.xml.stream;version="1.2", \
javax.xml.stream.events;version="1.2", \
javax.xml.stream.util;version="1.2", \
Modified: karaf/branches/karaf-2.3.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/pom.xml?rev=1386971&r1=1386970&r2=1386971&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/pom.xml Tue Sep 18 02:32:00 2012
@@ -884,6 +884,11 @@
<version>${servicemix.specs.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
<version>${sshd.version}</version>