You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/07/01 18:32:20 UTC

svn commit: r1498552 - in /karaf/branches/karaf-2.x: ./ assemblies/apache-karaf/ assemblies/apache-karaf/src/main/descriptors/

Author: jbonofre
Date: Mon Jul  1 16:32:19 2013
New Revision: 1498552

URL: http://svn.apache.org/r1498552
Log:
[KARAF-2206] Include xerces in lib/endorsed to run correct with IBM JDK

Modified:
    karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
    karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.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=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/pom.xml Mon Jul  1 16:32:19 2013
@@ -439,6 +439,10 @@
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-release.xml Mon Jul  1 16:32:19 2013
@@ -128,6 +128,7 @@
                 <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>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-bin-snapshot.xml Mon Jul  1 16:32:19 2013
@@ -128,6 +128,7 @@
                 <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>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-release.xml Mon Jul  1 16:32:19 2013
@@ -111,6 +111,7 @@
             <fileMode>0664</fileMode>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/unix-minimal-bin-snapshot.xml Mon Jul  1 16:32:19 2013
@@ -111,6 +111,7 @@
             <fileMode>0664</fileMode>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-release.xml Mon Jul  1 16:32:19 2013
@@ -129,6 +129,7 @@
                 <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>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-bin-snapshot.xml Mon Jul  1 16:32:19 2013
@@ -129,6 +129,7 @@
                 <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>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-release.xml Mon Jul  1 16:32:19 2013
@@ -113,6 +113,7 @@
             <useProjectArtifact>false</useProjectArtifact>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
+                <include>org.apache.xerces:xercesImpl</include>
             </includes>
         </dependencySet>
 

Modified: karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml?rev=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml (original)
+++ karaf/branches/karaf-2.x/assemblies/apache-karaf/src/main/descriptors/windows-minimal-bin-snapshot.xml Mon Jul  1 16:32:19 2013
@@ -113,6 +113,7 @@
             <useProjectArtifact>false</useProjectArtifact>
             <includes>
                 <include>org.apache.karaf:org.apache.karaf.exception</include>
+                <include>org.apache.xerces:xercesImpl</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=1498552&r1=1498551&r2=1498552&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Mon Jul  1 16:32:19 2013
@@ -195,6 +195,7 @@
         <sshd.version>0.8.0</sshd.version>
         <struts.bundle.version>1.3.10_1</struts.bundle.version>
         <xbean.version>3.13</xbean.version>
+        <xerces.version>2.11.0</xerces.version>
         <javax.mail.version>1.4.5</javax.mail.version>
         <http.feature.version>[2,3)</http.feature.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -625,6 +626,11 @@
                 <version>${maven.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.xerces</groupId>
+                <artifactId>xercesImpl</artifactId>
+                <version>${xerces.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
                 <version>${org.json.version}</version>