Author: akulshreshtha
Date: Wed Dec 6 05:05:35 2006
New Revision: 483063
URL: http://svn.apache.org/viewvc?view=rev&rev=483063
Log:
Upgrade xerces to 2.8.1, GERONIMO-2594 Remove xmlParserApis and xalan
Remove xerces from everywhere except console
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
geronimo/server/trunk/configs/client-system/pom.xml
geronimo/server/trunk/configs/j2ee-system/pom.xml
geronimo/server/trunk/configs/online-deployer/pom.xml
geronimo/server/trunk/configs/upgrade-cli/pom.xml
geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
geronimo/server/trunk/modules/geronimo-system/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Wed
Dec 6 05:05:35 2006
@@ -156,16 +156,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</artifactItem>
-
- <artifactItem>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </artifactItem>
-
- <artifactItem>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes/lib/endorsed</outputDirectory>
</configuration>
Modified: geronimo/server/trunk/configs/client-system/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/configs/client-system/pom.xml Wed Dec 6 05:05:35 2006
@@ -47,16 +47,6 @@
<artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
</dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
</dependencies>
<build>
@@ -142,16 +132,6 @@
<element>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
- </element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
</element>
</classpath>
<classpathPrefix>../lib</classpathPrefix>
Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Wed Dec 6 05:05:35 2006
@@ -143,16 +143,6 @@
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
</element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
</classpath>
<classpathPrefix>../lib</classpathPrefix>
</configuration>
Modified: geronimo/server/trunk/configs/online-deployer/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/pom.xml Wed Dec 6 05:05:35
2006
@@ -124,16 +124,6 @@
<artifactId>xstream</artifactId>
</element>
<element>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- <element>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </element>
- <element>
<!-- IMPORTANT: server.jar is required for offline
deployer to work -->
<entry>server.jar</entry>
</element>
Modified: geronimo/server/trunk/configs/upgrade-cli/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/configs/upgrade-cli/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/configs/upgrade-cli/pom.xml (original)
+++ geronimo/server/trunk/configs/upgrade-cli/pom.xml Wed Dec 6 05:05:35 2006
@@ -63,16 +63,6 @@
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
- <dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/pom.xml Wed Dec 6
05:05:35 2006
@@ -90,16 +90,6 @@
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- </dependency>
-
- <dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
Modified: geronimo/server/trunk/modules/geronimo-system/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-system/pom.xml Wed Dec 6 05:05:35
2006
@@ -66,23 +66,7 @@
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
</dependency>
-
- <!--
- NOTE: Need to include Xerces for tests in case Crimson (or another
parser)
- gets picked up that does not support attributes
- -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <scope>test</scope>
- </dependency>
-
+
</dependencies>
<build>
Modified: geronimo/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=483063&r1=483062&r2=483063
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Dec 6 05:05:35 2006
@@ -426,23 +426,19 @@
<artifactId>wsdl4j</artifactId>
<version>1.5.2</version>
</dependency>
-
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.0</version>
- </dependency>
-
+
+ <!-- org.apache.xml.serialize.XMLSerializer is used by castor, hence this is still needed -->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.6.2</version>
+ <version>2.8.1</version>
</dependency>
+ <!-- This will go away when we move to tomcat6 -->
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>2.6.2</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
</dependency>
<dependency>
@@ -650,12 +646,6 @@
<groupId>ognl</groupId>
<artifactId>ognl</artifactId>
<version>2.6.9</version>
- </dependency>
-
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
</dependency>
<dependency>