incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject incubator-blur git commit: Fixing version problems with jetty libs provided by hadoop and desired version. Also changed desired version to Jetty 8 to allow Java 6 to still be viable.
Date Mon, 10 Nov 2014 15:15:51 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master eec9d49e9 -> a3cc47d6a


Fixing version problems with jetty libs provided by hadoop and desired version.  Also changed desired version to Jetty 8 to allow Java 6 to still be viable.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a3cc47d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a3cc47d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a3cc47d6

Branch: refs/heads/master
Commit: a3cc47d6a4ae3658c0917c8f7a11dfb5a0bbd1e9
Parents: eec9d49
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Nov 10 10:15:55 2014 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Nov 10 10:15:55 2014 -0500

----------------------------------------------------------------------
 blur-console/pom.xml                            | 110 ++++++++++++++++
 blur-core/pom.xml                               | 110 ++++++++++++++++
 blur-gui/pom.xml                                |   4 +
 .../org/apache/blur/gui/HttpJettyServer.java    |   3 +-
 blur-mapred-hadoop1/pom.xml                     | 110 ++++++++++++++++
 blur-mapred-hadoop2/pom.xml                     |  66 ++++++++++
 blur-shell/pom.xml                              | 132 +++++++++++++++++++
 blur-store/pom.xml                              | 132 +++++++++++++++++++
 blur-thrift/pom.xml                             |   2 +-
 pom.xml                                         |  70 +++++++++-
 10 files changed, 732 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/blur-console/pom.xml b/blur-console/pom.xml
index b1f078b..52c45ab 100644
--- a/blur-console/pom.xml
+++ b/blur-console/pom.xml
@@ -194,6 +194,28 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-test</artifactId>
           <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+              </exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>servlet-api-2.5</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-2.1</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-api-2.1</artifactId>
+			</exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>
@@ -209,11 +231,55 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-client</artifactId>
           <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+              </exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>servlet-api-2.5</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-2.1</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-api-2.1</artifactId>
+			</exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
           <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+              </exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>servlet-api-2.5</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-2.1</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-api-2.1</artifactId>
+			</exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>
@@ -229,11 +295,55 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-client</artifactId>
           <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+              </exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>servlet-api-2.5</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-2.1</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-api-2.1</artifactId>
+			</exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
           <scope>test</scope>
+          <exclusions>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.mortbay.jetty</groupId>
+                  <artifactId>jetty</artifactId>
+              </exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>servlet-api-2.5</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-2.1</artifactId>
+			</exclusion>
+			<exclusion>
+			    <groupId>org.mortbay.jetty</groupId>
+			    <artifactId>jsp-api-2.1</artifactId>
+			</exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/blur-core/pom.xml b/blur-core/pom.xml
index c04100a..6fe2bf4 100644
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@ -157,6 +157,28 @@ under the License.
 					<artifactId>hadoop-test</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -171,11 +193,55 @@ under the License.
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -190,11 +256,55 @@ under the License.
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-gui/pom.xml
----------------------------------------------------------------------
diff --git a/blur-gui/pom.xml b/blur-gui/pom.xml
index b5d52d3..2b2b535 100644
--- a/blur-gui/pom.xml
+++ b/blur-gui/pom.xml
@@ -63,6 +63,10 @@ under the License.
             <artifactId>jetty-webapp</artifactId>
         </dependency>
 		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-jsp</artifactId>
+		</dependency>
+		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
 			<scope>provided</scope>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
----------------------------------------------------------------------
diff --git a/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java b/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
index 012b1b2..30b690a 100644
--- a/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
+++ b/blur-gui/src/main/java/org/apache/blur/gui/HttpJettyServer.java
@@ -26,7 +26,6 @@ import org.apache.blur.log.LogFactory;
 import com.yammer.metrics.reporting.MetricsServlet;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.webapp.WebAppContext;
 
@@ -90,7 +89,7 @@ public class HttpJettyServer {
     }
     Connector[] connectors = server.getConnectors();
     for (Connector connector : connectors) {
-      _localPort = ((ServerConnector)(connector)).getLocalPort();
+      _localPort = connector.getLocalPort();
     }
     LOG.info("Http server up on port: " + _localPort);
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-mapred-hadoop1/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred-hadoop1/pom.xml b/blur-mapred-hadoop1/pom.xml
index 9cea73a..a7443c1 100644
--- a/blur-mapred-hadoop1/pom.xml
+++ b/blur-mapred-hadoop1/pom.xml
@@ -157,6 +157,28 @@ under the License.
 					<artifactId>hadoop-test</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 				      <groupId>org.apache.mrunit</groupId>
@@ -164,6 +186,28 @@ under the License.
 				      <version>${mrunit.version}</version>
 				      <classifier>hadoop1</classifier>
 					  <scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
                 </dependency>
 			</dependencies>
 		</profile>
@@ -183,12 +227,56 @@ under the License.
 					<artifactId>hadoop-test</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
                 <dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 				      <groupId>org.apache.mrunit</groupId>
@@ -196,6 +284,28 @@ under the License.
 				      <version>${mrunit.version}</version>
 				      <classifier>hadoop2</classifier>
 					  <scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
                 </dependency>
 			</dependencies>
 		</profile>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-mapred-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred-hadoop2/pom.xml b/blur-mapred-hadoop2/pom.xml
index 1efe504..0e2edea 100644
--- a/blur-mapred-hadoop2/pom.xml
+++ b/blur-mapred-hadoop2/pom.xml
@@ -136,15 +136,81 @@ under the License.
 				      <version>${mrunit.version}</version>
 				      <classifier>hadoop2</classifier>
 					  <scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
                 </dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-shell/pom.xml
----------------------------------------------------------------------
diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml
index 54c53c4..b5f7e64 100644
--- a/blur-shell/pom.xml
+++ b/blur-shell/pom.xml
@@ -98,12 +98,56 @@ under the License.
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-core</artifactId>
 					<version>${hadoop.version}</version>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-test</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -118,11 +162,55 @@ under the License.
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -137,11 +225,55 @@ under the License.
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-store/pom.xml
----------------------------------------------------------------------
diff --git a/blur-store/pom.xml b/blur-store/pom.xml
index aef60ed..69804b8 100644
--- a/blur-store/pom.xml
+++ b/blur-store/pom.xml
@@ -144,12 +144,56 @@ under the License.
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-core</artifactId>
 					<version>${hadoop.version}</version>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-test</artifactId>
 					<version>${hadoop.version}</version>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -164,11 +208,55 @@ under the License.
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -183,11 +271,55 @@ under the License.
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-client</artifactId>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 				<dependency>
 					<groupId>org.apache.hadoop</groupId>
 					<artifactId>hadoop-minicluster</artifactId>
 					<scope>test</scope>
+	                <exclusions>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty-util</artifactId>
+	                    </exclusion>
+	                    <exclusion>
+	                        <groupId>org.mortbay.jetty</groupId>
+	                        <artifactId>jetty</artifactId>
+	                    </exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>servlet-api-2.5</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-2.1</artifactId>
+						</exclusion>
+						<exclusion>
+						    <groupId>org.mortbay.jetty</groupId>
+						    <artifactId>jsp-api-2.1</artifactId>
+						</exclusion>
+	                </exclusions>
 				</dependency>
 			</dependencies>
 		</profile>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/blur-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/blur-thrift/pom.xml b/blur-thrift/pom.xml
index b9b77d4..7cd6e9e 100644
--- a/blur-thrift/pom.xml
+++ b/blur-thrift/pom.xml
@@ -57,7 +57,7 @@ under the License.
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <version>${servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a3cc47d6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5b1188..907d728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,7 @@ under the License.
 		<json.version>20090211</json.version>
 		<mrunit.version>0.9.0-incubating</mrunit.version>
 		<httpclient.version>4.1.3</httpclient.version>
-		<servlet-api.version>2.5</servlet-api.version>
+		<servlet-api.version>3.0.1</servlet-api.version>
 	</properties>
 
     <dependencyManagement>
@@ -209,12 +209,39 @@ under the License.
             <dependency>
               <groupId>org.eclipse.jetty</groupId>
               <artifactId>jetty-webapp</artifactId>
-              <version>9.2.3.v20140905</version>
+              <version>8.1.16.v20140903</version>
             </dependency>
+			<dependency>
+				<groupId>org.eclipse.jetty</groupId>
+				<artifactId>jetty-jsp</artifactId>
+				<version>8.1.16.v20140903</version>
+			</dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-test</artifactId>
                 <version>${hadoop.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-util</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty</artifactId>
+                    </exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>servlet-api-2.5</artifactId>
+					</exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>jsp-2.1</artifactId>
+					</exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>jsp-api-2.1</artifactId>
+					</exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
@@ -229,12 +256,46 @@ under the License.
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>jetty</artifactId>
                     </exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>servlet-api-2.5</artifactId>
+					</exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>jsp-2.1</artifactId>
+					</exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>jsp-api-2.1</artifactId>
+					</exclusion>
                 </exclusions>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-minicluster</artifactId>
                 <version>${hadoop.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-util</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty</artifactId>
+                    </exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>servlet-api-2.5</artifactId>
+					</exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>jsp-2.1</artifactId>
+					</exclusion>
+					<exclusion>
+					    <groupId>org.mortbay.jetty</groupId>
+					    <artifactId>jsp-api-2.1</artifactId>
+					</exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>log4j</groupId>
@@ -483,6 +544,7 @@ under the License.
                 <projectVersion>${project.parent.version}-hadoop1</projectVersion>
 			</properties>
 			<modules>
+				<module>blur-command</module>
 				<module>blur-console</module>
 				<module>blur-core</module>
 				<module>blur-thrift</module>
@@ -492,7 +554,6 @@ under the License.
 				<module>blur-util</module>
 				<module>blur-gui</module>
 				<module>blur-shell</module>
-				<module>blur-command</module>
 				<module>distribution</module>
 			</modules>
 		</profile>
@@ -508,6 +569,7 @@ under the License.
                 <projectVersion>${project.parent.version}-hadoop2-mr1</projectVersion>
 			</properties>
 			<modules>
+				<module>blur-command</module>
 				<module>blur-console</module>
 				<module>blur-core</module>
 				<module>blur-thrift</module>
@@ -517,7 +579,6 @@ under the License.
 				<module>blur-util</module>
 				<module>blur-gui</module>
 				<module>blur-shell</module>
-				<module>blur-command</module>
 				<module>distribution</module>
 			</modules>
 		</profile>
@@ -533,6 +594,7 @@ under the License.
                 <projectVersion>${project.parent.version}-hadoop2</projectVersion>
 			</properties>
 			<modules>
+				<module>blur-command</module>
 				<module>blur-console</module>
 				<module>blur-core</module>
 				<module>blur-thrift</module>


Mime
View raw message