diff --git a/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/pom.xml b/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/pom.xml index 47742926d..1b1b4dd00 100644 --- a/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/pom.xml +++ b/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/pom.xml @@ -65,7 +65,6 @@ io.netty:* org.reactivestreams:* org.apache.httpcomponents:* - com.typesafe.netty:* commons-logging:commons-logging @@ -90,11 +89,6 @@ org.apache.flink.connector.firehose.sink.shaded.org.apache.http - - com.typesafe.netty - org.apache.flink.connector.firehose.sink.shaded.com.typesafe.netty - - diff --git a/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE b/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE index ebb3b3ea4..d9e9f3e5b 100644 --- a/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE +++ b/flink-connector-aws/flink-sql-connector-aws-kinesis-firehose/src/main/resources/META-INF/NOTICE @@ -7,47 +7,47 @@ 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) +- commons-logging:commons-logging:1.1.3 +- io.netty:netty-buffer:4.1.86.Final +- io.netty:netty-codec:4.1.86.Final +- io.netty:netty-codec-http:4.1.86.Final +- io.netty:netty-codec-http2:4.1.86.Final +- io.netty:netty-common:4.1.86.Final +- io.netty:netty-handler:4.1.86.Final +- io.netty:netty-resolver:4.1.86.Final +- io.netty:netty-transport-classes-epoll:4.1.86.Final +- io.netty:netty-transport-native-unix-common:4.1.86.Final +- io.netty:netty-transport:4.1.86.Final +- org.apache.httpcomponents:httpclient:4.5.13 +- org.apache.httpcomponents:httpcore:4.4.14 +- software.amazon.awssdk:annotations:2.26.19 +- software.amazon.awssdk:apache-client:2.26.19 +- software.amazon.awssdk:arns:2.26.19 +- software.amazon.awssdk:auth:2.26.19 +- software.amazon.awssdk:aws-core:2.26.19 +- software.amazon.awssdk:aws-json-protocol:2.26.19 +- software.amazon.awssdk:aws-query-protocol:2.26.19 - software.amazon.awssdk:checksums-spi:2.26.19 - software.amazon.awssdk:checksums:2.26.19 -- software.amazon.awssdk:utils:2.26.19 -- software.amazon.awssdk:third-party-jackson-core:2.26.19 -- software.amazon.awssdk:sts:2.26.19 -- software.amazon.awssdk:sdk-core:2.26.19 -- software.amazon.awssdk:regions:2.26.19 -- software.amazon.awssdk:retries-spi:2.26.19 -- software.amazon.awssdk:retries:2.26.19 -- software.amazon.awssdk:protocol-core:2.26.19 -- software.amazon.awssdk:profiles:2.26.19 -- software.amazon.awssdk:netty-nio-client:2.26.19 -- software.amazon.awssdk:metrics-spi:2.26.19 -- software.amazon.awssdk:json-utils:2.26.19 -- software.amazon.awssdk:http-client-spi:2.26.19 +- software.amazon.awssdk:endpoints-spi:2.26.19 +- software.amazon.awssdk:firehose:2.26.19 - software.amazon.awssdk:http-auth-aws:2.26.19 - software.amazon.awssdk:http-auth-spi:2.26.19 - software.amazon.awssdk:http-auth:2.26.19 +- software.amazon.awssdk:http-client-spi:2.26.19 - software.amazon.awssdk:identity-spi:2.26.19 -- software.amazon.awssdk:firehose:2.26.19 -- software.amazon.awssdk:endpoints-spi:2.26.19 -- software.amazon.awssdk:aws-query-protocol:2.26.19 -- software.amazon.awssdk:aws-json-protocol:2.26.19 -- software.amazon.awssdk:aws-core:2.26.19 -- software.amazon.awssdk:auth:2.26.19 -- software.amazon.awssdk:apache-client:2.26.19 -- software.amazon.awssdk:annotations:2.26.19 -- software.amazon.awssdk:arns:2.26.19 -- org.apache.httpcomponents:httpcore:4.4.14 -- org.apache.httpcomponents:httpclient:4.5.13 -- io.netty:netty-transport:4.1.86.Final -- io.netty:netty-transport-native-unix-common:4.1.86.Final -- io.netty:netty-transport-classes-epoll:4.1.86.Final -- io.netty:netty-resolver:4.1.86.Final -- io.netty:netty-handler:4.1.86.Final -- io.netty:netty-common:4.1.86.Final -- io.netty:netty-codec:4.1.86.Final -- io.netty:netty-codec-http:4.1.86.Final -- io.netty:netty-codec-http2:4.1.86.Final -- io.netty:netty-buffer:4.1.86.Final -- commons-logging:commons-logging:1.1.3 +- software.amazon.awssdk:json-utils:2.26.19 +- software.amazon.awssdk:metrics-spi:2.26.19 +- software.amazon.awssdk:netty-nio-client:2.26.19 +- software.amazon.awssdk:profiles:2.26.19 +- software.amazon.awssdk:protocol-core:2.26.19 +- software.amazon.awssdk:regions:2.26.19 +- software.amazon.awssdk:retries-spi:2.26.19 +- software.amazon.awssdk:retries:2.26.19 +- software.amazon.awssdk:sdk-core:2.26.19 +- software.amazon.awssdk:sts:2.26.19 +- software.amazon.awssdk:third-party-jackson-core:2.26.19 +- software.amazon.awssdk:utils:2.26.19 This project bundles the following dependencies under the MIT-0 license (https://spdx.org/licenses/MIT-0.html). diff --git a/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/pom.xml b/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/pom.xml index db2d35513..7bbcb2254 100644 --- a/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/pom.xml +++ b/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/pom.xml @@ -80,11 +80,6 @@ org.apache.flink.connector.kinesis.sink.shaded.org.reactivestreams - - com.typesafe.netty - org.apache.flink.connector.kinesis.sink.shaded.com.typesafe.netty - - org.apache.http org.apache.flink.connector.kinesis.sink.shaded.org.apache.http diff --git a/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE b/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE index 516da7747..15683b9dd 100644 --- a/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE +++ b/flink-connector-aws/flink-sql-connector-aws-kinesis-streams/src/main/resources/META-INF/NOTICE @@ -7,49 +7,49 @@ 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) +- commons-logging:commons-logging:1.1.3 +- io.netty:netty-buffer:4.1.86.Final +- io.netty:netty-codec-http2:4.1.86.Final +- io.netty:netty-codec-http:4.1.86.Final +- io.netty:netty-codec:4.1.86.Final +- io.netty:netty-common:4.1.86.Final +- io.netty:netty-handler:4.1.86.Final +- io.netty:netty-resolver:4.1.86.Final +- io.netty:netty-transport-classes-epoll:4.1.86.Final +- io.netty:netty-transport-native-unix-common:4.1.86.Final +- io.netty:netty-transport:4.1.86.Final +- org.apache.httpcomponents:httpclient:4.5.13 +- org.apache.httpcomponents:httpcore:4.4.14 +- software.amazon.awssdk:annotations:2.26.19 +- software.amazon.awssdk:apache-client:2.26.19 +- software.amazon.awssdk:arns:2.26.19 +- software.amazon.awssdk:auth:2.26.19 +- software.amazon.awssdk:aws-cbor-protocol:2.26.19 +- software.amazon.awssdk:aws-core:2.26.19 +- software.amazon.awssdk:aws-json-protocol:2.26.19 +- software.amazon.awssdk:aws-query-protocol:2.26.19 - software.amazon.awssdk:checksums-spi:2.26.19 - software.amazon.awssdk:checksums:2.26.19 -- software.amazon.awssdk:utils:2.26.19 -- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.26.19 -- software.amazon.awssdk:third-party-jackson-core:2.26.19 -- software.amazon.awssdk:sts:2.26.19 -- software.amazon.awssdk:sdk-core:2.26.19 -- software.amazon.awssdk:regions:2.26.19 -- software.amazon.awssdk:retries-spi:2.26.19 -- software.amazon.awssdk:retries:2.26.19 -- software.amazon.awssdk:protocol-core:2.26.19 -- software.amazon.awssdk:profiles:2.26.19 -- software.amazon.awssdk:netty-nio-client:2.26.19 -- software.amazon.awssdk:metrics-spi:2.26.19 -- software.amazon.awssdk:kinesis:2.26.19 -- software.amazon.awssdk:json-utils:2.26.19 -- software.amazon.awssdk:http-client-spi:2.26.19 +- software.amazon.awssdk:endpoints-spi:2.26.19 - software.amazon.awssdk:http-auth-aws:2.26.19 - software.amazon.awssdk:http-auth-spi:2.26.19 - software.amazon.awssdk:http-auth:2.26.19 +- software.amazon.awssdk:http-client-spi:2.26.19 - software.amazon.awssdk:identity-spi:2.26.19 -- software.amazon.awssdk:endpoints-spi:2.26.19 -- software.amazon.awssdk:aws-query-protocol:2.26.19 -- software.amazon.awssdk:aws-json-protocol:2.26.19 -- software.amazon.awssdk:aws-core:2.26.19 -- software.amazon.awssdk:aws-cbor-protocol:2.26.19 -- software.amazon.awssdk:auth:2.26.19 -- software.amazon.awssdk:arns:2.26.19 -- software.amazon.awssdk:apache-client:2.26.19 -- software.amazon.awssdk:annotations:2.26.19 -- org.apache.httpcomponents:httpcore:4.4.14 -- org.apache.httpcomponents:httpclient:4.5.13 -- io.netty:netty-transport:4.1.86.Final -- io.netty:netty-transport-native-unix-common:4.1.86.Final -- io.netty:netty-transport-classes-epoll:4.1.86.Final -- io.netty:netty-resolver:4.1.86.Final -- io.netty:netty-handler:4.1.86.Final -- io.netty:netty-common:4.1.86.Final -- io.netty:netty-codec:4.1.86.Final -- io.netty:netty-codec-http:4.1.86.Final -- io.netty:netty-codec-http2:4.1.86.Final -- io.netty:netty-buffer:4.1.86.Final -- commons-logging:commons-logging:1.1.3 +- software.amazon.awssdk:json-utils:2.26.19 +- software.amazon.awssdk:kinesis:2.26.19 +- software.amazon.awssdk:metrics-spi:2.26.19 +- software.amazon.awssdk:netty-nio-client:2.26.19 +- software.amazon.awssdk:profiles:2.26.19 +- software.amazon.awssdk:protocol-core:2.26.19 +- software.amazon.awssdk:regions:2.26.19 +- software.amazon.awssdk:retries-spi:2.26.19 +- software.amazon.awssdk:retries:2.26.19 +- software.amazon.awssdk:sdk-core:2.26.19 +- software.amazon.awssdk:sts:2.26.19 +- software.amazon.awssdk:third-party-jackson-core:2.26.19 +- software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.26.19 +- software.amazon.awssdk:utils:2.26.19 This project bundles the following dependencies under the MIT-0 license (https://spdx.org/licenses/MIT-0.html). diff --git a/flink-connector-aws/flink-sql-connector-dynamodb/pom.xml b/flink-connector-aws/flink-sql-connector-dynamodb/pom.xml index a80890029..14d5e984a 100644 --- a/flink-connector-aws/flink-sql-connector-dynamodb/pom.xml +++ b/flink-connector-aws/flink-sql-connector-dynamodb/pom.xml @@ -72,7 +72,6 @@ under the License. org.apache.flink:flink-connector-dynamodb software.amazon.awssdk:* org.reactivestreams:* - com.typesafe.netty:* org.apache.httpcomponents:* io.netty:* commons-logging:commons-logging @@ -89,8 +88,8 @@ under the License. org.apache.flink.connector.dynamodb.shaded.org.reactivestreams - com.typesafe.netty - org.apache.flink.connector.dynamodb.shaded.com.typesafe.netty + org.apache.commons + org.apache.flink.connector.dynamodb.shaded.org.apache.commons org.apache.http diff --git a/flink-connector-aws/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE b/flink-connector-aws/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE index 99a35443e..7a071e7c7 100644 --- a/flink-connector-aws/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE +++ b/flink-connector-aws/flink-sql-connector-dynamodb/src/main/resources/META-INF/NOTICE @@ -7,49 +7,49 @@ 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) +- commons-codec:commons-codec:1.15 +- commons-logging:commons-logging:1.1.3 +- io.netty:netty-buffer:4.1.86.Final +- io.netty:netty-codec-http2:4.1.86.Final +- io.netty:netty-codec-http:4.1.86.Final +- io.netty:netty-codec:4.1.86.Final +- io.netty:netty-common:4.1.86.Final +- io.netty:netty-handler:4.1.86.Final +- io.netty:netty-resolver:4.1.86.Final +- io.netty:netty-transport-classes-epoll:4.1.86.Final +- io.netty:netty-transport-native-unix-common:4.1.86.Final +- io.netty:netty-transport:4.1.86.Final +- org.apache.httpcomponents:httpclient:4.5.13 +- org.apache.httpcomponents:httpcore:4.4.14 +- software.amazon.awssdk:annotations:2.26.19 +- software.amazon.awssdk:apache-client:2.26.19 +- software.amazon.awssdk:arns:2.26.19 +- software.amazon.awssdk:auth:2.26.19 +- software.amazon.awssdk:aws-core:2.26.19 +- software.amazon.awssdk:aws-json-protocol:2.26.19 +- software.amazon.awssdk:aws-query-protocol:2.26.19 - software.amazon.awssdk:checksums-spi:2.26.19 - software.amazon.awssdk:checksums:2.26.19 -- software.amazon.awssdk:utils:2.26.19 -- software.amazon.awssdk:third-party-jackson-core:2.26.19 -- software.amazon.awssdk:sts:2.26.19 -- software.amazon.awssdk:sdk-core:2.26.19 -- software.amazon.awssdk:regions:2.26.19 -- software.amazon.awssdk:retries-spi:2.26.19 -- software.amazon.awssdk:retries:2.26.19 -- software.amazon.awssdk:protocol-core:2.26.19 -- software.amazon.awssdk:profiles:2.26.19 -- software.amazon.awssdk:netty-nio-client:2.26.19 -- software.amazon.awssdk:metrics-spi:2.26.19 -- software.amazon.awssdk:json-utils:2.26.19 -- software.amazon.awssdk:http-client-spi:2.26.19 +- software.amazon.awssdk:dynamodb-enhanced:2.26.19 +- software.amazon.awssdk:dynamodb:2.26.19 +- software.amazon.awssdk:endpoints-spi:2.26.19 - software.amazon.awssdk:http-auth-aws:2.26.19 - software.amazon.awssdk:http-auth-spi:2.26.19 - software.amazon.awssdk:http-auth:2.26.19 +- software.amazon.awssdk:http-client-spi:2.26.19 - software.amazon.awssdk:identity-spi:2.26.19 -- software.amazon.awssdk:endpoints-spi:2.26.19 -- software.amazon.awssdk:dynamodb:2.26.19 -- software.amazon.awssdk:dynamodb-enhanced:2.26.19 -- software.amazon.awssdk:aws-query-protocol:2.26.19 -- software.amazon.awssdk:aws-json-protocol:2.26.19 -- software.amazon.awssdk:aws-core:2.26.19 -- software.amazon.awssdk:auth:2.26.19 -- software.amazon.awssdk:arns:2.26.19 -- software.amazon.awssdk:apache-client:2.26.19 -- software.amazon.awssdk:annotations:2.26.19 -- org.apache.httpcomponents:httpcore:4.4.14 -- org.apache.httpcomponents:httpclient:4.5.13 -- io.netty:netty-transport:4.1.86.Final -- io.netty:netty-transport-native-unix-common:4.1.86.Final -- io.netty:netty-transport-classes-epoll:4.1.86.Final -- io.netty:netty-resolver:4.1.86.Final -- io.netty:netty-handler:4.1.86.Final -- io.netty:netty-common:4.1.86.Final -- io.netty:netty-codec:4.1.86.Final -- io.netty:netty-codec-http:4.1.86.Final -- io.netty:netty-codec-http2:4.1.86.Final -- io.netty:netty-buffer:4.1.86.Final -- commons-logging:commons-logging:1.1.3 -- commons-codec:commons-codec:1.15 +- software.amazon.awssdk:json-utils:2.26.19 +- software.amazon.awssdk:metrics-spi:2.26.19 +- software.amazon.awssdk:netty-nio-client:2.26.19 +- software.amazon.awssdk:profiles:2.26.19 +- software.amazon.awssdk:protocol-core:2.26.19 +- software.amazon.awssdk:regions:2.26.19 +- software.amazon.awssdk:retries-spi:2.26.19 +- software.amazon.awssdk:retries:2.26.19 +- software.amazon.awssdk:sdk-core:2.26.19 +- software.amazon.awssdk:sts:2.26.19 +- software.amazon.awssdk:third-party-jackson-core:2.26.19 +- software.amazon.awssdk:utils:2.26.19 This project bundles the following dependencies under the MIT-0 license (https://spdx.org/licenses/MIT-0.html). diff --git a/flink-connector-aws/flink-sql-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/PackagingITCase.java b/flink-connector-aws/flink-sql-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/PackagingITCase.java index ffc709e67..17e47ff5e 100644 --- a/flink-connector-aws/flink-sql-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/PackagingITCase.java +++ b/flink-connector-aws/flink-sql-connector-dynamodb/src/test/java/org/apache/flink/connector/dynamodb/PackagingITCase.java @@ -38,7 +38,6 @@ void testPackaging() throws Exception { jar, Arrays.asList( "org/apache/flink/", - "org/apache/commons/", "META-INF/", "mozilla/", "mime.types", diff --git a/flink-connector-aws/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE b/flink-connector-aws/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE index 26c2b7ab4..a1632a5ed 100644 --- a/flink-connector-aws/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE +++ b/flink-connector-aws/flink-sql-connector-kinesis/src/main/resources/META-INF/NOTICE @@ -6,10 +6,10 @@ 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.commons:commons-lang3:3.12.0 -- joda-time:joda-time:2.8.1 -- commons-logging:commons-logging:1.1.3 -- commons-lang:commons-lang:2.6 -- commons-io:commons-io:2.15.1 -- commons-codec:commons-codec:1.15 - com.google.guava:guava:32.1.3-jre +- commons-codec:commons-codec:1.15 +- commons-io:commons-io:2.15.1 +- commons-lang:commons-lang:2.6 +- commons-logging:commons-logging:1.1.3 +- joda-time:joda-time:2.8.1 +- org.apache.commons:commons-lang3:3.12.0