accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Tue, 17 Jun 2014 19:03:10 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/monitor/pom.xml


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

Branch: refs/heads/master
Commit: 4161cc5491e13af31f3d3275c98d11c7a1d76323
Parents: f2aeb14 c78c18b
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Tue Jun 17 15:02:39 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Tue Jun 17 15:02:39 2014 -0400

----------------------------------------------------------------------
 assemble/pom.xml                                | 36 +++++++++++
 assemble/src/main/assemblies/component.xml      | 13 +++-
 conf/templates/accumulo-site.xml                |  4 +-
 pom.xml                                         | 38 +++++++++--
 server/monitor/pom.xml                          | 29 ++++++++-
 .../accumulo/monitor/EmbeddedWebServer.java     | 67 ++++++++++----------
 start/pom.xml                                   |  4 +-
 test/pom.xml                                    |  4 +-
 8 files changed, 145 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4161cc54/assemble/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4161cc54/assemble/src/main/assemblies/component.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4161cc54/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4161cc54/server/monitor/pom.xml
----------------------------------------------------------------------
diff --cc server/monitor/pom.xml
index 0ff4f19,f305818..a847183
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@@ -84,16 -80,40 +84,39 @@@
        <artifactId>zookeeper</artifactId>
      </dependency>
      <dependency>
-       <groupId>org.mortbay.jetty</groupId>
-       <artifactId>jetty</artifactId>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-security</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-server</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-servlet</artifactId>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-util</artifactId>
      </dependency>
      <dependency>
 +      <groupId>org.slf4j</groupId>
 +      <artifactId>slf4j-api</artifactId>
 +    </dependency>
 +    <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-http</artifactId>
+       <scope>runtime</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.jetty</groupId>
+       <artifactId>jetty-io</artifactId>
+       <scope>runtime</scope>
+     </dependency>
+     <dependency>
        <groupId>org.slf4j</groupId>
 -      <artifactId>slf4j-api</artifactId>
 -      <scope>runtime</scope>
 -    </dependency>
 -    <dependency>
 -      <groupId>org.slf4j</groupId>
        <artifactId>slf4j-log4j12</artifactId>
+       <scope>runtime</scope>
      </dependency>
      <dependency>
        <groupId>junit</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4161cc54/start/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4161cc54/test/pom.xml
----------------------------------------------------------------------


Mime
View raw message