This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new b820368  ACCUMULO-4824 Fix Jersey dependency conflict causing ITs to 
fail (#391)
b820368 is described below

commit b820368428cc03f84ab3cd083385d8fa2be7cd69
Author: Mike Walch <mwa...@apache.org>
AuthorDate: Thu Feb 22 18:02:42 2018 -0500

    ACCUMULO-4824 Fix Jersey dependency conflict causing ITs to fail (#391)
    
    * Jersey 1.x jars were excluded in test module causing ITs to fail
    * Moved WebViewsIT to monitor which requires Jersey 2.x
    * Removed 1.x exclusions from test module
---
 server/monitor/pom.xml                             | 34 +++++++++++
 .../org/apache/accumulo}/monitor/WebViewsIT.java   |  7 +--
 .../apache/accumulo/monitor/util/MonitorTests.java | 22 ++++++++
 test/pom.xml                                       | 66 ----------------------
 4 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 70c69ee..2a6034c 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -120,6 +120,10 @@
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.ext</groupId>
+      <artifactId>jersey-bean-validation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.ext</groupId>
       <artifactId>jersey-mvc-freemarker</artifactId>
     </dependency>
     <dependency>
@@ -136,6 +140,36 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.core</groupId>
+      <artifactId>jersey-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework</groupId>
+      <artifactId>jersey-test-framework-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+      <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-easymock</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
diff --git 
a/test/src/main/java/org/apache/accumulo/test/monitor/WebViewsIT.java 
b/server/monitor/src/test/java/org/apache/accumulo/monitor/WebViewsIT.java
similarity index 97%
rename from test/src/main/java/org/apache/accumulo/test/monitor/WebViewsIT.java
rename to 
server/monitor/src/test/java/org/apache/accumulo/monitor/WebViewsIT.java
index 8e9169d..d92d4f8 100644
--- a/test/src/main/java/org/apache/accumulo/test/monitor/WebViewsIT.java
+++ b/server/monitor/src/test/java/org/apache/accumulo/monitor/WebViewsIT.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.accumulo.test.monitor;
+package org.apache.accumulo.monitor;
 
 import static org.easymock.EasyMock.expect;
 
@@ -35,10 +35,9 @@ import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.impl.Table;
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
-import org.apache.accumulo.monitor.Monitor;
+import org.apache.accumulo.monitor.util.MonitorTests;
 import org.apache.accumulo.monitor.view.WebViews;
 import org.apache.accumulo.server.AccumuloServerContext;
-import org.apache.accumulo.test.categories.SunnyDayTests;
 import org.easymock.EasyMock;
 import org.glassfish.jersey.client.ClientConfig;
 import org.glassfish.jersey.server.ResourceConfig;
@@ -55,7 +54,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 /**
  * Basic tests for parameter validation constraints
  */
-@Category(SunnyDayTests.class)
+@Category(MonitorTests.class)
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({Monitor.class, Tables.class})
 public class WebViewsIT extends JerseyTest {
diff --git 
a/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
 
b/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
new file mode 100644
index 0000000..0bf3f29
--- /dev/null
+++ 
b/server/monitor/src/test/java/org/apache/accumulo/monitor/util/MonitorTests.java
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+package org.apache.accumulo.monitor.util;
+
+/**
+ * Special category for Monitor ITs to avoid adding dependency on test module
+ */
+public interface MonitorTests {}
diff --git a/test/pom.xml b/test/pom.xml
index 00ff2c7..81133b7 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -67,14 +67,6 @@
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>javax.el-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>javax.ws.rs-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
     </dependency>
@@ -141,17 +133,6 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
-      <exclusions>
-        <!-- Pulls in an older jersey version -->
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-client</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -160,29 +141,6 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-minicluster</artifactId>
-      <exclusions>
-        <!-- Pulls in an older jersey version -->
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-client</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-json</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey</groupId>
-          <artifactId>jersey-server</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.sun.jersey.contribs</groupId>
-          <artifactId>jersey-guice</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
@@ -216,34 +174,10 @@
       <artifactId>easymock</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-client</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.ext</groupId>
-      <artifactId>jersey-bean-validation</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.test-framework</groupId>
-      <artifactId>jersey-test-framework-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.test-framework.providers</groupId>
-      <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-easymock</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

-- 
To stop receiving notification emails like this one, please contact
ctubb...@apache.org.

Reply via email to