root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

[JENKINS-53322] Pre-work for removing dom4j fork. (#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.
This commit is contained in:
Jeff Thompson 2019-07-12 03:32:50 -06:00 committed by Oleg Nenashev
parent ece68cdd68
commit 31658d0f70
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
licenseCompleter.groovy
View File

@ -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"))
}

4
test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
View File

@ -95,8 +95,8 @@ public class JnlpAccessWithSecuredHudsonTest {
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