From 20d628fa64751b0e7f71fac4acd35b5f42cbcbfd Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 11 Feb 2013 16:52:39 -0500
Subject: [PATCH] Exclude NekoHTML and its concomitant obsolete Xerces.

---
 licenseCompleter.groovy |  5 -----
 maven-plugin/pom.xml    | 19 +------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/licenseCompleter.groovy b/licenseCompleter.groovy
index a7bc319495..e17602f818 100644
--- a/licenseCompleter.groovy
+++ b/licenseCompleter.groovy
@@ -96,11 +96,6 @@ complete {
     }
            
 
-    match("nekohtml:xercesMinimal:1.9.6.2") {
-        if (dependency.licenses.isEmpty())
-            rewriteLicense([], apacheLicense)
-    }    
-
     //
     // Choose from multi-licensed modules
     //==========================================================================
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 081a661cdb..c9c8de4e28 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -308,17 +308,6 @@ THE SOFTWARE.
           <groupId>org.apache.maven.wagon</groupId>
           <artifactId>wagon-webdav</artifactId>
         </exclusion>
-
-        <!-- prefer net.sourceforge.nekohtml:nekohtml:jar:1.9.13 so that we use consistent version across Jenkins -->
-        <exclusion>
-          <groupId>nekohtml</groupId>
-          <artifactId>nekohtml</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>nekohtml</groupId>
-          <artifactId>xercesMinimal</artifactId>
-        </exclusion>
-
       </exclusions>
     </dependency>
 
@@ -337,7 +326,7 @@ THE SOFTWARE.
           <groupId>org.slf4j</groupId>
           <artifactId>jcl-over-slf4j</artifactId>
         </exclusion>
-        <!-- prefer net.sourceforge.nekohtml:nekohtml:jar:1.9.13 so that we use consistent version across Jenkins -->
+        <!-- SECURITY-61: unused -->
         <exclusion>
           <groupId>nekohtml</groupId>
           <artifactId>nekohtml</artifactId>
@@ -349,12 +338,6 @@ THE SOFTWARE.
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>net.sourceforge.nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <version>1.9.13</version>
-    </dependency>
-
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>token-macro</artifactId>