[opencsv-upgrade] Updates opencsv to 5.7.1 (#3419)

* [opencsv-upgrade] Removes commons-text exclusion, updates opencsv to latest. * [opencsv-upgrade] Reverts change to assembly-bin-common to include commons-text. Co-authored-by: suryaaki2 <80348493+suryaaki2@users.noreply.github.com>
liquibase · Oct 31, 2022 · 96c10dd · 96c10dd
1 parent d9451da
commit 96c10dd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 25 deletions.
diff --git 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/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 -->

diff --git a/liquibase-dist/src/main/maven/release.pom.xml b/liquibase-dist/src/main/maven/release.pom.xml
@@ -46,25 +46,15 @@
         <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 -->
                 <exclusion>
                     <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>