Skip to content

Commit ea91b79

Browse files
authored
Merge pull request #473 from Microsoft/UpgradeDependencies
Merging Upgrade dependencies
2 parents ceebbd9 + 41d15be commit ea91b79

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

agent/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
plugins {
23-
id 'com.github.johnrengelman.shadow' version '1.2.3'
23+
id 'com.github.johnrengelman.shadow' version '2.0.1'
2424
}
2525

2626
apply from: "$buildScriptsDir/common-java.gradle"
@@ -47,8 +47,8 @@ jar {
4747
dependencies {
4848
compile group: 'org.ow2.asm', name: 'asm-commons', version: '5.2'
4949
compile group: 'org.ow2.asm', name: 'asm-all', version: '5.2'
50-
testCompile group: 'commons-io', name: 'commons-io', version: '2.4'
51-
testCompile group: 'junit', name: 'junit', version: '4.11'
52-
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.0'
50+
testCompile group: 'commons-io', name: 'commons-io', version: '2.6'
51+
testCompile group: 'junit', name: 'junit', version: '4.12'
52+
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
5353
}
5454

collectd/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
plugins {
23-
id 'com.github.johnrengelman.shadow' version '1.2.3'
23+
id 'com.github.johnrengelman.shadow' version '2.0.1'
2424
}
2525

2626
apply from: "$buildScriptsDir/common-java.gradle"
@@ -61,8 +61,8 @@ sourceSets {
6161
dependencies {
6262
compile project(':core')
6363
provided files(collectDLibPath)
64-
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.0'
65-
testCompile group: 'junit', name: 'junit', version: '4.11'
64+
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
65+
testCompile group: 'junit', name: 'junit', version: '4.12'
6666
}
6767

6868
// Building the shadow (fat) jar after compiling sources.

core/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* DEALINGS IN THE SOFTWARE.
2020
*/
2121
plugins {
22-
id 'com.github.johnrengelman.shadow' version '1.2.3'
22+
id 'com.github.johnrengelman.shadow' version '2.0.1'
2323
}
2424

2525
apply from: "$buildScriptsDir/common-java.gradle"
@@ -36,14 +36,14 @@ archivesBaseName = 'applicationinsights-core'
3636

3737
dependencies {
3838
provided (project(':agent')) { transitive = false }
39-
compile ([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.4'])
40-
compile ([group: 'commons-io', name: 'commons-io', version: '2.4' ])
41-
compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1'])
39+
compile ([group: 'eu.infomas', name: 'annotation-detector', version: '3.0.5'])
40+
compile ([group: 'commons-io', name: 'commons-io', version: '2.6' ])
41+
compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
4242
compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'])
43-
compile ([group: 'com.google.guava', name: 'guava', version: '12.0.1'])
44-
testCompile group: 'junit', name: 'junit', version: '4.11'
45-
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.0'
46-
testCompile group: 'com.google.code.gson', name: 'gson', version: '1.7.2'
43+
compile ([group: 'com.google.guava', name: 'guava', version: '20.0'])
44+
testCompile group: 'junit', name: 'junit', version: '4.12'
45+
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
46+
testCompile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
4747
}
4848

4949
shadowJar {

core/native.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ buildscript {
2626
mavenCentral()
2727
}
2828
dependencies {
29-
classpath group: 'commons-io', name: 'commons-io', version: '2.4'
29+
classpath group: 'commons-io', name: 'commons-io', version: '2.6'
3030
}
3131
}
3232

distributions/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
plugins {
23-
id 'com.github.johnrengelman.shadow' version '1.2.3'
23+
id 'com.github.johnrengelman.shadow' version '2.0.1'
2424
}
2525

2626
apply from: "$buildScriptsDir/common-java.gradle"

logging/logging.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ whenPomConfigured = { p ->
6868

6969
dependencies {
7070
compile project(':core')
71-
testCompile group: 'junit', name: 'junit', version: '4.11'
72-
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.0'
71+
testCompile group: 'junit', name: 'junit', version: '4.12'
72+
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.10.19'
7373
}
7474

web/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
plugins {
23-
id 'com.github.johnrengelman.shadow' version '1.2.3'
23+
id 'com.github.johnrengelman.shadow' version '2.0.1'
2424
}
2525

2626
apply from: "$buildScriptsDir/common-java.gradle"
@@ -31,13 +31,13 @@ archivesBaseName = 'applicationinsights-web'
3131
dependencies {
3232
provided (project(':agent')) { transitive = false }
3333
compile (project(':core')) { transitive = false }
34-
compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.1'])
34+
compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
3535
compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'])
3636
provided 'com.opensymphony:xwork:2.0.4' // Struts 2
3737
provided 'org.springframework:spring-webmvc:3.1.0.RELEASE'
3838
provided group: 'javax.servlet', name: 'servlet-api', version: '2.5'
3939
provided group: 'javax.enterprise', name: 'cdi-api', version: '1.1' // Java EE
40-
testCompile group: 'junit', name: 'junit', version: '4.11'
40+
testCompile group: 'junit', name: 'junit', version: '4.12'
4141
testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.0'
4242
testCompile group: 'org.eclipse.jetty', name: 'jetty-server', version: '7.0.0.M0'
4343
testCompile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '7.0.0.M0'

0 commit comments

Comments
 (0)