diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index 4400285a48a54..d5d4a05526493 100644 --- a/flink-filesystems/flink-s3-fs-presto/pom.xml +++ b/flink-filesystems/flink-s3-fs-presto/pom.xml @@ -32,7 +32,7 @@ under the License. jar - 0.272 + 0.295 --add-opens=java.base/java.util=ALL-UNNAMED @@ -562,6 +562,9 @@ under the License. mime.types mozilla/** META-INF/LICENSE.txt + + LICENSE.txt + LICENSE diff --git a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE index 7b79fd28a516b..655f55a4cd6d0 100644 --- a/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE +++ b/flink-filesystems/flink-s3-fs-presto/src/main/resources/META-INF/NOTICE @@ -16,10 +16,10 @@ This project bundles the following dependencies under the Apache Software Licens - com.facebook.airlift:log:0.201 - com.facebook.airlift:stats:0.201 - com.facebook.presto.hadoop:hadoop-apache2:2.7.4-9 -- com.facebook.presto:presto-common:0.272 -- com.facebook.presto:presto-hive-common:0.272 -- com.facebook.presto:presto-hive-metastore:0.272 -- com.facebook.presto:presto-hive:0.272 +- com.facebook.presto:presto-common:0.295 +- com.facebook.presto:presto-hive-common:0.295 +- com.facebook.presto:presto-hive-metastore:0.295 +- com.facebook.presto:presto-hive:0.295 - com.fasterxml.jackson.core:jackson-annotations:2.18.2 - com.fasterxml.jackson.core:jackson-core:2.18.2 - com.fasterxml.jackson.core:jackson-databind:2.18.2 diff --git a/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java index cb27b998ed957..72a03f4933704 100644 --- a/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java +++ b/tools/ci/flink-ci-tools/src/main/java/org/apache/flink/tools/ci/licensecheck/JarFileChecker.java @@ -206,6 +206,10 @@ private static int findNonBinaryFilesContainingText( // dual-licensed under GPL 2 and CDDL 1.1 // contained in hadoop/presto S3 FS and flink-dist .filter(path -> !pathStartsWith(path, "/META-INF/versions/11/javax/xml/bind")) + // contained in flink-s3-fs-presto + .filter(path -> !pathStartsWith(path, "/com/sun/el")) + // contained in flink-s3-fs-presto + .filter(path -> !pathStartsWith(path, "/META-INF/LGPL2.1")) .filter(path -> !isJavaxManifest(jar, path)) .filter( path ->