Skip to content

Commit

Permalink
[JENKINS-53322] Pre-work for removing dom4j fork. (jenkinsci#4089)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jeffret-b authored and oleg-nenashev committed Jul 12, 2019
1 parent ece68cd commit 31658d0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion licenseCompleter.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ complete {
rewriteLicense([], license("BSD License","http://jaxen.codehaus.org/license.html"))
}

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

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

// now make sure that these URLs are unprotected
Expand Down

0 comments on commit 31658d0

Please sign in to comment.