[FLINK-32399][Connectors/Kinesis] Update shading configuration for Ki…

…nesis SQL connector to support maven 3.8.6+
z3d1k · Oct 12, 2023 · 66826b7 · 66826b7
1 parent 691dc01
commit 66826b7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/flink-connector-aws-e2e-tests/flink-connector-kinesis-e2e-tests/pom.xml b/flink-connector-aws-e2e-tests/flink-connector-kinesis-e2e-tests/pom.xml
@@ -34,12 +34,6 @@ under the License.
     <packaging>jar</packaging>
 
     <dependencies>
-        <!--		<dependency>-->
-        <!--			<groupId>org.apache.flink</groupId>-->
-        <!--			<artifactId>flink-streaming-kafka-test-base</artifactId>-->
-        <!--			<version>${flink.version}</version>-->
-        <!--		</dependency>-->
-
         <dependency>
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-connector-kinesis</artifactId>
@@ -83,6 +77,22 @@ under the License.
             <groupId>org.apache.flink</groupId>
             <artifactId>flink-test-utils-junit</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/flink-connector-aws/flink-sql-connector-kinesis/pom.xml b/flink-connector-aws/flink-sql-connector-kinesis/pom.xml
@@ -67,7 +67,16 @@ under the License.
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>*:*</include>
+                                    <include>com.google.guava:guava</include>
+                                    <include>commons-codec:commons-codec</include>
+                                    <include>commons-io:commons-io</include>
+                                    <include>commons-lang:commons-lang</include>
+                                    <include>commons-logging:commons-logging</include>
+                                    <include>org.apache.commons:commons-lang3</include>
+                                    <include>org.apache.flink:flink-connector-base</include>
+                                    <include>org.apache.flink:flink-connector-kinesis</include>
+                                    <include>org.apache.flink:flink-connector-kinesis-streams</include>
+                                    <include>joda-time:joda-time</include>
                                 </includes>
                                 <excludes>
                                     <!-- Exclude unnecessary dependencies.
@@ -88,6 +97,8 @@ under the License.
                                         <exclude>mozilla/public-suffix-list.txt</exclude>
                                         <exclude>VersionInfo.java</exclude>
                                         <exclude>mime.types</exclude>
+                                        <exclude>LICENSE</exclude>
+                                        <exclude>.gitkeep</exclude>
                                     </excludes>
                                 </filter>
                             </filters>

diff --git a/...-connector-kinesis/src/test/java/org/apache/flink/connectors/kinesis/PackagingITCase.java b/...-connector-kinesis/src/test/java/org/apache/flink/connectors/kinesis/PackagingITCase.java
@@ -40,20 +40,7 @@ void testPackaging() throws Exception {
                         "META-INF/",
                         "amazon-kinesis-producer-native-binaries/",
                         "cacerts/",
-                        "google/",
-                        "LICENSE",
-                        "io/",
-                        "javax/",
-                        ".gitkeep",
-                        "software/amazon/",
-                        "com/esotericsoftware/",
-                        "com/fasterxml/",
-                        "com/ibm/",
-                        "com/amazonaws/",
-                        "com/ibm/",
-                        "org/objenesis/",
-                        "org/reactivestreams/",
-                        "org/slf4j/"));
+                        "google/"));
         PackagingTestUtils.assertJarContainsServiceEntry(jar, Factory.class);
     }
 }