This is an automated email from the ASF dual-hosted git repository.
snuyanzin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new 9fef53a [FLINK-33340] Upgrade jackson to 2.15.3
9fef53a is described below
commit 9fef53a5532d394bc853ba92088d23c98005da98
Author: Sergey Nuyanzin <snuyan...@gmail.com>
AuthorDate: Mon Nov 13 02:05:17 2023 +0100
[FLINK-33340] Upgrade jackson to 2.15.3
---
.../flink-shaded-jackson-2/pom.xml | 5 ++++-
.../src/main/resources/META-INF/NOTICE | 16 ++++++++--------
.../flink-shaded-jackson-module-jsonSchema-2/pom.xml | 5 ++++-
.../src/main/resources/META-INF/NOTICE | 8 ++++----
flink-shaded-jackson-parent/pom.xml | 2 +-
flink-shaded-swagger/pom.xml | 2 +-
flink-shaded-swagger/src/main/resources/META-INF/NOTICE | 6 +++---
pom.xml | 2 +-
8 files changed, 26 insertions(+), 20 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 a4c35b5..cd90649 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.14.2-17.0</version>
+ <version>2.15.3-17.0</version>
</parent>
<artifactId>flink-shaded-jackson${flink.ci.license.suffix}</artifactId>
@@ -78,6 +78,9 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <!-- Jackson uses multi release jars and in case 1.15.x there
is version 19
+ which is not supported by 3.3.x and below -->
+ <version>3.4.1</version>
<executions>
<execution>
<id>shade-flink</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 4e81f4e..aaade5d 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.14.2
-- com.fasterxml.jackson.core:jackson-core:2.14.2
-- com.fasterxml.jackson.core:jackson-databind:2.14.2
-- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.14.2
-- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.14.2
-- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2
-- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
-- org.yaml:snakeyaml:1.33
+- com.fasterxml.jackson.core:jackson-annotations:2.15.3
+- com.fasterxml.jackson.core:jackson-core:2.15.3
+- com.fasterxml.jackson.core:jackson-databind:2.15.3
+- com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.3
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3
+- com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.3
+- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3
+- org.yaml:snakeyaml:2.1
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 ff88a40..dca2751 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.14.2-17.0</version>
+ <version>2.15.3-17.0</version>
</parent>
<artifactId>flink-shaded-jackson-module-jsonSchema${flink.ci.license.suffix}</artifactId>
@@ -64,6 +64,9 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
+ <!-- Jackson uses multi release jars and in case 1.15.x there
is version 19
+ which is not supported by 3.3.x and below -->
+ <version>3.4.1</version>
<executions>
<execution>
<id>shade-flink</id>
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 8e27db5..9b06129 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.14.2
-- com.fasterxml.jackson.core:jackson-core:2.14.2
-- com.fasterxml.jackson.core:jackson-databind:2.14.2
-- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.14.2
+- com.fasterxml.jackson.core:jackson-annotations:2.15.3
+- com.fasterxml.jackson.core:jackson-core:2.15.3
+- com.fasterxml.jackson.core:jackson-databind:2.15.3
+- com.fasterxml.jackson.module:jackson-module-jsonSchema:2.15.3
- 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 9b0819b..90e141c 100644
--- a/flink-shaded-jackson-parent/pom.xml
+++ b/flink-shaded-jackson-parent/pom.xml
@@ -31,7 +31,7 @@ under the License.
<artifactId>flink-shaded-jackson-parent</artifactId>
<name>flink-shaded-jackson-parent</name>
<packaging>pom</packaging>
- <version>2.14.2-17.0</version>
+ <version>2.15.3-17.0</version>
<modules>
<module>flink-shaded-jackson-2</module>
diff --git a/flink-shaded-swagger/pom.xml b/flink-shaded-swagger/pom.xml
index 9932afb..24dbd43 100644
--- a/flink-shaded-swagger/pom.xml
+++ b/flink-shaded-swagger/pom.xml
@@ -51,7 +51,7 @@ under the License.
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
diff --git a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
index 202f00b..f12ef46 100644
--- a/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-swagger/src/main/resources/META-INF/NOTICE
@@ -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.14.2
-- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
+- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.3
+- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.3
- io.swagger.core.v3:swagger-annotations:2.2.8
- io.swagger.core.v3:swagger-core:2.2.8
- io.swagger.core.v3:swagger-models:2.2.8
- jakarta.validation:jakarta.validation-api:2.0.2
- org.apache.commons:commons-lang3:3.12.0
-- org.yaml:snakeyaml:2.0
+- org.yaml:snakeyaml:2.1
This project bundles the following dependencies under the Eclipse Distribution
License 1.0 (https://www.eclipse.org/org/documents/edl-v10.php)
diff --git a/pom.xml b/pom.xml
index 0eb9325..de920e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@ under the License.
<properties>
<shading.prefix>org.apache.flink.shaded</shading.prefix>
<netty.version>4.1.100.Final</netty.version>
- <jackson.version>2.14.2</jackson.version>
+ <jackson.version>2.15.3</jackson.version>
<guava.version>32.1.3-jre</guava.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.
