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: Updating the pom files once again. Hopefully this will be the last fix to get all tests passing and version in place.
Date Mon, 10 Nov 2014 21:39:56 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/master a3cc47d6a -> 059d003d8


Updating the pom files once again.  Hopefully this will be the last fix to get all tests passing
and version in place.


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

Branch: refs/heads/master
Commit: 059d003d8a346c5437221c7b1053165b764f97df
Parents: a3cc47d
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Mon Nov 10 16:39:38 2014 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Mon Nov 10 16:39:38 2014 -0500

----------------------------------------------------------------------
 blur-console/pom.xml        | 110 --------------------------------
 blur-core/pom.xml           | 110 --------------------------------
 blur-mapred-hadoop1/pom.xml | 110 --------------------------------
 blur-mapred-hadoop2/pom.xml |  66 --------------------
 blur-shell/pom.xml          | 132 ---------------------------------------
 blur-store/pom.xml          | 132 ---------------------------------------
 pom.xml                     |  76 ++--------------------
 7 files changed, 5 insertions(+), 731 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/059d003d/blur-console/pom.xml
----------------------------------------------------------------------
diff --git a/blur-console/pom.xml b/blur-console/pom.xml
index 52c45ab..b1f078b 100644
--- a/blur-console/pom.xml
+++ b/blur-console/pom.xml
@@ -194,28 +194,6 @@
           <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>
@@ -231,55 +209,11 @@
           <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>
@@ -295,55 +229,11 @@
           <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/059d003d/blur-core/pom.xml
----------------------------------------------------------------------
diff --git a/blur-core/pom.xml b/blur-core/pom.xml
index 6fe2bf4..c04100a 100644
--- a/blur-core/pom.xml
+++ b/blur-core/pom.xml
@@ -157,28 +157,6 @@ 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>
@@ -193,55 +171,11 @@ 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>
@@ -256,55 +190,11 @@ 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/059d003d/blur-mapred-hadoop1/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred-hadoop1/pom.xml b/blur-mapred-hadoop1/pom.xml
index a7443c1..9cea73a 100644
--- a/blur-mapred-hadoop1/pom.xml
+++ b/blur-mapred-hadoop1/pom.xml
@@ -157,28 +157,6 @@ 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>
@@ -186,28 +164,6 @@ 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>
@@ -227,56 +183,12 @@ 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>
@@ -284,28 +196,6 @@ 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/059d003d/blur-mapred-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/blur-mapred-hadoop2/pom.xml b/blur-mapred-hadoop2/pom.xml
index 0e2edea..1efe504 100644
--- a/blur-mapred-hadoop2/pom.xml
+++ b/blur-mapred-hadoop2/pom.xml
@@ -136,81 +136,15 @@ 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/059d003d/blur-shell/pom.xml
----------------------------------------------------------------------
diff --git a/blur-shell/pom.xml b/blur-shell/pom.xml
index b5f7e64..54c53c4 100644
--- a/blur-shell/pom.xml
+++ b/blur-shell/pom.xml
@@ -98,56 +98,12 @@ 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>
@@ -162,55 +118,11 @@ 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>
@@ -225,55 +137,11 @@ 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/059d003d/blur-store/pom.xml
----------------------------------------------------------------------
diff --git a/blur-store/pom.xml b/blur-store/pom.xml
index 69804b8..aef60ed 100644
--- a/blur-store/pom.xml
+++ b/blur-store/pom.xml
@@ -144,56 +144,12 @@ 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>
@@ -208,55 +164,11 @@ 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>
@@ -271,55 +183,11 @@ 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/059d003d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 907d728..8135a0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,91 +211,25 @@ under the License.
               <artifactId>jetty-webapp</artifactId>
               <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.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>
                 <artifactId>hadoop-client</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-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>


Mime
View raw message