accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [2/3] git commit: ACCUMULO-2808 Fix missing mortbay dependency
Date Tue, 17 Jun 2014 22:26:15 GMT
ACCUMULO-2808 Fix missing mortbay dependency

  The mortbay version of Jetty is still needed for the MiniDfsCluster in the
  Hadoop 1 profile, at the test scope.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c409b0a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c409b0a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c409b0a

Branch: refs/heads/master
Commit: 5c409b0ad7e83410c393f8bb63576e03678e23cb
Parents: c78c18b
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jun 17 17:02:11 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jun 17 17:22:18 2014 -0400

----------------------------------------------------------------------
 pom.xml       | 5 +++++
 start/pom.xml | 5 +++++
 test/pom.xml  | 5 +++++
 3 files changed, 15 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c409b0a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c01e6bc..9c9e61d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -443,6 +443,11 @@
         <version>${jetty.version}</version>
       </dependency>
       <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>
         <version>${powermock.version}</version>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c409b0a/start/pom.xml
----------------------------------------------------------------------
diff --git a/start/pom.xml b/start/pom.xml
index 7885386..20612c0 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -76,6 +76,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-easymock</artifactId>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c409b0a/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 90e0dd5..f3cc927 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -167,6 +167,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>


Mime
View raw message