Skip to content

Commit ab69ce9

Browse files
committed
MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1339629 13f79535-47bb-0310-9956-ffa450edef68
1 parent d4fa704 commit ab69ce9

File tree

66 files changed

+150
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+150
-6
lines changed

hadoop-mapreduce-project/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,8 @@ Release 0.23.3 - UNRELEASED
503503
MAPREDUCE-4102. job counters not available in Jobhistory webui for
504504
killed jobs (Bhallamudi Venkata Siva Kamesh via tgraves)
505505

506+
MAPREDUCE-3543. Mavenize Gridmix. (tgraves)
507+
506508
Release 0.23.2 - UNRELEASED
507509

508510
INCOMPATIBLE CHANGES

hadoop-project/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@
212212
<artifactId>hadoop-mapreduce-examples</artifactId>
213213
<version>${project.version}</version>
214214
</dependency>
215+
<dependency>
216+
<groupId>org.apache.hadoop</groupId>
217+
<artifactId>hadoop-gridmix</artifactId>
218+
<version>${project.version}</version>
219+
</dependency>
215220

216221
<dependency>
217222
<groupId>org.apache.hadoop</groupId>
Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License. See accompanying LICENSE file.
14+
-->
15+
<project>
16+
<modelVersion>4.0.0</modelVersion>
17+
<parent>
18+
<groupId>org.apache.hadoop</groupId>
19+
<artifactId>hadoop-project</artifactId>
20+
<version>3.0.0-SNAPSHOT</version>
21+
<relativePath>../../hadoop-project</relativePath>
22+
</parent>
23+
<groupId>org.apache.hadoop</groupId>
24+
<artifactId>hadoop-gridmix</artifactId>
25+
<version>3.0.0-SNAPSHOT</version>
26+
<description>Apache Hadoop Gridmix</description>
27+
<name>Apache Hadoop Gridmix</name>
28+
<packaging>jar</packaging>
29+
30+
<properties>
31+
<hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
32+
</properties>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>org.apache.hadoop</groupId>
37+
<artifactId>hadoop-annotations</artifactId>
38+
<scope>provided</scope>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.apache.hadoop</groupId>
42+
<artifactId>hadoop-mapreduce-client-hs</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>org.apache.hadoop</groupId>
47+
<artifactId>hadoop-mapreduce-client-core</artifactId>
48+
<scope>provided</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>org.apache.hadoop</groupId>
52+
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
53+
<scope>provided</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.apache.hadoop</groupId>
57+
<artifactId>hadoop-mapreduce-client-jobclient</artifactId>
58+
<scope>test</scope>
59+
<type>test-jar</type>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.apache.hadoop</groupId>
63+
<artifactId>hadoop-common</artifactId>
64+
<scope>provided</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.apache.hadoop</groupId>
68+
<artifactId>hadoop-rumen</artifactId>
69+
<scope>provided</scope>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.apache.hadoop</groupId>
73+
<artifactId>hadoop-hdfs</artifactId>
74+
<scope>provided</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.apache.hadoop</groupId>
78+
<artifactId>hadoop-common</artifactId>
79+
<scope>test</scope>
80+
<type>test-jar</type>
81+
</dependency>
82+
<dependency>
83+
<groupId>org.apache.hadoop</groupId>
84+
<artifactId>hadoop-hdfs</artifactId>
85+
<scope>test</scope>
86+
<type>test-jar</type>
87+
</dependency>
88+
<dependency>
89+
<groupId>org.apache.hadoop</groupId>
90+
<artifactId>hadoop-yarn-server-tests</artifactId>
91+
<type>test-jar</type>
92+
<scope>test</scope>
93+
</dependency>
94+
</dependencies>
95+
96+
<build>
97+
<plugins>
98+
<plugin>
99+
<groupId>org.apache.maven.plugins</groupId>
100+
<artifactId>maven-antrun-plugin</artifactId>
101+
<executions>
102+
<execution>
103+
<id>create-log-dir</id>
104+
<phase>process-test-resources</phase>
105+
<goals>
106+
<goal>run</goal>
107+
</goals>
108+
<configuration>
109+
<target>
110+
<delete dir="${test.build.data}"/>
111+
<mkdir dir="${test.build.data}"/>
112+
<mkdir dir="${hadoop.log.dir}"/>
113+
</target>
114+
</configuration>
115+
</execution>
116+
</executions>
117+
</plugin>
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-jar-plugin</artifactId>
121+
<configuration>
122+
<archive>
123+
<manifest>
124+
<mainClass>org.apache.hadoop.tools.HadoopArchives</mainClass>
125+
</manifest>
126+
</archive>
127+
</configuration>
128+
</plugin>
129+
</plugins>
130+
</build>
131+
</project>
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.hadoop.conf.Configuration;
2424
import org.apache.hadoop.fs.CommonConfigurationKeys;
2525
import org.apache.hadoop.fs.FileSystem;
26-
import org.apache.hadoop.mapred.JobTracker;
2726
import org.apache.hadoop.mapred.gridmix.Statistics.ClusterStats;
2827
import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
2928

@@ -114,4 +113,4 @@ protected String getJobTrackerInfo() {
114113
protected String getNamenodeInfo() {
115114
return namenodeInfo;
116115
}
117-
}
116+
}

0 commit comments

Comments
 (0)