From 627f2fa8bc9182ed8c471e0eda58d08a9dbde754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20G=C3=B6kdemir?= <efe@rexcode.co.uk>
Date: Wed, 23 Sep 2026 13:32:29 +0300
Subject: [PATCH 1/3] GH-3695: Consolidate benchmark JAR license notices
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Efe Gökdemir <efe@rexcode.co.uk>
---
 parquet-benchmarks/pom.xml                         | 11 +++++++++++
 parquet-plugins/parquet-plugins-benchmarks/pom.xml | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/parquet-benchmarks/pom.xml b/parquet-benchmarks/pom.xml
index 44c81fdd5a..562aa696af 100644
--- a/parquet-benchmarks/pom.xml
+++ b/parquet-benchmarks/pom.xml
@@ -117,7 +117,18 @@
               <finalName>${uberjar.name}</finalName>
               <!-- when minimized some runtime dependencies are also removed, so set minimizeJar = false -->
               <minimizeJar>false</minimizeJar>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/LICENSE*</exclude>
+                    <exclude>META-INF/NOTICE*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>
                 </transformer>
diff --git a/parquet-plugins/parquet-plugins-benchmarks/pom.xml b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
index 910799eca6..af4feaea85 100644
--- a/parquet-plugins/parquet-plugins-benchmarks/pom.xml
+++ b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
@@ -97,7 +97,18 @@
               <finalName>${uberjar.name}</finalName>
               <!-- when minimized some runtime dependencies are also removed, so set minimizeJar = false -->
               <minimizeJar>false</minimizeJar>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/LICENSE*</exclude>
+                    <exclude>META-INF/NOTICE*</exclude>
+                  </excludes>
+                </filter>
+              </filters>
               <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>
                 </transformer>

From 968ee177af459f8a8d904bc6d8143829c0af34b9 Mon Sep 17 00:00:00 2001
From: Efe <gokdemirefe1903@gmail.com>
Date: Tue, 3 Nov 2026 04:41:25 +0300
Subject: [PATCH 2/3] GH-3695: Preserve benchmark license and notice contents

Let notice transformers read resources before shading and append canonical
license resources without discarding project or dependency text.

Validated both extracted module configurations with Shade 3.6.2: the
existing JAR-content check fails before and passes after, including
project and dependency resources. Selected reactor validate also passes.

Assisted-By: OpenAI Codex
---
 parquet-benchmarks/pom.xml                         | 13 +++----------
 parquet-plugins/parquet-plugins-benchmarks/pom.xml | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/parquet-benchmarks/pom.xml b/parquet-benchmarks/pom.xml
index 562aa696af..45ad805344 100644
--- a/parquet-benchmarks/pom.xml
+++ b/parquet-benchmarks/pom.xml
@@ -117,17 +117,10 @@
               <finalName>${uberjar.name}</finalName>
               <!-- when minimized some runtime dependencies are also removed, so set minimizeJar = false -->
               <minimizeJar>false</minimizeJar>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/LICENSE*</exclude>
-                    <exclude>META-INF/NOTICE*</exclude>
-                  </excludes>
-                </filter>
-              </filters>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/LICENSE</resource>
+                </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>
diff --git a/parquet-plugins/parquet-plugins-benchmarks/pom.xml b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
index af4feaea85..d0221def55 100644
--- a/parquet-plugins/parquet-plugins-benchmarks/pom.xml
+++ b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
@@ -97,17 +97,10 @@
               <finalName>${uberjar.name}</finalName>
               <!-- when minimized some runtime dependencies are also removed, so set minimizeJar = false -->
               <minimizeJar>false</minimizeJar>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/LICENSE*</exclude>
-                    <exclude>META-INF/NOTICE*</exclude>
-                  </excludes>
-                </filter>
-              </filters>
               <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/LICENSE</resource>
+                </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>

From 4af11cfccec33cc7acf243c20e20b5e635dbe41e Mon Sep 17 00:00:00 2001
From: Efe <gokdemirefe1903@gmail.com>
Date: Fri, 6 Nov 2026 14:40:19 +0300
Subject: [PATCH 3/3] GH-3695: Preserve license variants and UTF-8 notices

Append LICENSE.txt and LICENSE.md resources in both benchmark JARs and use UTF-8 when merging NOTICE attributions.

Generated-by: dot
---
 parquet-benchmarks/pom.xml                         | 10 +++++++++-
 parquet-plugins/parquet-plugins-benchmarks/pom.xml | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/parquet-benchmarks/pom.xml b/parquet-benchmarks/pom.xml
index 45ad805344..ef32019484 100644
--- a/parquet-benchmarks/pom.xml
+++ b/parquet-benchmarks/pom.xml
@@ -121,7 +121,15 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/LICENSE</resource>
                 </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/LICENSE.txt</resource>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/LICENSE.md</resource>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                  <encoding>UTF-8</encoding>
+                </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>
                 </transformer>
diff --git a/parquet-plugins/parquet-plugins-benchmarks/pom.xml b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
index d0221def55..7288005a26 100644
--- a/parquet-plugins/parquet-plugins-benchmarks/pom.xml
+++ b/parquet-plugins/parquet-plugins-benchmarks/pom.xml
@@ -101,7 +101,15 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/LICENSE</resource>
                 </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer" />
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/LICENSE.txt</resource>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/LICENSE.md</resource>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+                  <encoding>UTF-8</encoding>
+                </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.openjdk.jmh.Main</mainClass>
                 </transformer>