From fab038eb5bf13d7a9db9a7a524956c59273b30fd Mon Sep 17 00:00:00 2001
From: Alex Brackx <abrackx@liquibase.com>
Date: Thu, 27 Oct 2022 10:13:32 -0400
Subject: [PATCH 1/2] [opencsv-upgrade] Removes commons-text exclusion, updates
 opencsv to latest.

---
 liquibase-core/pom.xml                        | 14 +-------------
 liquibase-dist/src/main/maven/release.pom.xml | 12 +-----------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/liquibase-core/pom.xml b/liquibase-core/pom.xml
index 2790eb62fef..182299b383d 100644
--- a/liquibase-core/pom.xml
+++ b/liquibase-core/pom.xml
@@ -111,19 +111,7 @@
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.7.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!--TODO: This is overriding the commons-text dependency in opencsv. Once opencsv 5.7.1 is released we can remove this entry and the exclusion. See: https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-3043138-->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>5.7.1</version>
         </dependency>
     </dependencies>
 
diff --git a/liquibase-dist/src/main/maven/release.pom.xml b/liquibase-dist/src/main/maven/release.pom.xml
index 56e52105418..f8c5672887b 100644
--- a/liquibase-dist/src/main/maven/release.pom.xml
+++ b/liquibase-dist/src/main/maven/release.pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
-            <version>5.6</version>
+            <version>5.7.1</version>
             <scope>compile</scope>
             <exclusions>
                 <!-- not used by liquibase code -->
@@ -54,17 +54,7 @@
                     <groupId>commons-beanutils</groupId>
                     <artifactId>commons-beanutils</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <!--TODO: This is overriding the commons-text dependency in opencsv. Once opencsv 5.7.1 is released we can remove this entry and the exclusion. See: https://security.snyk.io/vuln/SNYK-JAVA-ORGAPACHECOMMONS-3043138-->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
-        </dependency>
     </dependencies>
 </project>

From d536dae8f9d9aa2b85547ce003c43a4d0dad9fdb Mon Sep 17 00:00:00 2001
From: Alex Brackx <abrackx@liquibase.com>
Date: Thu, 27 Oct 2022 10:22:13 -0400
Subject: [PATCH 2/2] [opencsv-upgrade] Reverts change to assembly-bin-common
 to include commons-text.

---
 liquibase-dist/src/main/assembly/assembly-bin-common.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/liquibase-dist/src/main/assembly/assembly-bin-common.xml b/liquibase-dist/src/main/assembly/assembly-bin-common.xml
index f23cfc70168..4fe2e0a2a55 100644
--- a/liquibase-dist/src/main/assembly/assembly-bin-common.xml
+++ b/liquibase-dist/src/main/assembly/assembly-bin-common.xml
@@ -110,7 +110,6 @@
 				<include>com.ibm.db2:jcc:jar:</include>
 				<include>org.firebirdsql.jdbc:jaybird:</include>
                 <include>net.snowflake:snowflake-jdbc:</include>
-				<include>org.apache.commons:commons-text:</include> <!-- TODO: Remove once opencsv has a new release and updates commons-text to a version >= 1.10.0 -->
                 <include>javax.resource:connector-api:</include>
 
 				<!-- CANNOT SHIP FOR LICENSE REASONS -->