From e30f541b04b7bf803c8fbe9de02343724be5cd12 Mon Sep 17 00:00:00 2001 From: kosuruvarunkumar Date: Sat, 8 Nov 2025 08:46:00 +0530 Subject: [PATCH 1/6] [FLINK-38557] Bumped presto version from 0.272 to 0.295 --- flink-filesystems/flink-s3-fs-presto/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index 4400285a48a54..428a9cec92036 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 From 60f8555e202f00aea10c1121590cfc61ee647165 Mon Sep 17 00:00:00 2001 From: kosuruvarunkumar Date: Sat, 8 Nov 2025 12:52:12 +0530 Subject: [PATCH 2/6] [FLINK-38557] commit to check if build failure is because of version bumping --- flink-filesystems/flink-s3-fs-presto/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index 428a9cec92036..966ca880f3198 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.295 + 0.272 --add-opens=java.base/java.util=ALL-UNNAMED @@ -604,3 +604,4 @@ under the License. + From 3380c254d6dc549ff906e763b9631c6e0213e3dc Mon Sep 17 00:00:00 2001 From: kosuruvarunkumar Date: Sat, 8 Nov 2025 14:00:45 +0530 Subject: [PATCH 3/6] [FLINK-38557] bump the presto dependency --- flink-filesystems/flink-s3-fs-presto/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index 966ca880f3198..428a9cec92036 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 @@ -604,4 +604,3 @@ under the License. - From 701c90b01ce2cbae6ed26e50ee3feaab95ff683a Mon Sep 17 00:00:00 2001 From: kosuruvarunkumar Date: Sun, 9 Nov 2025 00:13:14 +0530 Subject: [PATCH 4/6] [FLINK-38557] - updated dependency version in NOTICE file as mentioned in https://cwiki.apache.org/confluence/display/FLINK/Licensing - excluded LICENSE files present in root directory causing CI failures - filtered the license files containing forbidden patterns causing CI failures --- flink-filesystems/flink-s3-fs-presto/pom.xml | 2 ++ .../flink-s3-fs-presto/src/main/resources/META-INF/NOTICE | 8 ++++---- .../flink/tools/ci/licensecheck/JarFileChecker.java | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index 428a9cec92036..f795ced8e015e 100644 --- a/flink-filesystems/flink-s3-fs-presto/pom.xml +++ b/flink-filesystems/flink-s3-fs-presto/pom.xml @@ -562,6 +562,8 @@ 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..24ab8eba2e5aa 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 -> From b3e7413eb3ad3e51016797c1683b79cb0c495daa Mon Sep 17 00:00:00 2001 From: kosuruvarunkumar Date: Sun, 9 Nov 2025 00:33:10 +0530 Subject: [PATCH 5/6] [FLINK-38557] update the comments --- .../apache/flink/tools/ci/licensecheck/JarFileChecker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 24ab8eba2e5aa..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,9 +206,9 @@ 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 + // contained in flink-s3-fs-presto .filter(path -> !pathStartsWith(path, "/com/sun/el")) - //contained in flink-s3-fs-presto + // contained in flink-s3-fs-presto .filter(path -> !pathStartsWith(path, "/META-INF/LGPL2.1")) .filter(path -> !isJavaxManifest(jar, path)) .filter( From 2dca6c86628b726813ae825edec94bdd4661c70d Mon Sep 17 00:00:00 2001 From: kosuruvarunkumar Date: Sun, 9 Nov 2025 01:16:24 +0530 Subject: [PATCH 6/6] [FLINK-38557] ignoring the LICENSE files present in the root folder. --- flink-filesystems/flink-s3-fs-presto/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flink-filesystems/flink-s3-fs-presto/pom.xml b/flink-filesystems/flink-s3-fs-presto/pom.xml index f795ced8e015e..d5d4a05526493 100644 --- a/flink-filesystems/flink-s3-fs-presto/pom.xml +++ b/flink-filesystems/flink-s3-fs-presto/pom.xml @@ -562,8 +562,9 @@ under the License. mime.types mozilla/** META-INF/LICENSE.txt - /LICENSE.txt - /LICENSE + + LICENSE.txt + LICENSE