[FIXED JENKINS-27548] Do not alter SAX environment variable anymore.

jenkinsci · Feb 27, 2016 · 8aec121 · 8aec121
1 parent b4cb96c
commit 8aec121
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 18 deletions.
diff --git a/checkstyle.iml b/checkstyle.iml
@@ -24,13 +24,13 @@
     <orderEntry type="library" name="Maven: org.jvnet.hudson.plugins:analysis-core:1.75" level="project" />
     <orderEntry type="library" name="Maven: de.java2html:java2html:5.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.2" level="project" />
+    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-digester3:3.2" level="project" />
     <orderEntry type="library" name="Maven: cglib:cglib:2.2.2" level="project" />
     <orderEntry type="library" name="Maven: asm:asm:3.3.1" level="project" />
     <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: xerces:xercesImpl:2.11.0" level="project" />
-    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jvnet.hudson.plugins:analysis-test:1.18" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jenkins-ci.plugins.workflow:workflow-job:1.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.jenkins-ci.plugins.workflow:workflow-support:1.5" level="project" />

diff --git a/pom.xml b/pom.xml
@@ -41,11 +41,6 @@
       <artifactId>commons-digester3</artifactId>
       <version>3.2</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.11.0</version>
-    </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.plugins</groupId>
       <artifactId>analysis-test</artifactId>

diff --git a/src/main/java/hudson/plugins/checkstyle/CheckStylePlugin.java b/src/main/java/hudson/plugins/checkstyle/CheckStylePlugin.java
@@ -1,9 +1,6 @@
 package hudson.plugins.checkstyle;
 
-import hudson.plugins.analysis.util.SaxSetup;
-
 import hudson.Plugin;
-
 import hudson.plugins.checkstyle.rules.CheckStyleRules;
 
 /**
@@ -14,13 +11,6 @@
 public class CheckStylePlugin extends Plugin {
     @Override
     public void start() {
-        SaxSetup sax = new SaxSetup();
-
-        try {
-            CheckStyleRules.getInstance().initialize();
-        }
-        finally {
-            sax.cleanup();
-        }
+        CheckStyleRules.getInstance().initialize();
     }
 }