Skip to content

Bugfix/362 #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 5, 2017
Merged

Bugfix/362 #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a6b168
Bugfix for #362 and #369
debugthings May 24, 2017
8f2f06a
Removing extra transative=false properties to target guava.
debugthings May 24, 2017
eae3f05
Removing extra transative=false properties to target guava; core-lib …
debugthings May 24, 2017
53a3d45
Fixing included assemblies per PR comment, removing bugfix for #369
debugthings Jun 3, 2017
74e5044
Also setting web/build.gradle to the same version
debugthings Jun 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Copy link
Member

@Dmitry-Matveev Dmitry-Matveev Jun 1, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it mean that our customer who used core and web with transitive dependencies and relied on them will need to copy them manually from now on? If so, you'd need to update a documentation in Azure Docs repo as well and PR them :)

Copy link
Contributor Author

@debugthings debugthings Jun 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I will opt to keep this transitive and relocate the javax packages out of the root of the JAR. This should satisfy that requirement. Look for an updated commit soon

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'
Expand All @@ -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 {
Expand Down
6 changes: 4 additions & 2 deletions web/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down