From f2b50a21fb91a725c1f3d1406812cb29f64f20a6 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Sun, 22 Dec 2024 22:44:47 +0800
Subject: [PATCH 1/2] HADOOP-19375. Orgnize JDK version-specific code in IDEA
 friendly approach

---
 .../hadoop-annotations/pom.xml                | 36 +++++++++----------
 .../ExcludePrivateAnnotationsJDiffDoclet.java |  0
 ...cludePrivateAnnotationsStandardDoclet.java |  0
 .../IncludePublicAnnotationsJDiffDoclet.java  |  0
 ...ncludePublicAnnotationsStandardDoclet.java |  0
 .../tools/RootDocProcessor.java               |  0
 .../tools/StabilityOptions.java               |  0
 hadoop-hdfs-project/hadoop-hdfs/pom.xml       | 26 +++++++++-----
 .../hadoop/hdfs/TestDFSClientFailover.java    |  0
 9 files changed, 35 insertions(+), 27 deletions(-)
 rename hadoop-common-project/hadoop-annotations/src/main/{java => java8}/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java (100%)
 rename hadoop-common-project/hadoop-annotations/src/main/{java => java8}/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java (100%)
 rename hadoop-common-project/hadoop-annotations/src/main/{java => java8}/org/apache/hadoop/classification/tools/IncludePublicAnnotationsJDiffDoclet.java (100%)
 rename hadoop-common-project/hadoop-annotations/src/main/{java => java8}/org/apache/hadoop/classification/tools/IncludePublicAnnotationsStandardDoclet.java (100%)
 rename hadoop-common-project/hadoop-annotations/src/main/{java => java8}/org/apache/hadoop/classification/tools/RootDocProcessor.java (100%)
 rename hadoop-common-project/hadoop-annotations/src/main/{java => java8}/org/apache/hadoop/classification/tools/StabilityOptions.java (100%)
 rename hadoop-hdfs-project/hadoop-hdfs/src/test/{java => java8}/org/apache/hadoop/hdfs/TestDFSClientFailover.java (100%)

diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index 726c7acb15c43..464116fbf5d7f 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -39,7 +39,7 @@
 
   <profiles>
     <profile>
-      <id>jdk1.8</id>
+      <id>jdk8</id>
       <activation>
         <jdk>1.8</jdk>
       </activation>
@@ -52,27 +52,25 @@
           <systemPath>${java.home}/../lib/tools.jar</systemPath>
         </dependency>
       </dependencies>
-    </profile>
-    <profile>
-      <id>jdk10</id>
-      <activation>
-        <jdk>[10,)</jdk>
-      </activation>
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>org/apache/hadoop/classification/tools/</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-          <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <excludePackageNames>org.apache.hadoop.classification.tools</excludePackageNames>
-            </configuration>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-source</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${basedir}/src/main/java8</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
diff --git a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java b/hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java
similarity index 100%
rename from hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java
rename to hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsJDiffDoclet.java
diff --git a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java b/hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java
similarity index 100%
rename from hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java
rename to hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/ExcludePrivateAnnotationsStandardDoclet.java
diff --git a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/IncludePublicAnnotationsJDiffDoclet.java b/hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/IncludePublicAnnotationsJDiffDoclet.java
similarity index 100%
rename from hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/IncludePublicAnnotationsJDiffDoclet.java
rename to hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/IncludePublicAnnotationsJDiffDoclet.java
diff --git a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/IncludePublicAnnotationsStandardDoclet.java b/hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/IncludePublicAnnotationsStandardDoclet.java
similarity index 100%
rename from hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/IncludePublicAnnotationsStandardDoclet.java
rename to hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/IncludePublicAnnotationsStandardDoclet.java
diff --git a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/RootDocProcessor.java b/hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/RootDocProcessor.java
similarity index 100%
rename from hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/RootDocProcessor.java
rename to hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/RootDocProcessor.java
diff --git a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/StabilityOptions.java b/hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/StabilityOptions.java
similarity index 100%
rename from hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/StabilityOptions.java
rename to hadoop-common-project/hadoop-annotations/src/main/java8/org/apache/hadoop/classification/tools/StabilityOptions.java
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 5128e5054db22..3e23d51e00a28 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -549,19 +549,29 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       </build>
     </profile>
     <profile>
-      <id>java9</id>
+      <id>jdk8</id>
       <activation>
-        <jdk>[9,)</jdk>
+        <jdk>1.8</jdk>
       </activation>
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <testExcludes>
-                <testExclude>org/apache/hadoop/hdfs/TestDFSClientFailover.java</testExclude>
-              </testExcludes>
-            </configuration>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-source</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>${basedir}/src/main/java8</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
         </plugins>
       </build>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java8/org/apache/hadoop/hdfs/TestDFSClientFailover.java
similarity index 100%
rename from hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java
rename to hadoop-hdfs-project/hadoop-hdfs/src/test/java8/org/apache/hadoop/hdfs/TestDFSClientFailover.java

From 4075a961da385f7745cc7f01d5a7414edfc736e9 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Fri, 7 Feb 2025 21:19:24 +0800
Subject: [PATCH 2/2] nit

---
 hadoop-common-project/hadoop-annotations/pom.xml | 2 +-
 hadoop-hdfs-project/hadoop-hdfs/pom.xml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index 464116fbf5d7f..bc7a2ef60b696 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -39,7 +39,7 @@
 
   <profiles>
     <profile>
-      <id>jdk8</id>
+      <id>jdk1.8</id>
       <activation>
         <jdk>1.8</jdk>
       </activation>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index 3e23d51e00a28..27a9e674bb891 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -549,7 +549,7 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
       </build>
     </profile>
     <profile>
-      <id>jdk8</id>
+      <id>jdk1.8</id>
       <activation>
         <jdk>1.8</jdk>
       </activation>