Skip to content

Commit 92c1005

Browse files
committed
MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1351818 13f79535-47bb-0310-9956-ffa450edef68
1 parent cfa26ce commit 92c1005

File tree

32 files changed

+328
-469
lines changed

32 files changed

+328
-469
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one or more
3+
contributor license agreements. See the NOTICE file distributed with
4+
this work for additional information regarding copyright ownership.
5+
The ASF licenses this file to You under the Apache License, Version 2.0
6+
(the "License"); you may not use this file except in compliance with
7+
the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
18+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
19+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
20+
<id>hadoop-tools</id>
21+
<formats>
22+
<format>dir</format>
23+
</formats>
24+
<includeBaseDirectory>false</includeBaseDirectory>
25+
<fileSets>
26+
<fileSet>
27+
<directory>../hadoop-pipes/src/main/native/pipes/api/hadoop</directory>
28+
<includes>
29+
<include>*.hh</include>
30+
</includes>
31+
<outputDirectory>/include</outputDirectory>
32+
</fileSet>
33+
<fileSet>
34+
<directory>../hadoop-pipes/src/main/native/utils/api/hadoop</directory>
35+
<includes>
36+
<include>*.hh</include>
37+
</includes>
38+
<outputDirectory>/include</outputDirectory>
39+
</fileSet>
40+
<fileSet>
41+
<directory>../hadoop-pipes/target/native</directory>
42+
<includes>
43+
<include>*.a</include>
44+
</includes>
45+
<outputDirectory>lib/native</outputDirectory>
46+
</fileSet>
47+
</fileSets>
48+
<dependencySets>
49+
<dependencySet>
50+
<outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
51+
<unpack>false</unpack>
52+
<scope>runtime</scope>
53+
<useProjectArtifact>false</useProjectArtifact>
54+
<!-- Exclude hadoop artifacts. They will be found via HADOOP* env -->
55+
<excludes>
56+
<exclude>org.apache.hadoop:hadoop-common</exclude>
57+
<exclude>org.apache.hadoop:hadoop-hdfs</exclude>
58+
<exclude>org.apache.hadoop:hadoop-mapreduce</exclude>
59+
<!-- pipes is native stuff, this just keeps pom from being package-->
60+
<exclude>org.apache.hadoop:hadoop-pipes</exclude>
61+
<!-- use slf4j from common to avoid multiple binding warnings -->
62+
<exclude>org.slf4j:slf4j-api</exclude>
63+
<exclude>org.slf4j:slf4j-log4j12</exclude>
64+
</excludes>
65+
</dependencySet>
66+
</dependencySets>
67+
</assembly>

hadoop-mapreduce-project/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,8 @@ Release 0.23.3 - UNRELEASED
394394
MAPREDUCE-4301. Dedupe some strings in MRAM for memory savings
395395
(bobby via tgraves)
396396

397+
MAPREDUCE-4267. mavenize pipes (tgraves via bobby)
398+
397399
OPTIMIZATIONS
398400

399401
MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn

hadoop-mapreduce-project/src/c++/pipes/.autom4te.cfg

Lines changed: 0 additions & 42 deletions
This file was deleted.

hadoop-mapreduce-project/src/c++/pipes/Makefile.am

Lines changed: 0 additions & 31 deletions
This file was deleted.

hadoop-mapreduce-project/src/c++/pipes/configure.ac

Lines changed: 0 additions & 57 deletions
This file was deleted.

hadoop-mapreduce-project/src/c++/utils/.autom4te.cfg

Lines changed: 0 additions & 42 deletions
This file was deleted.

hadoop-mapreduce-project/src/c++/utils/Makefile.am

Lines changed: 0 additions & 33 deletions
This file was deleted.

hadoop-mapreduce-project/src/c++/utils/configure.ac

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)