Author: ffang
Date: Tue Sep 18 02:20:30 2012
New Revision: 1386968
URL: http://svn.apache.org/viewvc?rev=1386968&view=rev
Log:
[KARAF-1840]should also endorse saaj-api
Modified:
karaf/trunk/assemblies/features/framework/pom.xml
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
karaf/trunk/pom.xml
Modified: karaf/trunk/assemblies/features/framework/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/pom.xml?rev=1386968&r1=1386967&r2=1386968&view=diff
==============================================================================
--- karaf/trunk/assemblies/features/framework/pom.xml (original)
+++ karaf/trunk/assemblies/features/framework/pom.xml Tue Sep 18 02:20:30 2012
@@ -332,6 +332,11 @@
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
</artifactItem>
<artifactItem>
+
<groupId>org.apache.servicemix.specs</groupId>
+
<artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+
<outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
<outputDirectory>target/classes/resources/system/org/eclipse/osgi/${equinox.version}</outputDirectory>
@@ -407,4 +412,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified:
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
URL:
http://svn.apache.org/viewvc/karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties?rev=1386968&r1=1386967&r2=1386968&view=diff
==============================================================================
---
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
(original)
+++
karaf/trunk/assemblies/features/framework/src/main/filtered-resources/resources/etc/jre.properties
Tue Sep 18 02:20:30 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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1386968&r1=1386967&r2=1386968&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Sep 18 02:20:30 2012
@@ -1367,6 +1367,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>