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.

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

[FLINK-29418] Everybody gets an upgrade! #112

Merged
merged 8 commits into from Sep 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion flink-shaded-asm-9/pom.xml
Expand Up @@ -35,7 +35,7 @@ under the License.

<properties>
<asm.major.version>9</asm.major.version>
<asm.version>${asm.major.version}.2</asm.version>
<asm.version>${asm.major.version}.3</asm.version>
</properties>

<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions flink-shaded-asm-9/src/main/resources/META-INF/NOTICE
Expand Up @@ -7,7 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the BSD license.
See bundled license files for details.

- org.ow2.asm:asm:9.2
- org.ow2.asm:asm-analysis:9.2
- org.ow2.asm:asm-commons:9.2
- org.ow2.asm:asm-tree:9.2
- org.ow2.asm:asm:9.3
- org.ow2.asm:asm-analysis:9.3
- org.ow2.asm:asm-commons:9.3
- org.ow2.asm:asm-tree:9.3
12 changes: 1 addition & 11 deletions flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
<version>2.12.4-16.0</version>
<version>2.13.4-16.0</version>
</parent>

<artifactId>flink-shaded-jackson${flink.ci.license.suffix}</artifactId>
Expand Down Expand Up @@ -64,16 +64,6 @@ under the License.
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
</dependencies>
</dependencyManagement>

<profiles>
<profile>
<id>license-check</id>
Expand Down
Expand Up @@ -6,11 +6,11 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.fasterxml.jackson.core:jackson-annotations:2.12.4
- com.fasterxml.jackson.core:jackson-core:2.12.4
- com.fasterxml.jackson.core:jackson-databind:2.12.4
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.12.4
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.4
- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.4
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4
- org.yaml:snakeyaml:1.29
- com.fasterxml.jackson.core:jackson-annotations:2.13.4
- com.fasterxml.jackson.core:jackson-core:2.13.4
- com.fasterxml.jackson.core:jackson-databind:2.13.4
- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.13.4
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4
- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4
- org.yaml:snakeyaml:1.31
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson-parent</artifactId>
<version>2.12.4-16.0</version>
<version>2.13.4-16.0</version>
</parent>

<artifactId>flink-shaded-jackson-module-jsonSchema${flink.ci.license.suffix}</artifactId>
Expand Down
Expand Up @@ -6,8 +6,8 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.fasterxml.jackson.core:jackson-annotations:2.12.4
- com.fasterxml.jackson.core:jackson-core:2.12.4
- com.fasterxml.jackson.core:jackson-databind:2.12.4
- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.12.4
- com.fasterxml.jackson.core:jackson-annotations:2.13.4
- com.fasterxml.jackson.core:jackson-core:2.13.4
- com.fasterxml.jackson.core:jackson-databind:2.13.4
- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.13.4
- javax.validation:validation-api:1.1.0.Final
6 changes: 1 addition & 5 deletions flink-shaded-jackson-parent/pom.xml
Expand Up @@ -31,11 +31,7 @@ under the License.
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
<version>2.12.4-16.0</version>

<properties>
<jackson.version>2.12.4</jackson.version>
</properties>
<version>2.13.4-16.0</version>

<modules>
<module>flink-shaded-jackson-2</module>
Expand Down
66 changes: 33 additions & 33 deletions flink-shaded-netty-4/src/main/resources/META-INF/NOTICE
Expand Up @@ -6,36 +6,36 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- io.netty:netty-all:4.1.70.Final
- io.netty:netty-buffer:4.1.70.Final
- io.netty:netty-codec:4.1.70.Final
- io.netty:netty-codec-dns:4.1.70.Final
- io.netty:netty-codec-haproxy:4.1.70.Final
- io.netty:netty-codec-http:4.1.70.Final
- io.netty:netty-codec-http2:4.1.70.Final
- io.netty:netty-codec-memcache:4.1.70.Final
- io.netty:netty-codec-mqtt:4.1.70.Final
- io.netty:netty-codec-redis:4.1.70.Final
- io.netty:netty-codec-smtp:4.1.70.Final
- io.netty:netty-codec-socks:4.1.70.Final
- io.netty:netty-codec-stomp:4.1.70.Final
- io.netty:netty-codec-xml:4.1.70.Final
- io.netty:netty-common:4.1.70.Final
- io.netty:netty-handler:4.1.70.Final
- io.netty:netty-handler-proxy:4.1.70.Final
- io.netty:netty-resolver:4.1.70.Final
- io.netty:netty-resolver-dns:4.1.70.Final
- io.netty:netty-resolver-dns-classes-macos:4.1.70.Final
- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.70.Final
- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.70.Final
- io.netty:netty-transport:4.1.70.Final
- io.netty:netty-transport-classes-epoll:4.1.70.Final
- io.netty:netty-transport-classes-kqueue:4.1.70.Final
- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.70.Final
- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.70.Final
- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.70.Final
- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.70.Final
- io.netty:netty-transport-native-unix-common:4.1.70.Final
- io.netty:netty-transport-rxtx:4.1.70.Final
- io.netty:netty-transport-sctp:4.1.70.Final
- io.netty:netty-transport-udt:4.1.70.Final
- io.netty:netty-all:4.1.82.Final
- io.netty:netty-buffer:4.1.82.Final
- io.netty:netty-codec:4.1.82.Final
- io.netty:netty-codec-dns:4.1.82.Final
- io.netty:netty-codec-haproxy:4.1.82.Final
- io.netty:netty-codec-http:4.1.82.Final
- io.netty:netty-codec-http2:4.1.82.Final
- io.netty:netty-codec-memcache:4.1.82.Final
- io.netty:netty-codec-mqtt:4.1.82.Final
- io.netty:netty-codec-redis:4.1.82.Final
- io.netty:netty-codec-smtp:4.1.82.Final
- io.netty:netty-codec-socks:4.1.82.Final
- io.netty:netty-codec-stomp:4.1.82.Final
- io.netty:netty-codec-xml:4.1.82.Final
- io.netty:netty-common:4.1.82.Final
- io.netty:netty-handler:4.1.82.Final
- io.netty:netty-handler-proxy:4.1.82.Final
- io.netty:netty-resolver:4.1.82.Final
- io.netty:netty-resolver-dns:4.1.82.Final
- io.netty:netty-resolver-dns-classes-macos:4.1.82.Final
- io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.82.Final
- io.netty:netty-resolver-dns-native-macos:osx-aarch_64:4.1.82.Final
- io.netty:netty-transport:4.1.82.Final
- io.netty:netty-transport-classes-epoll:4.1.82.Final
- io.netty:netty-transport-classes-kqueue:4.1.82.Final
- io.netty:netty-transport-native-epoll:linux-x86_64:4.1.82.Final
- io.netty:netty-transport-native-epoll:linux-aarch_64:4.1.82.Final
- io.netty:netty-transport-native-kqueue:osx-x86_64:4.1.82.Final
- io.netty:netty-transport-native-kqueue:osx-aarch_64:4.1.82.Final
- io.netty:netty-transport-native-unix-common:4.1.82.Final
- io.netty:netty-transport-rxtx:4.1.82.Final
- io.netty:netty-transport-sctp:4.1.82.Final
- io.netty:netty-transport-udt:4.1.82.Final
3 changes: 2 additions & 1 deletion flink-shaded-netty-tcnative-dynamic/pom.xml
Expand Up @@ -34,7 +34,7 @@ under the License.

<properties>
<!-- This is based on the "tcnative.version" property in the netty root pom-->
<netty.tcnative.version>2.0.44.Final</netty.tcnative.version>
<netty.tcnative.version>2.0.54.Final</netty.tcnative.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -64,6 +64,7 @@ under the License.
<artifactSet>
<includes>
<include>io.netty:netty-tcnative</include>
<include>io.netty:netty-tcnative-classes</include>
</includes>
</artifactSet>
<relocations>
Expand Down
Expand Up @@ -6,4 +6,5 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- io.netty:netty-tcnative:2.0.44.Final
- io.netty:netty-tcnative:2.0.54.Final
- io.netty:netty-tcnative-classes:2.0.54.Final
2 changes: 1 addition & 1 deletion flink-shaded-netty-tcnative-static/pom.xml
Expand Up @@ -34,7 +34,7 @@ under the License.

<properties>
<!-- This is based on the "tcnative.version" property in the netty root pom-->
<netty.tcnative.version>2.0.44.Final</netty.tcnative.version>
<netty.tcnative.version>2.0.54.Final</netty.tcnative.version>
</properties>

<dependencies>
Expand Down
Expand Up @@ -6,7 +6,7 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- io.netty:netty-tcnative-boringssl-static:2.0.44.Final
- io.netty:netty-tcnative-boringssl-static:2.0.54.Final

This project bundles the following dependencies under the OpenSSL license.
See bundled license files for details.
Expand Down
19 changes: 18 additions & 1 deletion flink-shaded-swagger/pom.xml
Expand Up @@ -36,7 +36,7 @@ under the License.
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-core</artifactId>
<version>2.1.11</version>
<version>2.2.2</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -46,6 +46,23 @@ under the License.
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.31</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
Expand Down
14 changes: 7 additions & 7 deletions flink-shaded-swagger/src/main/resources/META-INF/NOTICE
Expand Up @@ -6,14 +6,14 @@ The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.1
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.1
- io.swagger.core.v3:swagger-annotations:2.1.11
- io.swagger.core.v3:swagger-core:2.1.11
- io.swagger.core.v3:swagger-models:2.1.11
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.4
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4
- io.swagger.core.v3:swagger-annotations:2.2.2
- io.swagger.core.v3:swagger-core:2.2.2
- io.swagger.core.v3:swagger-models:2.2.2
- jakarta.validation:jakarta.validation-api:2.0.2
- org.apache.commons:commons-lang3:3.7
- org.yaml:snakeyaml:1.27
- org.apache.commons:commons-lang3:3.12.0
- org.yaml:snakeyaml:1.31

This project bundles the following dependencies under the Eclipse Distribution License 1.0 (https://www.eclipse.org/org/documents/edl-v10.php)

Expand Down
Expand Up @@ -33,8 +33,8 @@ under the License.
<version>${zookeeper.version}-16.0</version>

<properties>
<zookeeper.version>3.5.9</zookeeper.version>
<curator.version>5.2.0</curator.version>
<zookeeper.version>3.5.10</zookeeper.version>
<curator.version>5.3.0</curator.version>
</properties>

<dependencies>
Expand Down
Expand Up @@ -7,17 +7,17 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)

- com.google.guava:guava:27.0.1-jre
- io.netty:netty-buffer:4.1.70.Final
- io.netty:netty-codec:4.1.70.Final
- io.netty:netty-common:4.1.70.Final
- io.netty:netty-handler:4.1.70.Final
- io.netty:netty-resolver:4.1.70.Final
- io.netty:netty-transport:4.1.70.Final
- io.netty:netty-transport-classes-epoll:4.1.70.Final
- io.netty:netty-transport-native-epoll:4.1.70.Final
- io.netty:netty-transport-native-unix-common:4.1.70.Final
- org.apache.curator:curator-client:5.2.0
- org.apache.curator:curator-framework:5.2.0
- org.apache.curator:curator-recipes:5.2.0
- org.apache.zookeeper:zookeeper:3.5.9
- org.apache.zookeeper:zookeeper-jute:3.5.9
- io.netty:netty-buffer:4.1.82.Final
- io.netty:netty-codec:4.1.82.Final
- io.netty:netty-common:4.1.82.Final
- io.netty:netty-handler:4.1.82.Final
- io.netty:netty-resolver:4.1.82.Final
- io.netty:netty-transport:4.1.82.Final
- io.netty:netty-transport-classes-epoll:4.1.82.Final
- io.netty:netty-transport-native-epoll:4.1.82.Final
- io.netty:netty-transport-native-unix-common:4.1.82.Final
- org.apache.curator:curator-client:5.3.0
- org.apache.curator:curator-framework:5.3.0
- org.apache.curator:curator-recipes:5.3.0
- org.apache.zookeeper:zookeeper:3.5.10
- org.apache.zookeeper:zookeeper-jute:3.5.10
Expand Up @@ -34,7 +34,7 @@ under the License.

<properties>
<zookeeper.version>3.6.3</zookeeper.version>
<curator.version>5.2.0</curator.version>
<curator.version>5.3.0</curator.version>
</properties>

<dependencies>
Expand Down
Expand Up @@ -8,17 +8,17 @@ This project bundles the following dependencies under the Apache Software Licens

- com.google.guava:guava:27.0.1-jre
- io.dropwizard.metrics:metrics-core:3.2.5
- io.netty:netty-buffer:4.1.70.Final
- io.netty:netty-codec:4.1.70.Final
- io.netty:netty-common:4.1.70.Final
- io.netty:netty-handler:4.1.70.Final
- io.netty:netty-resolver:4.1.70.Final
- io.netty:netty-transport:4.1.70.Final
- io.netty:netty-transport-classes-epoll:4.1.70.Final
- io.netty:netty-transport-native-epoll:4.1.70.Final
- io.netty:netty-transport-native-unix-common:4.1.70.Final
- org.apache.curator:curator-client:5.2.0
- org.apache.curator:curator-framework:5.2.0
- org.apache.curator:curator-recipes:5.2.0
- io.netty:netty-buffer:4.1.82.Final
- io.netty:netty-codec:4.1.82.Final
- io.netty:netty-common:4.1.82.Final
- io.netty:netty-handler:4.1.82.Final
- io.netty:netty-resolver:4.1.82.Final
- io.netty:netty-transport:4.1.82.Final
- io.netty:netty-transport-classes-epoll:4.1.82.Final
- io.netty:netty-transport-native-epoll:4.1.82.Final
- io.netty:netty-transport-native-unix-common:4.1.82.Final
- org.apache.curator:curator-client:5.3.0
- org.apache.curator:curator-framework:5.3.0
- org.apache.curator:curator-recipes:5.3.0
- org.apache.zookeeper:zookeeper:3.6.3
- org.apache.zookeeper:zookeeper-jute:3.6.3