Merge pull request #223 from rpmoore/fat_jar_logging

Fat jar logging

Author: RachelTucker

build.gradle

@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '3.2.0-RC8'
+    version = '3.2.0-RC9'
 }
 
 subprojects {
@@ -30,19 +30,18 @@ subprojects {
     }
 
     dependencies {
-        compile     'org.slf4j:slf4j-api:1.7.16'
-        compile     'org.slf4j:jcl-over-slf4j:1.7.16'
+        compile     'org.slf4j:slf4j-api:1.7.20'
         testCompile ('org.mockito:mockito-core:1.10.19') {
             exclude group: 'org.hamcrest'
         }
 
         testCompile 'junit:junit:4.12'
-        testCompile 'org.slf4j:slf4j-simple:1.7.16'
+        testCompile 'org.slf4j:slf4j-simple:1.7.20'
     }
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.11'
+    gradleVersion = '2.12'
 }
 
 project(':ds3-sdk-integration') {

ds3-sdk/build.gradle

@@ -30,11 +30,12 @@ shadowJar {
     relocate 'org.apache', 'ds3fatjar.org.apache'
     relocate 'org.codehaus', 'ds3fatjar.org.codehaus'
     relocate 'com.fasterxml', 'ds3fatjar.com.fasterxml'
-    relocate 'org.slf4j', 'ds3fatjar.org.slf4j'
     dependencies {
         exclude(dependency('org.hamcrest:hamcrest-library:1.3'))
         exclude(dependency('org.mockito:mockito-core:1.10.19'))
         exclude(dependency('junit:junit:4.12'))
+        exclude(dependency('org.slf4j:slf4j-api:1.7.16'))
+        exclude(dependency('org.slf4j:slf4j-simple:1.7.20'))
     }
 }
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Feb 10 11:19:18 MST 2016
+#Fri Apr 01 09:11:00 MDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args