This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 20d073cb2c5 HADOOP-18718. Fix several maven build warnings (#5592).
Contributed by Dongjoon Hyun.
20d073cb2c5 is described below
commit 20d073cb2c57c300ad0754cd71e864b4f66f50a8
Author: Dongjoon Hyun <dongj...@apache.org>
AuthorDate: Sat Jun 10 23:08:13 2023 -0700
HADOOP-18718. Fix several maven build warnings (#5592). Contributed by
Dongjoon Hyun.
Reviewed-by: Gautham B A <gautham.bangal...@gmail.com>
Signed-off-by: Ayush Saxena <ayushsax...@apache.org>
(cherry picked from commit fb16e00da0e7c50cba8bf238fad7d09281717848)
Conflicts:
hadoop-tools/hadoop-federation-balance/pom.xml
---
.../hadoop-client-check-invariants/pom.xml | 1 -
.../hadoop-client-check-test-invariants/pom.xml | 1 -
hadoop-common-project/hadoop-common/pom.xml | 1 -
hadoop-dist/pom.xml | 3 ---
hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml | 13 +++++-------
hadoop-hdfs-project/hadoop-hdfs/pom.xml | 4 ++--
.../hadoop-mapreduce-client-core/pom.xml | 4 ++--
hadoop-project-dist/pom.xml | 1 -
hadoop-tools/hadoop-benchmark/pom.xml | 7 -------
hadoop-tools/hadoop-distcp/pom.xml | 24 ++++++----------------
.../hadoop-yarn/hadoop-yarn-common/pom.xml | 4 ++--
.../hadoop-yarn-server-common/pom.xml | 4 ++--
pom.xml | 4 ++++
13 files changed, 23 insertions(+), 48 deletions(-)
diff --git a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
index 6913f392528..3183b822ad1 100644
--- a/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
+++ b/hadoop-client-modules/hadoop-client-check-invariants/pom.xml
@@ -180,7 +180,6 @@
<configuration>
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
- <requiresOnline>false</requiresOnline>
<arguments>
<argument>ensure-jars-have-correct-contents.sh</argument>
<argument>${hadoop-client-artifacts}</argument>
diff --git a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
index c696ac0213b..49596b4e74b 100644
--- a/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
+++ b/hadoop-client-modules/hadoop-client-check-test-invariants/pom.xml
@@ -190,7 +190,6 @@
<configuration>
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
- <requiresOnline>false</requiresOnline>
<arguments>
<argument>ensure-jars-have-correct-contents.sh</argument>
<argument>${hadoop-client-artifacts}</argument>
diff --git a/hadoop-common-project/hadoop-common/pom.xml
b/hadoop-common-project/hadoop-common/pom.xml
index 5213401d632..b1444cba2f2 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -978,7 +978,6 @@
</goals>
<configuration>
<executable>${basedir}/../../dev-support/bin/releasedocmaker</executable>
- <requiresOnline>true</requiresOnline>
<arguments>
<argument>--index</argument>
<argument>--license</argument>
diff --git a/hadoop-dist/pom.xml b/hadoop-dist/pom.xml
index a4587d3a8fd..04a42f050db 100644
--- a/hadoop-dist/pom.xml
+++ b/hadoop-dist/pom.xml
@@ -169,7 +169,6 @@
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}
</workingDirectory>
- <requiresOnline>false</requiresOnline>
<arguments>
<argument>
${basedir}/../dev-support/bin/dist-layout-stitching
@@ -188,7 +187,6 @@
<configuration>
<executable>${shell-executable}</executable>
<workingDirectory>${basedir}</workingDirectory>
- <requiresOnline>false</requiresOnline>
<arguments>
<argument>
${basedir}/../dev-support/bin/dist-tools-hooks-maker
@@ -209,7 +207,6 @@
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}
</workingDirectory>
- <requiresOnline>false</requiresOnline>
<arguments>
<argument>${basedir}/../dev-support/bin/dist-tar-stitching
</argument>
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
index a0ddec5b8c7..c23e3961196 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
@@ -141,12 +141,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <systemProperties>
- <property>
- <name>derby.stream.error.file</name>
- <value>${project.build.directory}/derby.log</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+
<derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
+ </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
@@ -202,10 +199,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy file="src/main/resources/hdfs-rbf-default.xml"
todir="src/site/resources"/>
<copy file="src/main/xsl/configuration.xsl"
todir="src/site/resources"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
index aef9bb8f35f..9a25988347b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml
@@ -313,10 +313,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy file="src/main/resources/hdfs-default.xml"
todir="src/site/resources"/>
<copy file="src/main/xsl/configuration.xsl"
todir="src/site/resources"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
index b8e08aa110d..8e6ca9f3ecb 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/pom.xml
@@ -135,10 +135,10 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy file="src/main/resources/mapred-default.xml"
todir="src/site/resources"/>
<copy
file="../../../hadoop-common-project/hadoop-common/src/main/xsl/configuration.xsl"
todir="src/site/resources"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml
index 505616ee9d3..0029402dabd 100644
--- a/hadoop-project-dist/pom.xml
+++ b/hadoop-project-dist/pom.xml
@@ -328,7 +328,6 @@
<configuration>
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
- <requiresOnline>false</requiresOnline>
<arguments>
<argument>${project.parent.basedir}/../dev-support/bin/dist-copynativelibs</argument>
<argument>--version=${project.version}</argument>
diff --git a/hadoop-tools/hadoop-benchmark/pom.xml
b/hadoop-tools/hadoop-benchmark/pom.xml
index 7c22fb4b16b..6d7ba89d81f 100644
--- a/hadoop-tools/hadoop-benchmark/pom.xml
+++ b/hadoop-tools/hadoop-benchmark/pom.xml
@@ -71,13 +71,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
-
<excludeFilterFile>${basedir}/src/main/findbugs/exclude.xml</excludeFilterFile>
- </configuration>
- </plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
diff --git a/hadoop-tools/hadoop-distcp/pom.xml
b/hadoop-tools/hadoop-distcp/pom.xml
index 2d3e313dba3..29f703d1ecc 100644
--- a/hadoop-tools/hadoop-distcp/pom.xml
+++ b/hadoop-tools/hadoop-distcp/pom.xml
@@ -136,24 +136,12 @@
<include>**/Test*.java</include>
</includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
- <name>test.build.data</name>
- <value>${basedir}/target/test/data</value>
- </property>
- <property>
- <name>hadoop.log.dir</name>
- <value>target/test/logs</value>
- </property>
- <property>
- <name>org.apache.commons.logging.Log</name>
- <value>org.apache.commons.logging.impl.SimpleLog</value>
- </property>
- <property>
- <name>org.apache.commons.logging.simplelog.defaultlog</name>
- <value>warn</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <test.build.data>${basedir}/target/test/data</test.build.data>
+ <hadoop.log.dir>target/test/logs</hadoop.log.dir>
+
<org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+
<org.apache.commons.logging.simplelog.defaultlog>warn</org.apache.commons.logging.simplelog.defaultlog>
+ </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
index b5f0d07b09c..5b8412df48a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
@@ -367,10 +367,10 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy file="src/main/resources/yarn-default.xml"
todir="src/site/resources"/>
<copy file="src/main/xsl/configuration.xsl"
todir="src/site/resources"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
index 7205cfcb69b..417281f8873 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml
@@ -169,9 +169,9 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy file="src/main/xsl/configuration.xsl"
todir="src/site/resources"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
diff --git a/pom.xml b/pom.xml
index 17753e83c1c..e87525491f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -498,6 +498,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/x
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>${cyclonedx.version}</version>
</plugin>
</plugins>
</build>
@@ -656,6 +657,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/x
</goals>
</execution>
</executions>
+ <configuration>
+ <outputFormat>xml</outputFormat>
+ </configuration>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
