Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[commons-text-upgrade] Upgrade commons text transitive dependency #3384

Merged
merged 8 commits into from Oct 19, 2022
Merged

[commons-text-upgrade] Upgrade commons text transitive dependency #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55ab9d3
[commons-text-upgrade] Excludes vulnerable transitive dependency, add…
abrackx Oct 18, 2022
c246cb3
[commons-text-upgrade] Updates release.pom with commons-text exclusio…
abrackx Oct 18, 2022
72ee3ed
Merge branch 'master' into commons-text-upgrade
suryaaki2 Oct 19, 2022
2f77453
[commons-text-upgrade] Uses dependency management to override transit…
abrackx Oct 19, 2022
6e26f2d
Revert "[commons-text-upgrade] Uses dependency management to override…
abrackx Oct 19, 2022
dd3a972
[commons-text-upgrade] Adds comment.
abrackx Oct 19, 2022
a4b91c5
[commons-text-upgrade] Additional comment.
abrackx Oct 19, 2022
41198f7
Merge branch 'master' into commons-text-upgrade
abrackx Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions liquibase-core/pom.xml
View file
Open in desktop
Expand Up @@ -112,6 +112,18 @@
<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>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion liquibase-dist/src/main/assembly/assembly-bin-common.xml
View file
Open in desktop
Expand Up @@ -110,7 +110,7 @@
<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 -->
Expand Down
10 changes: 10 additions & 0 deletions liquibase-dist/src/main/maven/release.pom.xml
View file
Open in desktop
Expand Up @@ -54,7 +54,17 @@
<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>