Exclude NekoHTML and its concomitant obsolete Xerces.

This commit is contained in:
Jesse Glick committed 2013-02-11 16:52:39 -05:00
1 parent aaf79ed33e
commit 20d628fa64
2 files changed
+1 -23

No files matched your search

-5
View File
@@ -96,11 +96,6 @@ complete {
}
match("nekohtml:xercesMinimal:1.9.6.2") {
if (dependency.licenses.isEmpty())
rewriteLicense([], apacheLicense)
}
//
// Choose from multi-licensed modules
//==========================================================================
+1 -18
View File
@@ -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>