Merge pull request #374 from debugthings/bugfix/369and362

Bugfix/362

Author: Dmitry-Matveev

core/build.gradle

@@ -36,11 +36,11 @@ archivesBaseName = 'applicationinsights-core'
 
 dependencies {
     provided (project(':agent')) { transitive = false }
-    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.3.5'
-    compile group: 'com.google.guava', name: 'guava', version: '12.0.1'
+    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.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 {

web/build.gradle

@@ -25,8 +25,10 @@ apply from: "$buildScriptsDir/publishing.gradle"
 archivesBaseName = 'applicationinsights-web'
 
 dependencies {
-    provided project(':agent')
-    compile project(':core')
+    provided (project(':agent')) { transitive = false }
+    compile (project(':core')) { transitive = false }
+    compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1'])
+    compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.3.5'])
     provided 'com.opensymphony:xwork:2.0.4' // Struts 2
     provided 'org.springframework:spring-webmvc:3.1.0.RELEASE'
     provided group: 'javax.servlet', name: 'servlet-api', version: '2.5'