You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2010/11/16 15:31:22 UTC
svn commit: r1035643 - in /servicemix/smx4/features/trunk: assembly/pom.xml
assembly/src/main/descriptors/unix-bin.xml
assembly/src/main/descriptors/windows-bin.xml pom.xml
Author: gertv
Date: Tue Nov 16 14:31:22 2010
New Revision: 1035643
URL: http://svn.apache.org/viewvc?rev=1035643&view=rev
Log:
SMX4-667: Add JAXP 1.4.4 jar to lib/endorsed
Modified:
servicemix/smx4/features/trunk/assembly/pom.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/pom.xml?rev=1035643&r1=1035642&r2=1035643&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/features/trunk/assembly/pom.xml Tue Nov 16 14:31:22 2010
@@ -564,6 +564,10 @@
<artifactId>scriptengines-groovy</artifactId>
</dependency>
<dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=1035643&r1=1035642&r2=1035643&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/unix-bin.xml Tue Nov 16 14:31:22 2010
@@ -338,6 +338,12 @@
<dependencySets>
<dependencySet>
+ <outputDirectory>/lib/endorsed</outputDirectory>
+ <includes>
+ <include>com.sun.xml.parsers:jaxp-ri</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<outputDirectory>/system</outputDirectory>
<outputFileNameMapping>org/apache/servicemix/nmr/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
Modified: servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=1035643&r1=1035642&r2=1035643&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/descriptors/windows-bin.xml Tue Nov 16 14:31:22 2010
@@ -320,6 +320,12 @@
<dependencySets>
<dependencySet>
+ <outputDirectory>/lib/endorsed</outputDirectory>
+ <includes>
+ <include>com.sun.xml.parsers:jaxp-ri</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<outputDirectory>/system</outputDirectory>
<outputFileNameMapping>org/apache/servicemix/nmr/${artifact.artifactId}/${artifact.baseVersion}/${artifact.artifactId}-${artifact.baseVersion}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<unpack>false</unpack>
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=1035643&r1=1035642&r2=1035643&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Nov 16 14:31:22 2010
@@ -96,7 +96,7 @@
<enabled>false</enabled>
</snapshots>
</repository>
- <!-- ServiceMix' Maven 2 repository: xmlpull 1.1.3.4d_b4_min is not in central repo -->
+ <!-- ServiceMix' Maven 2 repository: jsmpp 2.0 is not in central repo -->
<repository>
<id>servicemix.m2-repo</id>
<name>ServiceMix' Maven 2 repository</name>
@@ -308,7 +308,7 @@
<httpcomponents.version>4.0.1</httpcomponents.version>
<jackrabbit.version>1.5.3</jackrabbit.version>
<jackson.version>1.6.0</jackson.version>
- <jaxp-ri.version>1.4.2</jaxp-ri.version>
+ <jaxp-ri.version>1.4.4</jaxp-ri.version>
<jaxws-api.version>2.1</jaxws-api.version>
<javassist.version>3.9.0</javassist.version>
<javax.mail.version>1.4.3</javax.mail.version>