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.git
The following commit(s) were added to refs/heads/master by this push:
new c0f080762e7 [FLINK-24718] Update Avro dependency to 1.11.1
c0f080762e7 is described below
commit c0f080762e7a1c1763942fed2e34420164a04bf3
Author: Ryan Skraba <[email protected]>
AuthorDate: Wed Aug 31 01:56:16 2022 -0700
[FLINK-24718] Update Avro dependency to 1.11.1
---
.../flink-end-to-end-tests-common-kafka/pom.xml | 2 +-
.../avro/typeutils/AvroTypeExtractionTest.java | 24 +++++++++++-----------
.../src/main/resources/META-INF/NOTICE | 2 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
pom.xml | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
index cf2c70e5fea..d07c35ac15e 100644
--- a/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
+++ b/flink-end-to-end-tests/flink-end-to-end-tests-common-kafka/pom.xml
@@ -135,7 +135,7 @@ under the License.
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.10.0</version>
+ <version>${avro.version}</version>
<scope>test</scope>
</dependency>
diff --git
a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeExtractionTest.java
b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeExtractionTest.java
index 7d36a2a8e42..289d9ca0ce3 100644
---
a/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeExtractionTest.java
+++
b/flink-formats/flink-avro/src/test/java/org/apache/flink/formats/avro/typeutils/AvroTypeExtractionTest.java
@@ -109,9 +109,9 @@ class AvroTypeExtractionTest {
+ "\"type_nested\": {\"num\": 239, \"street\": \"Baker
Street\", \"city\": \"London\", "
+ "\"state\": \"London\", \"zip\": \"NW1 6XE\"}, "
+ "\"type_bytes\":
\"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\", "
- + "\"type_date\": 2014-03-01, \"type_time_millis\":
12:12:12, \"type_time_micros\": 00:00:00.123456, "
- + "\"type_timestamp_millis\":
2014-03-01T12:12:12.321Z, "
- + "\"type_timestamp_micros\":
1970-01-01T00:00:00.123456Z, \"type_decimal_bytes\": \"\\u0007Ð\", "
+ + "\"type_date\": \"2014-03-01\",
\"type_time_millis\": \"12:12:12\", \"type_time_micros\": \"00:00:00.123456\", "
+ + "\"type_timestamp_millis\":
\"2014-03-01T12:12:12.321Z\", "
+ + "\"type_timestamp_micros\":
\"1970-01-01T00:00:00.123456Z\", \"type_decimal_bytes\": \"\\u0007Ð\", "
+ "\"type_decimal_fixed\": [7, -48]}\n"
+ "{\"name\": \"Charlie\", \"favorite_number\": null, "
+ "\"favorite_color\": \"blue\", \"type_long_test\":
1337, \"type_double_test\": 1.337, "
@@ -121,9 +121,9 @@ class AvroTypeExtractionTest {
+ "\"type_nested\": {\"num\": 239, \"street\": \"Baker
Street\", \"city\": \"London\", \"state\": \"London\", "
+ "\"zip\": \"NW1 6XE\"}, "
+ "\"type_bytes\":
\"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\", "
- + "\"type_date\": 2014-03-01, \"type_time_millis\":
12:12:12, \"type_time_micros\": 00:00:00.123456, "
- + "\"type_timestamp_millis\":
2014-03-01T12:12:12.321Z, "
- + "\"type_timestamp_micros\":
1970-01-01T00:00:00.123456Z, \"type_decimal_bytes\": \"\\u0007Ð\", "
+ + "\"type_date\": \"2014-03-01\",
\"type_time_millis\": \"12:12:12\", \"type_time_micros\": \"00:00:00.123456\", "
+ + "\"type_timestamp_millis\":
\"2014-03-01T12:12:12.321Z\", "
+ + "\"type_timestamp_micros\":
\"1970-01-01T00:00:00.123456Z\", \"type_decimal_bytes\": \"\\u0007Ð\", "
+ "\"type_decimal_fixed\": [7, -48]}\n";
}
@@ -160,9 +160,9 @@ class AvroTypeExtractionTest {
+ " \"type_nested\": {\"num\": 239, \"street\":
\"Baker Street\", \"city\": \"London\","
+ " \"state\": \"London\", \"zip\": \"NW1 6XE\"},"
+ " \"type_bytes\":
\"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\", "
- + "\"type_date\": 2014-03-01, \"type_time_millis\":
12:12:12, \"type_time_micros\": 00:00:00.123456, "
- + "\"type_timestamp_millis\":
2014-03-01T12:12:12.321Z, "
- + "\"type_timestamp_micros\":
1970-01-01T00:00:00.123456Z, \"type_decimal_bytes\": \"\\u0007Ð\", "
+ + "\"type_date\": \"2014-03-01\",
\"type_time_millis\": \"12:12:12\", \"type_time_micros\": \"00:00:00.123456\", "
+ + "\"type_timestamp_millis\":
\"2014-03-01T12:12:12.321Z\", "
+ + "\"type_timestamp_micros\":
\"1970-01-01T00:00:00.123456Z\", \"type_decimal_bytes\": \"\\u0007Ð\", "
+ "\"type_decimal_fixed\": [7, -48]}\n"
+ "{\"name\": \"Charlie\", \"favorite_number\": null, "
+ "\"favorite_color\": \"blue\", \"type_long_test\":
1337, \"type_double_test\": 1.337, "
@@ -172,9 +172,9 @@ class AvroTypeExtractionTest {
+ "\"type_nested\": {\"num\": 239, \"street\": \"Baker
Street\", \"city\": \"London\", \"state\": \"London\", "
+ "\"zip\": \"NW1 6XE\"}, "
+ "\"type_bytes\":
\"\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\\u0000\", "
- + "\"type_date\": 2014-03-01, \"type_time_millis\":
12:12:12, \"type_time_micros\": 00:00:00.123456, "
- + "\"type_timestamp_millis\":
2014-03-01T12:12:12.321Z, "
- + "\"type_timestamp_micros\":
1970-01-01T00:00:00.123456Z, \"type_decimal_bytes\": \"\\u0007Ð\", "
+ + "\"type_date\": \"2014-03-01\",
\"type_time_millis\": \"12:12:12\", \"type_time_micros\": \"00:00:00.123456\", "
+ + "\"type_timestamp_millis\":
\"2014-03-01T12:12:12.321Z\", "
+ + "\"type_timestamp_micros\":
\"1970-01-01T00:00:00.123456Z\", \"type_decimal_bytes\": \"\\u0007Ð\", "
+ "\"type_decimal_fixed\": [7, -48]}\n";
}
diff --git
a/flink-formats/flink-sql-avro-confluent-registry/src/main/resources/META-INF/NOTICE
b/flink-formats/flink-sql-avro-confluent-registry/src/main/resources/META-INF/NOTICE
index 5723beb6bd1..e259e971d30 100644
---
a/flink-formats/flink-sql-avro-confluent-registry/src/main/resources/META-INF/NOTICE
+++
b/flink-formats/flink-sql-avro-confluent-registry/src/main/resources/META-INF/NOTICE
@@ -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)
-- org.apache.avro:avro:1.10.0
+- org.apache.avro:avro:1.11.1
- com.fasterxml.jackson.core:jackson-core:2.13.2
- com.fasterxml.jackson.core:jackson-databind:2.13.2.2
- com.fasterxml.jackson.core:jackson-annotations:2.13.2
diff --git a/flink-formats/flink-sql-avro/src/main/resources/META-INF/NOTICE
b/flink-formats/flink-sql-avro/src/main/resources/META-INF/NOTICE
index 5f5c32d8083..7e81541ff54 100644
--- a/flink-formats/flink-sql-avro/src/main/resources/META-INF/NOTICE
+++ b/flink-formats/flink-sql-avro/src/main/resources/META-INF/NOTICE
@@ -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)
-- org.apache.avro:avro:1.10.0
+- org.apache.avro:avro:1.11.1
- com.fasterxml.jackson.core:jackson-core:2.13.2
- com.fasterxml.jackson.core:jackson-databind:2.13.2.2
- com.fasterxml.jackson.core:jackson-annotations:2.13.2
diff --git a/pom.xml b/pom.xml
index 67b383e8e82..1e95cb98ae2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ under the License.
<!-- keep FlinkContainersBuilder#buildZookeeperContainer() in
sync -->
<zookeeper.version>3.5.9</zookeeper.version>
<curator.version>5.2.0</curator.version>
- <avro.version>1.10.0</avro.version>
+ <avro.version>1.11.1</avro.version>
<javax.activation.api.version>1.2.0</javax.activation.api.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
<junit4.version>4.13.2</junit4.version>
@@ -593,7 +593,7 @@ under the License.
<scope>import</scope>
<version>2.13.2.20220328</version>
</dependency>
-
+
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
