You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/09/27 08:38:55 UTC
[flink-shaded] 02/08: [FLINK-29418][jackson] Upgrade 2.12.4 -> 2.13.4
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit d89e7caf5b0ba46fd77d08bf404a50c3b6f1d1d7
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon Sep 26 14:30:40 2022 +0200
[FLINK-29418][jackson] Upgrade 2.12.4 -> 2.13.4
---
.../flink-shaded-jackson-2/pom.xml | 12 +-----------
.../src/main/resources/META-INF/NOTICE | 16 ++++++++--------
.../flink-shaded-jackson-module-jsonSchema-2/pom.xml | 2 +-
.../src/main/resources/META-INF/NOTICE | 8 ++++----
flink-shaded-jackson-parent/pom.xml | 6 +-----
flink-shaded-swagger/pom.xml | 12 ++++++++++++
flink-shaded-swagger/src/main/resources/META-INF/NOTICE | 4 ++--
pom.xml | 1 +
8 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
index 0107157..83a7c1a 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml
@@ -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>
@@ -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>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
index ec4dcc3..288821a 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/src/main/resources/META-INF/NOTICE
@@ -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
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
index 6d9f09d..bbf3876 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml
@@ -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>
diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
index 2ff23c8..6216177 100644
--- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/src/main/resources/META-INF/NOTICE
@@ -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
\ No newline at end of file
diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml
index 5706a4f..0f8fa9a 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -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>
diff --git a/flink-shaded-swagger/pom.xml b/flink-shaded-swagger/pom.xml
index ef6bb1d..81347fe 100644
--- a/flink-shaded-swagger/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -46,6 +46,18 @@ under the License.
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <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>
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
index 4e64de0..c007d51 100644
--- a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
@@ -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.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
- jakarta.validation:jakarta.validation-api:2.0.2
- org.apache.commons:commons-lang3:3.7
- org.yaml:snakeyaml:1.27
diff --git a/pom.xml b/pom.xml
index 601640a..5dacfde 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,6 +63,7 @@ under the License.
<properties>
<shading.prefix>org.apache.flink.shaded</shading.prefix>
<netty.version>4.1.70.Final</netty.version>
+ <jackson.version>2.13.4</jackson.version>
<!-- The license check requires the artifactId to match the directory that the module resides in.
This is not the case for several modules in flink-shaded for legacy reasons.
This property can be used by modules to add a suffix to the artifactId to match the directory name on CI