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 2014/03/07 21:53:32 UTC
[18/50] [abbrv] git commit: ACCUMULO-2301 Add Jetty to packaging
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/ACCUMULO-2061
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>