From 53dd2516a4d23e72684ff9a27f53eaa9eac91f0b Mon Sep 17 00:00:00 2001
From: Himanshu Kandwal <himanshuk.19@gmail.com>
Date: Tue, 16 Jul 2024 22:25:29 -0700
Subject: [PATCH 1/2] [apache/helix] -- Package resources in JDK 1.8 (backward
 compatible) jar

---
 helix-common/pom.xml                    | 19 ++++++++++++++++++-
 helix-core/pom.xml                      | 19 ++++++++++++++++++-
 meta-client/pom.xml                     | 19 ++++++++++++++++++-
 metadata-store-directory-common/pom.xml | 19 ++++++++++++++++++-
 metrics-common/pom.xml                  | 19 ++++++++++++++++++-
 zookeeper-api/pom.xml                   | 19 ++++++++++++++++++-
 6 files changed, 108 insertions(+), 6 deletions(-)

diff --git a/helix-common/pom.xml b/helix-common/pom.xml
index da2839477d..6ccc5cec0b 100644
--- a/helix-common/pom.xml
+++ b/helix-common/pom.xml
@@ -125,7 +125,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk11</id>
+            <id>default-package-jdk8</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
@@ -137,6 +137,23 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>default-process-resources-jdk8</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 1a4fa11255..0d17dd06c1 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -215,7 +215,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk11</id>
+            <id>default-package-jdk8</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
@@ -227,6 +227,23 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>default-process-resources-jdk8</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>appassembler-maven-plugin</artifactId>
diff --git a/meta-client/pom.xml b/meta-client/pom.xml
index 513ca2818f..a8fc001b1d 100644
--- a/meta-client/pom.xml
+++ b/meta-client/pom.xml
@@ -125,7 +125,7 @@ under the License.
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk11</id>
+            <id>default-package-jdk8</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
@@ -137,6 +137,23 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>default-process-resources-jdk8</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/metadata-store-directory-common/pom.xml b/metadata-store-directory-common/pom.xml
index 8f20028c23..19041ac468 100644
--- a/metadata-store-directory-common/pom.xml
+++ b/metadata-store-directory-common/pom.xml
@@ -149,7 +149,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk11</id>
+            <id>default-package-jdk8</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
@@ -161,6 +161,23 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>default-process-resources-jdk8</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/metrics-common/pom.xml b/metrics-common/pom.xml
index 3bb48a4671..a5d34c20d3 100644
--- a/metrics-common/pom.xml
+++ b/metrics-common/pom.xml
@@ -120,7 +120,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk11</id>
+            <id>default-package-jdk8</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
@@ -132,6 +132,23 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>default-process-resources-jdk8</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
index 195062c41c..183fc0a70b 100644
--- a/zookeeper-api/pom.xml
+++ b/zookeeper-api/pom.xml
@@ -169,7 +169,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk11</id>
+            <id>default-package-jdk8</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
@@ -181,6 +181,23 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
+        <executions>
+          <execution>
+            <id>default-process-resources-jdk8</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>

From 3b465f100046c31a7a44447089ef39c6d90356aa Mon Sep 17 00:00:00 2001
From: Himanshu Kandwal <himanshuk.19@gmail.com>
Date: Wed, 17 Jul 2024 13:14:58 -0700
Subject: [PATCH 2/2] [apache/helix] -- Package resources in JDK 1.8 (backward
 compatible) jar

---
 helix-common/pom.xml                    | 2 +-
 helix-core/pom.xml                      | 2 +-
 meta-client/pom.xml                     | 2 +-
 metadata-store-directory-common/pom.xml | 2 +-
 metrics-common/pom.xml                  | 2 +-
 zookeeper-api/pom.xml                   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helix-common/pom.xml b/helix-common/pom.xml
index 6ccc5cec0b..05c0a3e4dc 100644
--- a/helix-common/pom.xml
+++ b/helix-common/pom.xml
@@ -125,7 +125,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk8</id>
+            <id>default-package-jdk11</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 0d17dd06c1..1010b880b3 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -215,7 +215,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk8</id>
+            <id>default-package-jdk11</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
diff --git a/meta-client/pom.xml b/meta-client/pom.xml
index a8fc001b1d..bf72712779 100644
--- a/meta-client/pom.xml
+++ b/meta-client/pom.xml
@@ -125,7 +125,7 @@ under the License.
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk8</id>
+            <id>default-package-jdk11</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
diff --git a/metadata-store-directory-common/pom.xml b/metadata-store-directory-common/pom.xml
index 19041ac468..a0ac523470 100644
--- a/metadata-store-directory-common/pom.xml
+++ b/metadata-store-directory-common/pom.xml
@@ -149,7 +149,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk8</id>
+            <id>default-package-jdk11</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
diff --git a/metrics-common/pom.xml b/metrics-common/pom.xml
index a5d34c20d3..6ce5a61823 100644
--- a/metrics-common/pom.xml
+++ b/metrics-common/pom.xml
@@ -120,7 +120,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk8</id>
+            <id>default-package-jdk11</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>
diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
index 183fc0a70b..3d44d11c95 100644
--- a/zookeeper-api/pom.xml
+++ b/zookeeper-api/pom.xml
@@ -169,7 +169,7 @@
         <version>3.3.0</version>
         <executions>
           <execution>
-            <id>default-package-jdk8</id>
+            <id>default-package-jdk11</id>
             <phase>package</phase>
             <goals>
               <goal>jar</goal>