Skip to content

Commit 01a0ab7

Browse files
committed
Fix HDInsight related Maven project build output
1 parent 3b6a31c commit 01a0ab7

File tree

4 files changed

+45
-4
lines changed

4 files changed

+45
-4
lines changed

Utils/spark-localrun-mock/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<testSourceDirectory>test</testSourceDirectory>
2222
<testResources>
2323
<testResource>
24-
<directory>Test/resources</directory>
24+
<directory>test/resources</directory>
2525
</testResource>
2626
</testResources>
2727
<defaultGoal>install</defaultGoal>
@@ -89,7 +89,7 @@
8989
<outputDirectory>${project.build.directory}</outputDirectory>
9090
<resources>
9191
<resource>
92-
<directory>Test/resources/data</directory>
92+
<directory>test/resources/data</directory>
9393
<targetPath>data</targetPath>
9494
</resource>
9595
</resources>
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
# Copyright (c) Microsoft Corporation
3+
#
4+
# All rights reserved.
5+
#
6+
# MIT License
7+
#
8+
# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
9+
# documentation files (the "Software"), to deal in the Software without restriction, including without limitation
10+
# the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
11+
# to permit persons to whom the Software is furnished to do so, subject to the following conditions:
12+
#
13+
# The above copyright notice and this permission notice shall be included in all copies or substantial portions of
14+
# the Software.
15+
#
16+
# THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
17+
# THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
19+
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
# SOFTWARE.
21+
#
22+
23+
# Set everything to be logged to the file target/unit-tests.log
24+
test.appender=file
25+
log4j.rootCategory=INFO, ${test.appender}
26+
log4j.appender.file=org.apache.log4j.FileAppender
27+
log4j.appender.file.append=true
28+
log4j.appender.file.file=target/unit-tests.log
29+
log4j.appender.file.layout=org.apache.log4j.PatternLayout
30+
log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %t %p %c{1}: %m%n
31+
32+
# Tests that launch java subprocesses can set the "test.appender" system property to
33+
# "console" to avoid having the child process's logs overwrite the unit test's
34+
# log file.
35+
log4j.appender.console=org.apache.log4j.ConsoleAppender
36+
log4j.appender.console.target=System.err
37+
log4j.appender.console.layout=org.apache.log4j.PatternLayout
38+
log4j.appender.console.layout.ConversionPattern=%t: %m%n
39+
40+
# Ignore messages below warning level from Jetty, because it's a bit verbose
41+
log4j.logger.org.spark_project.jetty=WARN

Utils/spark-tools/spark-v2.3/spark-v2.3.0/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<JAVA_HOME>${java.home}</JAVA_HOME>
8585
</environmentVariables>
8686
<systemProperties>
87-
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
87+
<log4j.configuration>file:../src/test/resources/log4j.properties</log4j.configuration>
8888
<derby.system.durability>test</derby.system.durability>
8989
<java.awt.headless>true</java.awt.headless>
9090
<java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>

Utils/spark-tools/spark-v2.3/spark-v2.3.2/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<JAVA_HOME>${java.home}</JAVA_HOME>
8585
</environmentVariables>
8686
<systemProperties>
87-
<log4j.configuration>file:src/test/resources/log4j.properties</log4j.configuration>
87+
<log4j.configuration>file:../src/test/resources/log4j.properties</log4j.configuration>
8888
<derby.system.durability>test</derby.system.durability>
8989
<java.awt.headless>true</java.awt.headless>
9090
<java.io.tmpdir>${project.build.directory}/tmp</java.io.tmpdir>

0 commit comments

Comments
 (0)