Merge branch 'apache:trunk' into HADOOP-19425

apache · Feb 13, 2025 · 02e3b9b · 02e3b9b
2 parents 919898b + 2202c95
commit 02e3b9b
Show file tree

Hide file tree

Showing 292 changed files with 5,885 additions and 5,346 deletions.
diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -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/...ExcludePrivateAnnotationsJDiffDoclet.java → ...ExcludePrivateAnnotationsJDiffDoclet.java b/...ExcludePrivateAnnotationsJDiffDoclet.java → ...ExcludePrivateAnnotationsJDiffDoclet.java
diff --git a/...ludePrivateAnnotationsStandardDoclet.java → ...ludePrivateAnnotationsStandardDoclet.java b/...ludePrivateAnnotationsStandardDoclet.java → ...ludePrivateAnnotationsStandardDoclet.java
diff --git a/.../IncludePublicAnnotationsJDiffDoclet.java → .../IncludePublicAnnotationsJDiffDoclet.java b/.../IncludePublicAnnotationsJDiffDoclet.java → .../IncludePublicAnnotationsJDiffDoclet.java
diff --git a/...cludePublicAnnotationsStandardDoclet.java → ...cludePublicAnnotationsStandardDoclet.java b/...cludePublicAnnotationsStandardDoclet.java → ...cludePublicAnnotationsStandardDoclet.java
diff --git a/...lassification/tools/RootDocProcessor.java → ...lassification/tools/RootDocProcessor.java b/...lassification/tools/RootDocProcessor.java → ...lassification/tools/RootDocProcessor.java
diff --git a/...lassification/tools/StabilityOptions.java → ...lassification/tools/StabilityOptions.java b/...lassification/tools/StabilityOptions.java → ...lassification/tools/StabilityOptions.java
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -210,6 +210,26 @@
       <artifactId>kotlin-stdlib-jdk8</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>