You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by md...@apache.org on 2014/03/04 22:00:41 UTC
[1/6] git commit: ACCUMULO-2301 Add Jetty to packaging
Repository: accumulo
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 4bdebdb1e -> 0f2324573
refs/heads/1.5.2-SNAPSHOT 5d9e1557f -> 9b5c53d05
refs/heads/1.6.0-SNAPSHOT 7f6c21310 -> 3ef7f72b9
ACCUMULO-2301 Add Jetty to packaging
Add Jetty to packaging list. Remove duplicate entry in server pom.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f232457
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f232457
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f232457
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 0f2324573afd1118854c305f4e775882df21021a
Parents: 4bdebdb
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 15:48:35 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 15:49:07 2014 -0500
----------------------------------------------------------------------
pom.xml | 3 +--
src/server/pom.xml | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f232457/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c8e5bf..f97d7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<configuration>
<outputDirectory>${project.parent.basedir}/lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
+ <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava,jetty</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
@@ -840,7 +840,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>[6.1,7.0)</version>
- <scope>provided</scope>
</dependency>
<!-- accumulo dependency jars that we will provide -->
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f232457/src/server/pom.xml
----------------------------------------------------------------------
diff --git a/src/server/pom.xml b/src/server/pom.xml
index b58affc..d748b56 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -104,10 +104,6 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
</dependencies>
<profiles>
[4/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b5c53d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b5c53d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b5c53d0
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 9b5c53d054d42f8265369cef48d4e2246055cd24
Parents: 5d9e155 0f23245
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 15:59:39 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 15:59:39 2014 -0500
----------------------------------------------------------------------
server/pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b5c53d0/server/pom.xml
----------------------------------------------------------------------
diff --cc server/pom.xml
index 667b864,0000000..bd61fe6
mode 100644,000000..100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@@ -1,172 -1,0 +1,171 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>accumulo-server</artifactId>
+ <name>Server</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
++ <groupId>org.mortbay.jetty</groupId>
++ <artifactId>jetty</artifactId>
++ </dependency>
++ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/web/flot/**/*.js</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>native</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-native-in-memory-map</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <executable>make</executable>
+ <workingDirectory>${basedir}/src/main/c++</workingDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
[6/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3ef7f72b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3ef7f72b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3ef7f72b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3ef7f72b93092a7fb10d04a604940a1d3f5c9ab0
Parents: 7f6c213 9b5c53d
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 16:00:04 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 16:00:04 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/6] git commit: ACCUMULO-2301 Add Jetty to packaging
Posted by md...@apache.org.
ACCUMULO-2301 Add Jetty to packaging
Add Jetty to packaging list. Remove duplicate entry in server pom.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f232457
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f232457
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f232457
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0f2324573afd1118854c305f4e775882df21021a
Parents: 4bdebdb
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 15:48:35 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 15:49:07 2014 -0500
----------------------------------------------------------------------
pom.xml | 3 +--
src/server/pom.xml | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f232457/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c8e5bf..f97d7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<configuration>
<outputDirectory>${project.parent.basedir}/lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
+ <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava,jetty</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
@@ -840,7 +840,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>[6.1,7.0)</version>
- <scope>provided</scope>
</dependency>
<!-- accumulo dependency jars that we will provide -->
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f232457/src/server/pom.xml
----------------------------------------------------------------------
diff --git a/src/server/pom.xml b/src/server/pom.xml
index b58affc..d748b56 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -104,10 +104,6 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
</dependencies>
<profiles>
[5/6] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Posted by md...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b5c53d0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b5c53d0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b5c53d0
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 9b5c53d054d42f8265369cef48d4e2246055cd24
Parents: 5d9e155 0f23245
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 15:59:39 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 15:59:39 2014 -0500
----------------------------------------------------------------------
server/pom.xml | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b5c53d0/server/pom.xml
----------------------------------------------------------------------
diff --cc server/pom.xml
index 667b864,0000000..bd61fe6
mode 100644,000000..100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@@ -1,172 -1,0 +1,171 @@@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-project</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>accumulo-server</artifactId>
+ <name>Server</name>
+ <dependencies>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-fate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-trace</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </dependency>
+ <dependency>
++ <groupId>org.mortbay.jetty</groupId>
++ <artifactId>jetty</artifactId>
++ </dependency>
++ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/web/flot/**/*.js</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <profiles>
+ <profile>
+ <id>native</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-native-in-memory-map</id>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <executable>make</executable>
+ <workingDirectory>${basedir}/src/main/c++</workingDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
[2/6] git commit: ACCUMULO-2301 Add Jetty to packaging
Posted by md...@apache.org.
ACCUMULO-2301 Add Jetty to packaging
Add Jetty to packaging list. Remove duplicate entry in server pom.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f232457
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f232457
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f232457
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 0f2324573afd1118854c305f4e775882df21021a
Parents: 4bdebdb
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Mar 4 15:48:35 2014 -0500
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Mar 4 15:49:07 2014 -0500
----------------------------------------------------------------------
pom.xml | 3 +--
src/server/pom.xml | 4 ----
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f232457/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c8e5bf..f97d7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<configuration>
<outputDirectory>${project.parent.basedir}/lib</outputDirectory>
<!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava</includeArtifactIds>
+ <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,guava,jetty</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
@@ -840,7 +840,6 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>[6.1,7.0)</version>
- <scope>provided</scope>
</dependency>
<!-- accumulo dependency jars that we will provide -->
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f232457/src/server/pom.xml
----------------------------------------------------------------------
diff --git a/src/server/pom.xml b/src/server/pom.xml
index b58affc..d748b56 100644
--- a/src/server/pom.xml
+++ b/src/server/pom.xml
@@ -104,10 +104,6 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
</dependencies>
<profiles>