[flink] branch master updated: [FLINK-28169][e2e-test/glue,kinesis] Re-enabled integration test that was failing due a shaded dependency test-jar requiring a transitive shaded test-jar being satisfied by a later unshaded dependency test-jar, changed so that unshaded dependency test-jar is loaded earlier in pom

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

martijnvisser 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 335c4049ed6 [FLINK-28169][e2e-test/glue,kinesis] Re-enabled integration test that was failing due a shaded dependency test-jar requiring a transitive shaded test-jar being satisfied by a later unshaded dependency test-jar, changed so that unshaded dependency test-jar is loaded earlier in pom
335c4049ed6 is described below

commit 335c4049ed6ab47877b3ec64db220e5d5adbae04
Author: Zichen Liu <zi...@amazon.com>
AuthorDate: Thu Jun 30 14:30:02 2022 +0100

    [FLINK-28169][e2e-test/glue,kinesis] Re-enabled integration test that was failing due a shaded dependency test-jar requiring a transitive shaded test-jar being satisfied by a later unshaded dependency test-jar, changed so that unshaded dependency test-jar is loaded earlier in pom
---
 .../flink-glue-schema-registry-json-test/pom.xml                  | 8 ++++----
 .../registry/test/json/GlueSchemaRegistryJsonKinesisITCase.java   | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

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
index 59b22a1b466..facc40ea63b 100644
--- 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
@@ -47,7 +47,7 @@ under the License.
 			<!-- can be removed once new version of Glue Schema Registry releases -->
 
 			<dependency>
-				<groupId >com.google.guava</groupId>
+				<groupId>com.google.guava</groupId>
 				<artifactId>guava</artifactId>
 				<version>${guava.version}</version>
 			</dependency>
@@ -106,21 +106,21 @@ under the License.
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-connector-aws-base</artifactId>
+			<artifactId>flink-connector-aws-kinesis-streams</artifactId>
 			<version>${project.version}</version>
 			<type>test-jar</type>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-connector-kinesis</artifactId>
+			<artifactId>flink-connector-aws-base</artifactId>
 			<version>${project.version}</version>
 			<type>test-jar</type>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-connector-aws-kinesis-streams</artifactId>
+			<artifactId>flink-connector-kinesis</artifactId>
 			<version>${project.version}</version>
 			<type>test-jar</type>
 		</dependency>
diff --git a/flink-end-to-end-tests/flink-glue-schema-registry-json-test/src/test/java/org/apache/flink/glue/schema/registry/test/json/GlueSchemaRegistryJsonKinesisITCase.java b/flink-end-to-end-tests/flink-glue-schema-registry-json-test/src/test/java/org/apache/flink/glue/schema/registry/test/json/GlueSchemaRegistryJsonKinesisITCase.java
index 56f50f34a34..c9336b9eeb2 100644
--- a/flink-end-to-end-tests/flink-glue-schema-registry-json-test/src/test/java/org/apache/flink/glue/schema/registry/test/json/GlueSchemaRegistryJsonKinesisITCase.java
+++ b/flink-end-to-end-tests/flink-glue-schema-registry-json-test/src/test/java/org/apache/flink/glue/schema/registry/test/json/GlueSchemaRegistryJsonKinesisITCase.java
@@ -35,7 +35,6 @@ import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.rules.Timeout;
 import org.testcontainers.containers.Network;
@@ -57,7 +56,6 @@ import static org.apache.flink.streaming.connectors.kinesis.config.ConsumerConfi
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** End-to-end test for Glue Schema Registry Json format using Kinesalite. */
-@Ignore("FLINK-28169")
 public class GlueSchemaRegistryJsonKinesisITCase extends TestLogger {
     private static final String INPUT_STREAM = "gsr_json_input_stream";
     private static final String OUTPUT_STREAM = "gsr_json_output_stream";