[FLINK-29574] Upgrade software.amazon.glue:schema-registry-common and…

… software.amazon.glue:schema-registry-serde dependency from 1.1.8 to 1.1.14
nicusX · Oct 12, 2022 · 9407245 · 9407245
1 parent 75dddf6
commit 9407245
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/flink-end-to-end-tests/flink-glue-schema-registry-avro-test/pom.xml b/flink-end-to-end-tests/flink-glue-schema-registry-avro-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
 	<properties>
 		<aws.sdk.version>1.12.276</aws.sdk.version>
 		<aws.sdkv2.version>2.17.247</aws.sdkv2.version>
-		<kotlin.version>1.3.50</kotlin.version>
+		<kotlin.version>1.7.10</kotlin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -85,6 +85,11 @@ under the License.
 				<artifactId>kotlin-stdlib-jdk8</artifactId>
 				<version>${kotlin.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
+				<version>${kotlin.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jetbrains.kotlinx</groupId>
 				<artifactId>kotlinx-serialization-core-jvm</artifactId>

diff --git a/flink-end-to-end-tests/flink-glue-schema-registry-json-test/pom.xml b/flink-end-to-end-tests/flink-glue-schema-registry-json-test/pom.xml
@@ -34,7 +34,7 @@ under the License.
 	<properties>
 		<aws.sdk.version>1.12.276</aws.sdk.version>
 		<aws.sdkv2.version>2.17.247</aws.sdkv2.version>
-		<kotlin.version>1.3.50</kotlin.version>
+		<kotlin.version>1.7.10</kotlin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -85,6 +85,11 @@ under the License.
 				<artifactId>kotlin-stdlib-jdk8</artifactId>
 				<version>${kotlin.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
+				<version>${kotlin.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jetbrains.kotlinx</groupId>
 				<artifactId>kotlinx-serialization-core-jvm</artifactId>

diff --git a/flink-formats/flink-avro-glue-schema-registry/pom.xml b/flink-formats/flink-avro-glue-schema-registry/pom.xml
@@ -33,9 +33,9 @@ under the License.
 	<packaging>jar</packaging>
 
 	<properties>
-		<glue.schema.registry.version>1.1.8</glue.schema.registry.version>
+		<glue.schema.registry.version>1.1.14</glue.schema.registry.version>
 		<aws.sdkv2.version>2.17.247</aws.sdkv2.version>
-		<kotlin.version>1.3.50</kotlin.version>
+		<kotlin.version>1.7.10</kotlin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -79,6 +79,11 @@ under the License.
 				<artifactId>kotlin-stdlib-jdk8</artifactId>
 				<version>${kotlin.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
+				<version>${kotlin.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jetbrains.kotlinx</groupId>
 				<artifactId>kotlinx-serialization-core-jvm</artifactId>

diff --git a/...apache/flink/formats/avro/glue/schema/registry/GlueSchemaRegistryAvroSchemaCoderTest.java b/...apache/flink/formats/avro/glue/schema/registry/GlueSchemaRegistryAvroSchemaCoderTest.java
@@ -19,6 +19,7 @@
 package org.apache.flink.formats.avro.glue.schema.registry;
 
 import com.amazonaws.services.schemaregistry.common.AWSSchemaRegistryClient;
+import com.amazonaws.services.schemaregistry.common.SchemaByDefinitionFetcher;
 import com.amazonaws.services.schemaregistry.common.configs.GlueSchemaRegistryConfiguration;
 import com.amazonaws.services.schemaregistry.deserializers.GlueSchemaRegistryDeserializationFacade;
 import com.amazonaws.services.schemaregistry.exception.AWSSchemaRegistryException;
@@ -64,7 +65,6 @@ class GlueSchemaRegistryAvroSchemaCoderTest {
             DefaultCredentialsProvider.builder().build();
     private static Schema userSchema;
     private static User userDefinedPojo;
-    private static AWSSchemaRegistryClient mockClient;
     private static GlueSchemaRegistryInputStreamDeserializer mockInputStreamDeserializer;
     private static GlueSchemaRegistryOutputStreamSerializer mockOutputStreamSerializer;
 
@@ -125,11 +125,14 @@ void testWriteSchema_withValidParams_succeeds() throws IOException {
     @Test
     void testWriteSchema_withoutAutoRegistration_throwsException() {
         configs.put(AWSSchemaRegistryConstants.SCHEMA_AUTO_REGISTRATION_SETTING, false);
-        mockClient = new MockAWSSchemaRegistryClient();
+        SchemaByDefinitionFetcher fetcher =
+                new SchemaByDefinitionFetcher(
+                        new MockAWSSchemaRegistryClient(),
+                        new GlueSchemaRegistryConfiguration(configs));
 
         GlueSchemaRegistrySerializationFacade glueSchemaRegistrySerializationFacade =
                 GlueSchemaRegistrySerializationFacade.builder()
-                        .schemaRegistryClient(mockClient)
+                        .schemaByDefinitionFetcher(fetcher)
                         .credentialProvider(credentialsProvider)
                         .glueSchemaRegistryConfiguration(
                                 new GlueSchemaRegistryConfiguration(configs))

diff --git a/flink-formats/flink-json-glue-schema-registry/pom.xml b/flink-formats/flink-json-glue-schema-registry/pom.xml
@@ -32,10 +32,10 @@ under the License.
 	<packaging>jar</packaging>
 
 	<properties>
-		<glue.schema.registry.version>1.1.8</glue.schema.registry.version>
+		<glue.schema.registry.version>1.1.14</glue.schema.registry.version>
 		<aws.sdkv2.version>2.17.247</aws.sdkv2.version>
 		<netty.version>4.1.68.Final</netty.version>
-		<kotlin.version>1.3.50</kotlin.version>
+		<kotlin.version>1.7.10</kotlin.version>
 		<classgraph.version>4.8.120</classgraph.version>
 	</properties>
 
@@ -80,6 +80,11 @@ under the License.
 				<artifactId>kotlin-stdlib-jdk8</artifactId>
 				<version>${kotlin.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jetbrains.kotlin</groupId>
+				<artifactId>kotlin-scripting-compiler-embeddable</artifactId>
+				<version>${kotlin.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jetbrains.kotlinx</groupId>
 				<artifactId>kotlinx-serialization-core-jvm</artifactId>
@@ -139,12 +144,6 @@ under the License.
 			<version>1.0.39</version>
 		</dependency>
 
-		<dependency>
-			<groupId>com.github.erosb</groupId>
-			<artifactId>everit-json-schema</artifactId>
-			<version>1.12.2</version>
-		</dependency>
-
 		<!-- ArchUit test dependencies -->
 
 		<dependency>