Upgrade castor library to get rid of old xerces transitive dependency

Author: adangel

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

@@ -19,12 +19,17 @@ Require-Bundle: org.apache.commons.logging;bundle-version="1.0.4",
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: %plugin.provider
-Bundle-ClassPath: target/lib/asm.jar,
- target/lib/castor.jar,
+Bundle-ClassPath: target/lib/aopalliance.jar,
+ target/lib/asm.jar,
+ target/lib/castor-xml.jar,
+ target/lib/castor-core.jar,
+ target/lib/commons-collections.jar,
  target/lib/commons-io.jar,
+ target/lib/commons-lang.jar,
  target/lib/commons-lang3.jar,
  target/lib/commons-logging.jar,
  target/lib/javacc.jar,
+ target/lib/javax.inject.jar,
  target/lib/jaxen.jar,
  target/lib/jcommander.jar,
  target/lib/log4j.jar,
@@ -44,6 +49,14 @@ Bundle-ClassPath: target/lib/asm.jar,
  target/lib/rhino.jar,
  target/lib/saxon-dom.jar,
  target/lib/saxon.jar,
+ target/lib/spring-aop.jar,
+ target/lib/spring-asm.jar,
+ target/lib/spring-beans.jar,
+ target/lib/spring-context.jar,
+ target/lib/spring-core.jar,
+ target/lib/spring-expression.jar,
+ target/lib/stax.jar,
+ target/lib/stax-api.jar,
  target/lib/xerces.jar,
  target/classes/,
  .

net.sourceforge.pmd.eclipse.plugin/pom.xml

@@ -20,10 +20,15 @@
         <version>${pmd.version}</version>
         <type>pom</type>
     </dependency>
+    <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.17</version>
+    </dependency>
     <dependency>
         <groupId>org.codehaus.castor</groupId>
-        <artifactId>castor</artifactId>
-        <version>1.1.2.1</version>
+        <artifactId>castor-xml</artifactId>
+        <version>1.3.3</version>
     </dependency>
   </dependencies>
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/core/rulesets/impl/RuleSetsManagerImpl.java

@@ -56,7 +56,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.exolab.castor.mapping.Mapping;
 import org.exolab.castor.mapping.MappingException;
-import org.exolab.castor.util.LocalConfiguration;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.ValidationException;
@@ -123,14 +122,14 @@ public void writeToXml(RuleSets ruleSets, OutputStream output) throws PMDCoreExc
         LOG.debug("Storing plug-in rulesets");
         StringWriter writer = null;
         try {
-            LocalConfiguration.getInstance().getProperties().setProperty("org.exolab.castor.indent", "true");
-
             final Mapping mapping = new Mapping(this.getClass().getClassLoader());
             final URL mappingSpecUrl = this.getClass().getResource(RULESETS_MAPPING);
             mapping.loadMapping(mappingSpecUrl);
 
             writer = new StringWriter();
-            final Marshaller marshaller = new Marshaller(writer);
+            final Marshaller marshaller = new Marshaller();
+            marshaller.setProperty("org.exolab.castor.indent", "true");
+            marshaller.setWriter(writer);
             marshaller.setMapping(mapping);
             marshaller.marshal(ruleSets);
             writer.flush();

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java

@@ -67,7 +67,6 @@
 import org.eclipse.ui.PlatformUI;
 import org.exolab.castor.mapping.Mapping;
 import org.exolab.castor.mapping.MappingException;
-import org.exolab.castor.util.LocalConfiguration;
 import org.exolab.castor.xml.MarshalException;
 import org.exolab.castor.xml.Marshaller;
 import org.exolab.castor.xml.Unmarshaller;
@@ -271,14 +270,14 @@ private void writeProjectProperties(final IProject project, final ProjectPropert
             throws PropertiesException {
     	StringWriter writer = null;
         try {
-            LocalConfiguration.getInstance().getProperties().setProperty("org.exolab.castor.indent", "true");
-
             final Mapping mapping = new Mapping(getClass().getClassLoader());
             final URL mappingSpecUrl = getClass().getResource(PROPERTIES_MAPPING);
             mapping.loadMapping(mappingSpecUrl);
 
             writer = new StringWriter();
-            final Marshaller marshaller = new Marshaller(writer);
+            final Marshaller marshaller = new Marshaller();
+            marshaller.setProperty("org.exolab.castor.indent", "true");
+            marshaller.setWriter(writer);
             marshaller.setMapping(mapping);
             marshaller.marshal(projectProperties);
             writer.flush();