Skip to content

Commit acda1a5

Browse files
committed
HADOOP-13964. Remove vestigal templates directories
Signed-off-by: Andrew Wang <[email protected]>
1 parent 72054a8 commit acda1a5

File tree

3 files changed

+0
-42
lines changed

3 files changed

+0
-42
lines changed

hadoop-assemblies/src/main/resources/assemblies/hadoop-dist.xml

-14
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,6 @@
9393
<directory>${project.build.directory}/webapps</directory>
9494
<outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
9595
</fileSet>
96-
<fileSet>
97-
<directory>${basedir}/src/main/conf</directory>
98-
<outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
99-
<includes>
100-
<include>*-site.xml</include>
101-
</includes>
102-
</fileSet>
103-
<fileSet>
104-
<directory>${basedir}/src/main/packages/templates/conf</directory>
105-
<outputDirectory>/share/hadoop/${hadoop.component}/templates/conf</outputDirectory>
106-
<includes>
107-
<include>*</include>
108-
</includes>
109-
</fileSet>
11096
<fileSet>
11197
<directory>${project.build.directory}</directory>
11298
<outputDirectory>/share/hadoop/${hadoop.component}</outputDirectory>

hadoop-assemblies/src/main/resources/assemblies/hadoop-mapreduce-dist.xml

-14
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,6 @@
7272
<directory>${project.build.directory}/webapps</directory>
7373
<outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
7474
</fileSet>
75-
<fileSet>
76-
<directory>${basedir}/src/main/conf</directory>
77-
<outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
78-
<includes>
79-
<include>*-site.xml</include>
80-
</includes>
81-
</fileSet>
82-
<fileSet>
83-
<directory>${basedir}/src/main/packages/templates/conf</directory>
84-
<outputDirectory>/share/hadoop/${hadoop.component}/templates/conf</outputDirectory>
85-
<includes>
86-
<include>*</include>
87-
</includes>
88-
</fileSet>
8975
<fileSet>
9076
<directory>${basedir}/dev-support/jdiff</directory>
9177
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>

hadoop-assemblies/src/main/resources/assemblies/hadoop-yarn-dist.xml

-14
Original file line numberDiff line numberDiff line change
@@ -166,20 +166,6 @@
166166
<directory>${project.build.directory}/webapps</directory>
167167
<outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
168168
</fileSet>
169-
<fileSet>
170-
<directory>${basedir}/src/main/conf</directory>
171-
<outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
172-
<includes>
173-
<include>*-site.xml</include>
174-
</includes>
175-
</fileSet>
176-
<fileSet>
177-
<directory>${basedir}/src/main/packages/templates/conf</directory>
178-
<outputDirectory>/share/hadoop/${hadoop.component}/templates/conf</outputDirectory>
179-
<includes>
180-
<include>*</include>
181-
</includes>
182-
</fileSet>
183169
<fileSet>
184170
<directory>${basedir}/dev-support/jdiff</directory>
185171
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>

0 commit comments

Comments
 (0)