This is an automated email from the ASF dual-hosted git repository.
xyuanlu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new cdda0a410 Add jdk8 support for helix-lock module (#2988)
cdda0a410 is described below
commit cdda0a41099aa73d541c5e2e00d855ae8ab0c3f6
Author: Zachary Pinto <[email protected]>
AuthorDate: Fri Jan 10 12:01:25 2025 -0800
Add jdk8 support for helix-lock module (#2988)
Add jdk8 support for helix-lock module and rename jar packaging execution
ids to match jdk8 and fix typos from past changes.
---
helix-common/pom.xml | 2 +-
helix-core/pom.xml | 2 +-
helix-lock/pom.xml | 48 +++++++++++++++++++++++++++++++++
meta-client/pom.xml | 2 +-
metadata-store-directory-common/pom.xml | 2 +-
metrics-common/pom.xml | 2 +-
zookeeper-api/pom.xml | 2 +-
7 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/helix-common/pom.xml b/helix-common/pom.xml
index 6e4b8b3f9..b0f63f2e6 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>
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 64a8966f2..907e6835c 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>
diff --git a/helix-lock/pom.xml b/helix-lock/pom.xml
index 38dae4317..ebf88c50c 100644
--- a/helix-lock/pom.xml
+++ b/helix-lock/pom.xml
@@ -80,6 +80,54 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.12.1</version>
+ <executions>
+ <execution>
+ <id>JDK 8</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${project.build.outputDirectory}_jdk8</outputDirectory>
+ <release>8</release>
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ <execution>
+ <id>JDK 11</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <release>11</release>
+ <fork>true</fork>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ <executions>
+ <execution>
+ <id>default-package-jdk8</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+
<classesDirectory>${project.build.outputDirectory}_jdk8</classesDirectory>
+ <classifier>jdk8</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/meta-client/pom.xml b/meta-client/pom.xml
index 4c07c9335..cd6d0d0ea 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>
diff --git a/metadata-store-directory-common/pom.xml
b/metadata-store-directory-common/pom.xml
index 4e05417c7..bcddf3ea9 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>
diff --git a/metrics-common/pom.xml b/metrics-common/pom.xml
index 2b7d0a4bf..e672b79e0 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>
diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
index d43574f3a..9f86bb2fa 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>
