From f7ad2e8fe36d4257fb9c3bdda2f21d824735e28d Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Fri, 19 Mar 2021 18:09:41 +0100
Subject: [PATCH] JAVA-3594: Upgrade esapi dependency in the main pom.xml
 (#10572)

* JAVA-3594: Upgrade esapi version in the main pom.xml

* JAVA-3594: Remove overriden esapi.version from the core-java-jvm

* JAVA-3594: Use esapi.version property instead of the hardcoded version in spring-5-security

Co-authored-by: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
---
 core-java-modules/core-java-jvm/pom.xml           | 1 -
 pom.xml                                           | 2 +-
 spring-security-modules/spring-5-security/pom.xml | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core-java-modules/core-java-jvm/pom.xml b/core-java-modules/core-java-jvm/pom.xml
index 08e536998c..17ff2f658f 100644
--- a/core-java-modules/core-java-jvm/pom.xml
+++ b/core-java-modules/core-java-jvm/pom.xml
@@ -77,7 +77,6 @@
         <assertj.version>3.6.1</assertj.version>
         <!-- instrumentation -->
         <javaassist.version>3.27.0-GA</javaassist.version>
-        <esapi.version>2.1.0.1</esapi.version>
         <sun.tools.version>1.8.0</sun.tools.version>
         <jol-core.version>0.10</jol-core.version>
         <asm.version>8.0.1</asm.version>
diff --git a/pom.xml b/pom.xml
index 5c75b19324..f202430ccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1370,7 +1370,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <java.version>1.8</java.version>
         <log4j.version>1.2.17</log4j.version>
-        <esapi.version>2.1.0.1</esapi.version>
+        <esapi.version>2.2.2.0</esapi.version>
         <jmh-core.version>1.19</jmh-core.version>
         <jmh-generator.version>1.19</jmh-generator.version>
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
diff --git a/spring-security-modules/spring-5-security/pom.xml b/spring-security-modules/spring-5-security/pom.xml
index f50b5ff7a9..d009115c92 100644
--- a/spring-security-modules/spring-5-security/pom.xml
+++ b/spring-security-modules/spring-5-security/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.owasp.esapi</groupId>
             <artifactId>esapi</artifactId>
-            <version>2.2.2.0</version>
+            <version>${esapi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>