Skip to content

Commit

Permalink
[FLINK-34955] Upgrade commons-compress to 1.26.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
slfan1989 authored and mbalassi committed Apr 2, 2024
1 parent 20c506d commit 55ec469
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 13 deletions.
4 changes: 2 additions & 2 deletions flink-dist/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ This project bundles the following dependencies under the Apache Software Licens
- com.ververica:frocksdbjni:6.20.3-ververica-2.0
- commons-cli:commons-cli:1.5.0
- commons-collections:commons-collections:3.2.2
- commons-io:commons-io:2.11.0
- org.apache.commons:commons-compress:1.21
- commons-io:commons-io:2.15.1
- org.apache.commons:commons-compress:1.26.0
- org.apache.commons:commons-lang3:3.12.0
- org.apache.commons:commons-math3:3.6.1
- org.apache.commons:commons-text:1.10.0
Expand Down
7 changes: 7 additions & 0 deletions flink-end-to-end-tests/flink-sql-client-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ under the License.
<artifactId>kafka</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ This project bundles the following dependencies under the Apache Software Licens
- com.google.j2objc:j2objc-annotations:1.1
- commons-beanutils:commons-beanutils:1.9.4
- commons-collections:commons-collections:3.2.2
- commons-io:commons-io:2.11.0
- commons-io:commons-io:2.15.1
- commons-logging:commons-logging:1.1.3
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-compress:1.26.0
- org.apache.commons:commons-configuration2:2.1.1
- org.apache.commons:commons-lang3:3.12.0
- org.apache.commons:commons-text:1.10.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ This project bundles the following dependencies under the Apache Software Licens
- commons-beanutils:commons-beanutils:1.9.4
- commons-codec:commons-codec:1.15
- commons-collections:commons-collections:3.2.2
- commons-io:commons-io:2.11.0
- commons-io:commons-io:2.15.1
- commons-logging:commons-logging:1.1.3
- joda-time:joda-time:2.5
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-compress:1.26.0
- org.apache.commons:commons-configuration2:2.1.1
- org.apache.commons:commons-lang3:3.12.0
- org.apache.commons:commons-text:1.10.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ This project bundles the following dependencies under the Apache Software Licens
- commons-beanutils:commons-beanutils:1.9.4
- commons-codec:commons-codec:1.15
- commons-collections:commons-collections:3.2.2
- commons-io:commons-io:2.11.0
- commons-io:commons-io:2.15.1
- commons-logging:commons-logging:1.1.3
- io.airlift:slice:0.38
- io.airlift:units:1.3
- joda-time:joda-time:2.5
- org.alluxio:alluxio-shaded-client:2.7.3
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-compress:1.26.0
- org.apache.commons:commons-configuration2:2.1.1
- org.apache.commons:commons-lang3:3.12.0
- org.apache.commons:commons-text:1.10.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ This project bundles the following dependencies under the Apache Software Licens
- io.confluent:common-utils:7.2.2
- io.confluent:kafka-schema-registry-client:7.2.2
- org.apache.avro:avro:1.11.3
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-compress:1.26.0
- org.apache.commons:commons-lang3:3.12.0
- org.apache.kafka:kafka-clients:7.2.2-ccs
- org.glassfish.jersey.core:jersey-common:2.30
- org.xerial.snappy:snappy-java:1.1.10.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ This project bundles the following dependencies under the Apache Software Licens
- com.fasterxml.jackson.core:jackson-core:2.14.3
- com.fasterxml.jackson.core:jackson-databind:2.14.3
- com.fasterxml.jackson.core:jackson-annotations:2.14.3
- org.apache.commons:commons-compress:1.21
- org.apache.commons:commons-compress:1.26.0
12 changes: 12 additions & 0 deletions flink-python/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,18 @@ under the License.
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

</dependencies>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This project bundles the following dependencies under the Apache Software Licens
- org.apache.calcite:calcite-linq4j:1.32.0
- org.apache.calcite.avatica:avatica-core:1.22.0
- commons-codec:commons-codec:1.15
- commons-io:commons-io:2.11.0
- commons-io:commons-io:2.15.1

This project bundles the following dependencies under the MIT License. (http:https://www.opensource.org/licenses/mit-license.php)

Expand Down
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ under the License.
<okhttp.version>3.14.9</okhttp.version>
<testcontainers.version>1.18.3</testcontainers.version>
<lz4.version>1.8.0</lz4.version>
<commons.io.version>2.15.1</commons.io.version>
<japicmp.skip>false</japicmp.skip>
<flink.convergence.phase>validate</flink.convergence.phase>
<!--
Expand Down Expand Up @@ -683,7 +684,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>${commons.io.version}</version>
</dependency>

<!-- commons collections needs to be pinned to this critical security fix version -->
Expand Down Expand Up @@ -722,7 +723,7 @@ under the License.
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.26.0</version>
<exclusions>
<exclusion>
<!-- Causes unnecessary dependency convergence errors; see MENFORCER-437 -->
Expand Down

0 comments on commit 55ec469

Please sign in to comment.