Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion hadoop-common-project/hadoop-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,6 @@
</goals>
<configuration>
<executable>${basedir}/../../dev-support/bin/releasedocmaker</executable>
<requiresOnline>true</requiresOnline>
<arguments>
<argument>--index</argument>
<argument>--license</argument>
Expand Down
3 changes: 0 additions & 3 deletions hadoop-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}
</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments>
<argument>
${basedir}/../dev-support/bin/dist-layout-stitching
Expand All @@ -198,7 +197,6 @@
<configuration>
<executable>${shell-executable}</executable>
<workingDirectory>${basedir}</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments>
<argument>
${basedir}/../dev-support/bin/dist-tools-hooks-maker
Expand All @@ -219,7 +217,6 @@
<executable>${shell-executable}</executable>
<workingDirectory>${project.build.directory}
</workingDirectory>
<requiresOnline>false</requiresOnline>
<arguments>
<argument>${basedir}/../dev-support/bin/dist-tar-stitching
</argument>
Expand Down
13 changes: 5 additions & 8 deletions hadoop-hdfs-project/hadoop-hdfs-rbf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,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>
Expand Down Expand Up @@ -251,10 +248,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>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdfs-project/hadoop-hdfs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,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>
Expand Down
1 change: 0 additions & 1 deletion hadoop-project-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions hadoop-tools/hadoop-benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 6 additions & 18 deletions hadoop-tools/hadoop-distcp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,24 +142,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>
Expand Down
24 changes: 6 additions & 18 deletions hadoop-tools/hadoop-federation-balance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,24 +152,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>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<copy file="src/main/xsl/configuration.xsl" todir="src/site/resources"/>
</tasks>
</target>
</configuration>
</execution>
<execution>
Expand All @@ -188,12 +188,12 @@
<goal>run</goal>
</goals>
<configuration>
<tasks>
<target>
<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/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"/>
</tasks>
</target>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 4 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,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>
Expand Down Expand Up @@ -769,6 +770,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>
Expand Down