From 7a6b168a27f5ba11fc55d1a9526065b143bcaa89 Mon Sep 17 00:00:00 2001 From: James Davis Date: Tue, 23 May 2017 21:54:23 -0400 Subject: [PATCH 1/5] Bugfix for #362 and #369 --- core/build.gradle | 10 +++++----- web/build.gradle | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 9f41c015071..3186e0afd41 100644 --- a/core/build.gradle +++ b/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']) { transitive = false } + compile ([group: 'commons-io', name: 'commons-io', version: '2.4' ]) { transitive = false } + compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1']) { transitive = false } + compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3']) + compile ([group: 'com.google.guava', name: 'guava', version: '12.0.1']) { transitive = false } 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' diff --git a/web/build.gradle b/web/build.gradle index 87c41873486..ea156230df5 100644 --- a/web/build.gradle +++ b/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']) { transitive = false } + compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3']) 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' From 8f2f06afc88c337b6196bcf3b7ff425988250e27 Mon Sep 17 00:00:00 2001 From: James Davis Date: Tue, 23 May 2017 22:59:08 -0400 Subject: [PATCH 2/5] Removing extra transative=false properties to target guava. --- web/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/build.gradle b/web/build.gradle index ea156230df5..ba9b6d0fa72 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -27,7 +27,7 @@ archivesBaseName = 'applicationinsights-web' dependencies { provided (project(':agent')) { transitive = false } compile (project(':core')) { transitive = false } - compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1']) { transitive = false } + compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1']) compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3']) provided 'com.opensymphony:xwork:2.0.4' // Struts 2 provided 'org.springframework:spring-webmvc:3.1.0.RELEASE' From eae3f05a2ad2685b764860f2b058539142b3b913 Mon Sep 17 00:00:00 2001 From: James Davis Date: Tue, 23 May 2017 23:01:05 -0400 Subject: [PATCH 3/5] Removing extra transative=false properties to target guava; core-lib this time. --- core/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 3186e0afd41..50dab5b3d82 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -36,9 +36,9 @@ archivesBaseName = 'applicationinsights-core' dependencies { provided (project(':agent')) { transitive = false } - compile ([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.4']) { transitive = false } - compile ([group: 'commons-io', name: 'commons-io', version: '2.4' ]) { transitive = false } - compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1']) { 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.5.3']) compile ([group: 'com.google.guava', name: 'guava', version: '12.0.1']) { transitive = false } testCompile group: 'junit', name: 'junit', version: '4.11' From 53a3d45825140bf181064b46f7aa2c4a14606828 Mon Sep 17 00:00:00 2001 From: James Davis Date: Sat, 3 Jun 2017 10:25:28 -0400 Subject: [PATCH 4/5] Fixing included assemblies per PR comment, removing bugfix for #369 --- core/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 50dab5b3d82..a4375fbcbbd 100644 --- a/core/build.gradle +++ b/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 { From 74e50448b4891fa3422e5367457164481ecb2b72 Mon Sep 17 00:00:00 2001 From: James Davis Date: Sat, 3 Jun 2017 15:52:53 -0400 Subject: [PATCH 5/5] Also setting web/build.gradle to the same version --- web/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/build.gradle b/web/build.gradle index ba9b6d0fa72..2b67332931f 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -28,7 +28,7 @@ dependencies { 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.5.3']) + 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'