Merge pull request #13 from EMCECS/feature-update-gradle-and-deps

 update gradle to 6.9.2 and all deps to latest

build.gradle

@@ -2,14 +2,14 @@ plugins {
     id 'idea'
     id 'eclipse'
     id 'java'
-    id 'net.saliman.cobertura' version '3.0.0'
+    id 'net.saliman.cobertura' version '4.0.0'
     id 'distribution'
-    id 'com.github.johnrengelman.shadow' version '5.2.0'
-    id 'com.github.jk1.dependency-license-report' version '1.14'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
+    id 'com.github.jk1.dependency-license-report' version '1.17'
     id 'signing'
     id 'maven'
-    id 'org.ajoberstar.git-publish' version '3.0.0'
-    id 'nebula.release' version '15.2.0'
+    id 'org.ajoberstar.git-publish' version '3.0.1'
+    id 'nebula.release' version '15.3.1'
 }
 
 group 'com.emc.ecs'
@@ -37,12 +37,11 @@ repositories {
 }
 
 dependencies {
-    implementation('com.emc.ecs:object-client:3.1.3') {
-        exclude group: 'org.slf4j', module: 'slf4j-log4j12'
-    }
-    implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.14.0'
-    implementation 'commons-cli:commons-cli:1.4'
-    testImplementation 'junit:junit:4.12'
+    implementation 'com.emc.ecs:object-client:3.4.2'
+    implementation 'com.emc.ecs:smart-client-ecs:3.0.0'
+    implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
+    implementation 'commons-cli:commons-cli:1.5.0'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 configurations {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed 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
+#
+#      https://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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m"'
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m"
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/java/com/emc/ecs/tool/BucketWipeResult.java

@@ -16,8 +16,6 @@
 
 package com.emc.ecs.tool;
 
-import org.apache.http.annotation.GuardedBy;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -36,14 +34,15 @@ public class BucketWipeResult {
     private final AtomicBoolean allActionsSubmitted = new AtomicBoolean();
     private final CompletableFuture<Boolean> completedFuture = new CompletableFuture<>();
     private final List<String> errors = Collections.synchronizedList(new ArrayList<>());
-
-    @GuardedBy("this")
     private String lastKey;
 
     public CompletableFuture<Boolean> getCompletedFuture() {
         return completedFuture;
     }
 
+    /**
+     * GuardedBy "this"
+     */
     public String getLastKey() {
         synchronized (this) {
             return lastKey;
@@ -81,6 +80,9 @@ public void allActionsSubmitted() {
     }
 
 
+    /**
+     * GuardedBy "this"
+     */
     protected void setLastKey(String lastKey) {
         synchronized (this) {
             this.lastKey = lastKey;