Skip to content

Commit 31658d0

Browse files
jeffret-boleg-nenashev
authored andcommitted
[JENKINS-53322] Pre-work for removing dom4j fork. (jenkinsci#4089)
Changes to enable Jenkins to use either the standard, current dom4j release or the Jenkins-custom fork. This allows us to separately remove the fork and reference the standard one.
1 parent ece68cd commit 31658d0

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

licenseCompleter.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ complete {
4848
rewriteLicense([], license("BSD License","http://jaxen.codehaus.org/license.html"))
4949
}
5050

51-
match("*:dom4j") {
51+
match("org.jenkins-ci.dom4j:dom4j") {
5252
rewriteLicense([],license("BSD License","http://dom4j.sourceforge.net/dom4j-1.6.1/license.html"))
5353
}
5454

test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public void anonymousCanAlwaysLoadJARs() throws Exception {
9595
XmlPage jnlp = (XmlPage) wc.goTo("computer/test/slave-agent.jnlp","application/x-java-jnlp-file");
9696
URL baseUrl = jnlp.getUrl();
9797
Document dom = new DOMReader().read(jnlp.getXmlDocument());
98-
for( Element jar : (List<Element>)dom.selectNodes("//jar") ) {
99-
URL url = new URL(baseUrl,jar.attributeValue("href"));
98+
for( Object jar : dom.selectNodes("//jar") ) {
99+
URL url = new URL(baseUrl,((org.dom4j.Element)jar).attributeValue("href"));
100100
System.out.println(url);
101101

102102
// now make sure that these URLs are unprotected

0 commit comments

Comments
 (0)