Skip to content

Commit

Permalink
[JENKINS-65161] remove commons-digester2 from core and upgrade plugin…
Browse files Browse the repository at this point in the history
…s to commons-digester3 (#254)

Signed-off-by: olivier lamy <[email protected]>
  • Loading branch information
olamy authored Apr 29, 2021
1 parent 024c3b1 commit 628e748
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
11 changes: 11 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ THE SOFTWARE.
<artifactId>json</artifactId>
<version>20190722</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<!-- 1.9.4 when this merged https://github.com/stapler/stapler/pull/211 -->
<version>1.9.3</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand All @@ -202,6 +208,11 @@ THE SOFTWARE.
<artifactId>mapdb-api</artifactId>
<version>1.0.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
<version>3.2</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/hudson/scm/SubversionChangeLogParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
import hudson.model.Run;
import hudson.scm.SubversionChangeLogSet.LogEntry;
import hudson.scm.SubversionChangeLogSet.Path;
import hudson.util.Digester2;
import jenkins.util.SystemProperties;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester3.Digester;
import org.xml.sax.SAXException;

import javax.xml.parsers.ParserConfigurationException;
Expand Down Expand Up @@ -60,7 +58,7 @@ public SubversionChangeLogParser(boolean ignoreDirPropChanges) {
@Override public SubversionChangeLogSet parse(@SuppressWarnings("rawtypes") Run build, RepositoryBrowser<?> browser, File changelogFile) throws IOException, SAXException {
// http://svn.apache.org/repos/asf/subversion/trunk/subversion/svn/schema/log.rnc

Digester digester = new Digester2();
Digester digester = new Digester();
if (!Boolean.getBoolean(SubversionChangeLogParser.class.getName() + ".UNSAFE")) {
try {
digester.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
Expand Down

0 comments on commit 628e748

Please sign in to comment.