Merge pull request #12 from Nike-Inc/remove-deps-from-shadow-jar

Remove deps from shadow jar

gradle.properties

@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-version=1.4.1
+version=1.5.0
 groupId=com.nike
-artifactId=cerberus-client
+artifactId=cerberus-client

gradle/dependencies.gradle

@@ -19,6 +19,7 @@ repositories {
 }
 
 def AWS_SDK_VERSION = '1.11.75'
+def VAULT_CLIENT_COORDINATES = "com.nike:vault-client:1.2.1"
 //noinspection GroovyAssignabilityCheck
 dependencies {
 
@@ -31,10 +32,13 @@ dependencies {
  * We do this because AWS constantly breaks backwards compatibility of their SDK with minor version releases.          *
  * We do not want to dictate what SDK version users of Cerberus should use.                                            *
  ***********************************************************************************************************************/
-    compile "com.nike:vault-client:1.2.1"
-    compile "joda-time:joda-time:2.8.1"
-    compile "org.apache.commons:commons-lang3:3.4"
-    compile "org.slf4j:slf4j-api:1.7.14"
+
+    // these will be added to the POM and excluded from the shadow jar
+    shadow VAULT_CLIENT_COORDINATES
+    compile VAULT_CLIENT_COORDINATES
+    shadow "joda-time:joda-time:2.8.1"
+    shadow "org.apache.commons:commons-lang3:3.4"
+    shadow "org.slf4j:slf4j-api:1.7.14"
 
     compile "com.amazonaws:aws-java-sdk-core:${AWS_SDK_VERSION}"
     compile "com.amazonaws:aws-java-sdk-kms:${AWS_SDK_VERSION}"
@@ -56,16 +60,22 @@ dependencies {
 
 shadowJar {
     classifier = ''
+    dependencies {
+      // exclude these from the shadow jar
+      project.configurations.shadow.each {
+        exclude it.name
+      }
+    }
     relocate('com.', 'cerberus.com.') {
         exclude 'com.nike.**'
+        exclude 'com.google.**'
     }
     relocate('org.', 'cerberus.org.') {
         exclude 'org.slf4j.**'
+        exclude 'org.joda.**'
+        exclude 'org.apache.commons.lang3.**'
     }
-    relocate 'javax.annotation', 'cerberus.javax.annotation'
     relocate 'models.', 'cerberus.models.'
     relocate 'mozilla.', 'cerberus.mozilla.'
-    relocate 'okhttp3.', 'cerberus.okhttp3.'
-    relocate 'okio.', 'cerberus.okio.'
     relocate 'software.', 'cerberus.software.'
-}
+}