From 4ab84ff819a8d05138799c7968d211b31aa21af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Moreira?= <vitor.moreira-v@alfresco.com>
Date: Wed, 13 Apr 2022 23:49:44 +0100
Subject: [PATCH] Fix/mnt 22946 spring rce databind jdk9 70 n (#1058)

* Bump dependency.webscripts.version from 8.28 to 8.29 (#1052)

(cherry picked from commit 22a0343c4117481aeb1bfe7bba6e8429f3757a5c)

* MNT-22946: bump spring version to 5.3.18 (#1054)

(cherry picked from commit 53777cd5b918f8898b757fc9199801d770ab09e2)

* MNT-22946: implemented empty new methods from springframework

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml                                               |  4 ++--
 .../management/SafeApplicationEventMulticaster.java   | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b8e412969c..a212fd8c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,13 +53,13 @@
         <dependency.alfresco-greenmail.version>6.2</dependency.alfresco-greenmail.version>
         <dependency.acs-event-model.version>0.0.12</dependency.acs-event-model.version>
 
-        <dependency.spring.version>5.3.3</dependency.spring.version>
+        <dependency.spring.version>5.3.18</dependency.spring.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
         <dependency.jackson.version>2.12.3</dependency.jackson.version>
         <dependency.jackson-databind.version>2.12.3</dependency.jackson-databind.version>
         <dependency.cxf.version>3.4.4</dependency.cxf.version>
         <dependency.opencmis.version>1.0.0</dependency.opencmis.version>
-        <dependency.webscripts.version>8.22</dependency.webscripts.version>
+        <dependency.webscripts.version>8.29</dependency.webscripts.version>
         <dependency.bouncycastle.version>1.69</dependency.bouncycastle.version>
         <dependency.mockito-core.version>3.9.0</dependency.mockito-core.version>
         <dependency.org-json.version>20210307</dependency.org-json.version>
diff --git a/repository/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java b/repository/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
index baae82464e..cb0fb3588d 100644
--- a/repository/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
+++ b/repository/src/main/java/org/alfresco/repo/management/SafeApplicationEventMulticaster.java
@@ -33,6 +33,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
+import java.util.function.Predicate;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -152,6 +153,16 @@ public class SafeApplicationEventMulticaster implements ApplicationEventMulticas
         }
     }
 
+    @Override
+    public void removeApplicationListeners(Predicate<ApplicationListener<?>> predicate)
+    {
+    }
+
+    @Override
+    public void removeApplicationListenerBeans(Predicate<String> predicate)
+    {
+    }
+
     public void removeAllListeners()
     {
         synchronized (this.defaultRetriever)