HADOOP-18718. Fix several maven build warnings (#5592). Contributed by Dongjoon Hyun.

Reviewed-by: Gautham B A <gautham.bangalore@gmail.com>
Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
This commit is contained in:
Dongjoon Hyun 2023-06-10 23:08:13 -07:00 committed by GitHub
parent 35158db711
commit fb16e00da0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 31 additions and 68 deletions

View File

@ -180,7 +180,6 @@
<configuration> <configuration>
<executable>${shell-executable}</executable> <executable>${shell-executable}</executable>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory> <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments> <arguments>
<argument>ensure-jars-have-correct-contents.sh</argument> <argument>ensure-jars-have-correct-contents.sh</argument>
<argument>${hadoop-client-artifacts}</argument> <argument>${hadoop-client-artifacts}</argument>

View File

@ -190,7 +190,6 @@
<configuration> <configuration>
<executable>${shell-executable}</executable> <executable>${shell-executable}</executable>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory> <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments> <arguments>
<argument>ensure-jars-have-correct-contents.sh</argument> <argument>ensure-jars-have-correct-contents.sh</argument>
<argument>${hadoop-client-artifacts}</argument> <argument>${hadoop-client-artifacts}</argument>

View File

@ -1084,7 +1084,6 @@
</goals> </goals>
<configuration> <configuration>
<executable>${basedir}/../../dev-support/bin/releasedocmaker</executable> <executable>${basedir}/../../dev-support/bin/releasedocmaker</executable>
<requiresOnline>true</requiresOnline>
<arguments> <arguments>
<argument>--index</argument> <argument>--index</argument>
<argument>--license</argument> <argument>--license</argument>

View File

@ -179,7 +179,6 @@
<executable>${shell-executable}</executable> <executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory} <workingDirectory>${project.build.directory}
</workingDirectory> </workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments> <arguments>
<argument> <argument>
${basedir}/../dev-support/bin/dist-layout-stitching ${basedir}/../dev-support/bin/dist-layout-stitching
@ -198,7 +197,6 @@
<configuration> <configuration>
<executable>${shell-executable}</executable> <executable>${shell-executable}</executable>
<workingDirectory>${basedir}</workingDirectory> <workingDirectory>${basedir}</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments> <arguments>
<argument> <argument>
${basedir}/../dev-support/bin/dist-tools-hooks-maker ${basedir}/../dev-support/bin/dist-tools-hooks-maker
@ -219,7 +217,6 @@
<executable>${shell-executable}</executable> <executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory} <workingDirectory>${project.build.directory}
</workingDirectory> </workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments> <arguments>
<argument>${basedir}/../dev-support/bin/dist-tar-stitching <argument>${basedir}/../dev-support/bin/dist-tar-stitching
</argument> </argument>

View File

@ -190,12 +190,9 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<systemProperties> <systemPropertyVariables>
<property> <derby.stream.error.file>${project.build.directory}/derby.log</derby.stream.error.file>
<name>derby.stream.error.file</name> </systemPropertyVariables>
<value>${project.build.directory}/derby.log</value>
</property>
</systemProperties>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -251,10 +248,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="src/main/resources/hdfs-rbf-default.xml" todir="src/site/resources"/> <copy file="src/main/resources/hdfs-rbf-default.xml" todir="src/site/resources"/>
<copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/> <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -307,10 +307,10 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="src/main/resources/hdfs-default.xml" todir="src/site/resources"/> <copy file="src/main/resources/hdfs-default.xml" todir="src/site/resources"/>
<copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/> <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -136,10 +136,10 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="src/main/resources/mapred-default.xml" todir="src/site/resources"/> <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"/> <copy file="../../../hadoop-common-project/hadoop-common/src/main/xsl/configuration.xsl" todir="src/site/resources"/>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -328,7 +328,6 @@
<configuration> <configuration>
<executable>${shell-executable}</executable> <executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}</workingDirectory> <workingDirectory>${project.build.directory}</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments> <arguments>
<argument>${project.parent.basedir}/../dev-support/bin/dist-copynativelibs</argument> <argument>${project.parent.basedir}/../dev-support/bin/dist-copynativelibs</argument>
<argument>--version=${project.version}</argument> <argument>--version=${project.version}</argument>

View File

@ -71,13 +71,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<excludeFilterFile>${basedir}/src/main/findbugs/exclude.xml</excludeFilterFile>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>

View File

@ -142,24 +142,12 @@
<include>**/Test*.java</include> <include>**/Test*.java</include>
</includes> </includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemProperties> <systemPropertyVariables>
<property> <test.build.data>${basedir}/target/test/data</test.build.data>
<name>test.build.data</name> <hadoop.log.dir>target/test/logs</hadoop.log.dir>
<value>${basedir}/target/test/data</value> <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
</property> <org.apache.commons.logging.simplelog.defaultlog>warn</org.apache.commons.logging.simplelog.defaultlog>
<property> </systemPropertyVariables>
<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>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View File

@ -152,24 +152,12 @@
<include>**/Test*.java</include> <include>**/Test*.java</include>
</includes> </includes>
<redirectTestOutputToFile>true</redirectTestOutputToFile> <redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemProperties> <systemPropertyVariables>
<property> <test.build.data>${basedir}/target/test/data</test.build.data>
<name>test.build.data</name> <hadoop.log.dir>target/test/logs</hadoop.log.dir>
<value>${basedir}/target/test/data</value> <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
</property> <org.apache.commons.logging.simplelog.defaultlog>warn</org.apache.commons.logging.simplelog.defaultlog>
<property> </systemPropertyVariables>
<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>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View File

@ -387,10 +387,10 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="src/main/resources/yarn-default.xml" todir="src/site/resources"/> <copy file="src/main/resources/yarn-default.xml" todir="src/site/resources"/>
<copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/> <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -176,9 +176,9 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/> <copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -188,12 +188,12 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<tasks> <target>
<copy file="${basedir}/../../bin/FederationStateStore/MySQL/FederationStateStoreTables.sql" todir="${project.build.directory}/test-classes/MySQL"/> <copy file="${basedir}/../../bin/FederationStateStore/MySQL/FederationStateStoreTables.sql" todir="${project.build.directory}/test-classes/MySQL"/>
<copy file="${basedir}/../../bin/FederationStateStore/MySQL/FederationStateStoreStoredProcs.sql" todir="${project.build.directory}/test-classes/MySQL"/> <copy file="${basedir}/../../bin/FederationStateStore/MySQL/FederationStateStoreStoredProcs.sql" todir="${project.build.directory}/test-classes/MySQL"/>
<copy file="${basedir}/../../bin/FederationStateStore/SQLServer/FederationStateStoreTables.sql" todir="${project.build.directory}/test-classes/SQLServer"/> <copy file="${basedir}/../../bin/FederationStateStore/SQLServer/FederationStateStoreTables.sql" todir="${project.build.directory}/test-classes/SQLServer"/>
<copy file="${basedir}/../../bin/FederationStateStore/SQLServer/FederationStateStoreStoredProcs.sql" todir="${project.build.directory}/test-classes/SQLServer"/> <copy file="${basedir}/../../bin/FederationStateStore/SQLServer/FederationStateStoreStoredProcs.sql" todir="${project.build.directory}/test-classes/SQLServer"/>
</tasks> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -611,6 +611,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
<plugin> <plugin>
<groupId>org.cyclonedx</groupId> <groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId> <artifactId>cyclonedx-maven-plugin</artifactId>
<version>${cyclonedx.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -769,6 +770,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration>
<outputFormat>xml</outputFormat>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>