From 628e74896ef4fa80cf0929f81ac69a8ce5e469cf Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
Date: Fri, 30 Apr 2021 04:38:05 +1000
Subject: [PATCH] [JENKINS-65161] remove commons-digester2 from core and
 upgrade plugins to commons-digester3 (#254)

Signed-off-by: olivier lamy <olamy@apache.org>
---
 pom.xml                                               | 11 +++++++++++
 .../java/hudson/scm/SubversionChangeLogParser.java    |  6 ++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85b3c19d..fb50315e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 
@@ -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>
diff --git a/src/main/java/hudson/scm/SubversionChangeLogParser.java b/src/main/java/hudson/scm/SubversionChangeLogParser.java
index cf1c4ed3..bc49cb6c 100644
--- a/src/main/java/hudson/scm/SubversionChangeLogParser.java
+++ b/src/main/java/hudson/scm/SubversionChangeLogParser.java
@@ -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;
@@ -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);