This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new c6fe62c Remove httpclient dependency. (#655)
c6fe62c is described below
commit c6fe62c9fe93b00b89dfc07dd759405ac80db86b
Author: Sean Busbey <[email protected]>
AuthorDate: Fri Sep 21 09:06:31 2018 -0500
Remove httpclient dependency. (#655)
* was present for Hadoop 1, which we don't support anymore
* was present for ThreadSafe note on our maven-plugin mojo, but that
annotation is gone in current releases
Tested via running ITs locally and against a standalone hadoop 2 cluster
---
core/pom.xml | 5 -----
examples/simple/pom.xml | 5 -----
maven-plugin/pom.xml | 4 ----
maven-plugin/src/it/plugin-test/pom.xml | 4 ----
.../org/apache/accumulo/maven/plugin/StartMojo.java | 2 --
.../org/apache/accumulo/maven/plugin/StopMojo.java | 2 --
pom.xml | 21 ---------------------
test/pom.xml | 4 ----
8 files changed, 47 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index cff7dd4..4012937 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -108,11 +108,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml
index a39639c..b855c0e 100644
--- a/examples/simple/pom.xml
+++ b/examples/simple/pom.xml
@@ -77,11 +77,6 @@
<artifactId>htrace-core</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 1db8f76..f318381 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -39,10 +39,6 @@
<artifactId>accumulo-minicluster</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
</dependency>
diff --git a/maven-plugin/src/it/plugin-test/pom.xml
b/maven-plugin/src/it/plugin-test/pom.xml
index 9f16afa..175433c 100644
--- a/maven-plugin/src/it/plugin-test/pom.xml
+++ b/maven-plugin/src/it/plugin-test/pom.xml
@@ -52,10 +52,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
diff --git
a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
index 6c504ef..6ec32e5 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StartMojo.java
@@ -26,7 +26,6 @@ import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl;
import org.apache.commons.io.FileUtils;
-import org.apache.http.annotation.ThreadSafe;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -36,7 +35,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Goal which starts an instance of {@link MiniAccumuloCluster}.
*/
-@ThreadSafe
@Mojo(name = "start", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST,
requiresDependencyResolution = ResolutionScope.TEST)
public class StartMojo extends AbstractAccumuloMojo {
diff --git
a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java
b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java
index af82633..fb96088 100644
--- a/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java
+++ b/maven-plugin/src/main/java/org/apache/accumulo/maven/plugin/StopMojo.java
@@ -19,7 +19,6 @@ package org.apache.accumulo.maven.plugin;
import org.apache.accumulo.minicluster.MiniAccumuloCluster;
import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl;
import org.apache.accumulo.minicluster.impl.MiniAccumuloClusterImpl.LogWriter;
-import org.apache.http.annotation.ThreadSafe;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
@@ -28,7 +27,6 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
/**
* Goal which stops all instances of {@link MiniAccumuloCluster} started with
the start mojo.
*/
-@ThreadSafe
@Mojo(name = "stop", defaultPhase = LifecyclePhase.POST_INTEGRATION_TEST,
requiresDependencyResolution = ResolutionScope.TEST)
public class StopMojo extends AbstractAccumuloMojo {
diff --git a/pom.xml b/pom.xml
index e28fe08..e73b16c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,6 @@
<hadoop.version>2.6.4</hadoop.version>
<htrace.hadoop.version>4.1.0-incubating</htrace.hadoop.version>
<htrace.version>3.1.0-incubating</htrace.version>
- <httpclient.version>3.1</httpclient.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
<!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
<jetty.version>9.2.17.v20160517</jetty.version>
@@ -202,11 +201,6 @@
<version>1.6</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
@@ -436,11 +430,6 @@
<version>${htrace.hadoop.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${maven.plugin-version}</version>
@@ -469,16 +458,6 @@
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
diff --git a/test/pom.xml b/test/pom.xml
index b632a6b..5eb979e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -55,10 +55,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
