Fixing included assemblies per PR comment, removing bugfix for #369

Author: debugthings

core/build.gradle

@@ -39,8 +39,8 @@ dependencies {
     compile ([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.4'])
     compile ([group: 'commons-io', name: 'commons-io', version: '2.4' ])
     compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1']) 
-    compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'])
-    compile ([group: 'com.google.guava', name: 'guava', version: '12.0.1']) { transitive = false }
+    compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'])
+    compile ([group: 'com.google.guava', name: 'guava', version: '12.0.1'])
     testCompile group: 'junit', name: 'junit', version: '4.11'
     testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.0'
     testCompile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
@@ -52,6 +52,7 @@ shadowJar {
     relocate 'eu.infomas.annotation', 'com.microsoft.applicationinsights.core.dependencies.annotation'
     relocate 'org.apache.commons', 'com.microsoft.applicationinsights.core.dependencies.apachecommons'
     relocate 'com.google.common', 'com.microsoft.applicationinsights.core.dependencies.googlecommon'
+    relocate 'javax.annotation', 'com.microsoft.applicationinsights.core.dependencies.javaxannotation'
 }
 
 jar {