You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/02/11 21:44:27 UTC
[2/3] accumulo git commit: ACCUMULO-3579 Reintroduce jetty6 for
Hadoop 1 minidfs support.
ACCUMULO-3579 Reintroduce jetty6 for Hadoop 1 minidfs support.
This reverts commit 57142e282a1230a55c1067206495e6dcd13c7635.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0a7e1174
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a7e1174
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a7e1174
Branch: refs/heads/master
Commit: 0a7e1174c5c6d91b0c628ed786f375243b139ed4
Parents: 57142e2
Author: Josh Elser <el...@apache.org>
Authored: Wed Feb 11 15:42:57 2015 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Wed Feb 11 15:42:57 2015 -0500
----------------------------------------------------------------------
pom.xml | 6 ++++++
start/pom.xml | 20 ++++++++++++++++++++
test/pom.xml | 5 +++++
3 files changed, 31 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0a7e1174/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 39009fa..b6523ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -450,6 +450,12 @@
<artifactId>jetty-util</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <!-- Necessary for Hadoop-1 minidfs -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.26</version>
+ </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0a7e1174/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index ecedf5b..b19272a 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -109,4 +109,24 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <!-- profile for building against Hadoop 1.x
+ Activate using: mvn -Dhadoop.profile=1 -->
+ <profile>
+ <id>hadoop-1</id>
+ <activation>
+ <property>
+ <name>hadoop.profile</name>
+ <value>1</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0a7e1174/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 1e0f676..21e6bd5 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -307,6 +307,11 @@
<artifactId>hadoop-tools</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
<!-- profile for building against Hadoop 2.x