From d898b436f70bb895fa90ee892b494849a9092b69 Mon Sep 17 00:00:00 2001 From: Dhaval Doshi Date: Mon, 17 Dec 2018 11:17:48 -0800 Subject: [PATCH] Relocate Guava (#787) * fix build script * update changelog --- CHANGELOG.md | 2 ++ web/build.gradle | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b1a13d8978..b40e7d40b96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # CHANGELOG # Version 2.3.0 +- Introducing Application Insights SpringBoot Starter 1.1.1 (GA VERSION). +- Fix [#784](https://github.com/Microsoft/ApplicationInsights-Java/issues/784) Shade guava dependency. - [#716](https://github.com/Microsoft/ApplicationInsights-Java/issues/716) Introduced W3C Distributed tracing protocol. # Version 2.2.1 diff --git a/web/build.gradle b/web/build.gradle index f3345139963..85bc97a2ec6 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -54,6 +54,7 @@ shadowJar { classifier='' relocate 'org.apache.http', 'com.microsoft.applicationinsights.web.dependencies.http' relocate 'org.apache.commons', 'com.microsoft.applicationinsights.web.dependencies.apachecommons' + relocate 'com.google', "com.microsoft.applicationinsights.web.dependencies.google" } jar {