Skip to content

Commit cc42b81

Browse files
committed
NETFLIX-BUILD: Copy netflix resources in Maven
(cherry picked from commit 0ce3084)
1 parent 1ad5e6f commit cc42b81

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

assembly/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@
121121
<zip destfile="${basedir}/../python/lib/pyspark.zip">
122122
<fileset dir="${basedir}/../python/" includes="pyspark/**/*"/>
123123
</zip>
124+
<copy file="../netflix/spark-defaults.conf" tofile="../conf/spark-defaults.conf"/>
125+
<copy file="../netflix/spark-env.sh" tofile="../conf/spark-env.sh"/>
124126
</target>
125127
</configuration>
126128
</plugin>

core/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,19 @@
391391
<directory>${project.build.directory}/extra-resources</directory>
392392
<filtering>true</filtering>
393393
</resource>
394+
<resource>
395+
<directory>../netflix</directory>
396+
<includes>
397+
<include>metrics-site.xml</include>
398+
</includes>
399+
</resource>
400+
<resource>
401+
<directory>../netflix</directory>
402+
<targetPath>org/apache/spark</targetPath>
403+
<includes>
404+
<include>log4j-defaults*.properties</include>
405+
</includes>
406+
</resource>
394407
</resources>
395408
<plugins>
396409
<plugin>

netflix_build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,6 @@ tar -xf apache-maven-3.3.9-bin.tar.gz
4545
export M2_HOME=${WORKSPACE}/apache-maven-3.3.9
4646
export PATH=${M2_HOME}/bin:${PATH}
4747

48-
# copy log4j configurations so they are included in the assembly
49-
cp netflix/log4j-defaults.properties core/src/main/resources/org/apache/spark/
50-
cp netflix/log4j-defaults-repl.properties core/src/main/resources/org/apache/spark/
51-
cp netflix/metrics-site.xml core/src/main/resources/
52-
5348
# avoid stale compile servers causing problems
5449
build/zinc-0.3.9/bin/zinc -shutdown || echo "No zinc server running."
5550

0 commit comments

Comments
 (0)