Skip to content

Commit 74b8b47

Browse files
committed
Upgrade logging jars
* slf4j from 1.7.12 to 1.7.21 * commons logging from 1.1.1 to 1.2
1 parent 0611344 commit 74b8b47

File tree

10 files changed

+22
-22
lines changed

10 files changed

+22
-22
lines changed

agent-bootstrapper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ task verifyJar(type: VerifyJarTask) {
7878
"commons-codec-1.4.jar",
7979
"commons-io-2.5.jar",
8080
"commons-lang-2.6.jar",
81-
"commons-logging-1.1.1.jar",
81+
"commons-logging-1.2.jar",
8282
"fluent-hc-4.5.2.jar",
8383
"httpclient-4.5.2.jar",
8484
"httpcore-4.4.4.jar",

agent-launcher/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ task verifyJar(type: VerifyJarTask) {
5353
"commons-codec-1.4.jar",
5454
"commons-io-2.5.jar",
5555
"commons-lang-2.6.jar",
56-
"commons-logging-1.1.1.jar",
56+
"commons-logging-1.2.jar",
5757
"fluent-hc-4.5.2.jar",
5858
"httpclient-4.5.2.jar",
5959
"httpcore-4.4.4.jar",

agent/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ task verifyJar(type: VerifyJarTask) {
141141
"objenesis-1.2.jar",
142142
"org.apache.felix.framework-4.2.1.jar",
143143
"quartz-1.6.5.jar",
144-
"slf4j-api-1.7.12.jar",
145-
"slf4j-log4j12-1.7.12.jar",
144+
"slf4j-api-1.7.21.jar",
145+
"slf4j-log4j12-1.7.21.jar",
146146
"spring-aop-3.1.3.RELEASE.jar",
147147
"spring-asm-3.1.3.RELEASE.jar",
148148
"spring-beans-3.1.3.RELEASE.jar",

base/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
exclude(module: 'commons-logging')
2626
}
2727
compile group: 'joda-time', name: 'joda-time', version: '2.3'
28-
compile group: 'commons-logging', name: 'commons-logging', version: '1.1.1'
28+
compile group: 'commons-logging', name: 'commons-logging', version: '1.2'
2929
compile group: 'log4j', name: 'log4j', version: '1.2.17'
3030
testCompile group: 'junit', name: 'junit', version: '4.12'
3131
testCompile group: 'com.googlecode', name: 'junit-ext', version: '1.0'

config/config-server/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ dependencies {
2222
compile(group: 'org.eclipse.jgit', name: 'org.eclipse.jgit', version: '4.1.0.201509280440-r') {
2323
exclude(group: 'org.apache.httpcomponents')
2424
}
25-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12'
26-
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.12'
25+
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
26+
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21'
2727
compile group: 'xerces', name: 'xercesImpl', version: '2.9.1'
2828
compile group: 'cglib', name: 'cglib', version: '2.1_3'
2929
testCompile project(path: ':config-api', configuration: 'testOutput')

development-utility/development-server/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ dependencies {
3030
compile group: 'org.jruby', name: 'jruby-complete', version: '1.7.11'
3131
compile group: 'org.jruby.rack', name: 'jruby-rack', version: '1.1.14'
3232
compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.47'
33-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12'
34-
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.12'
33+
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
34+
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21'
3535
}

jetty9/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ dependencies {
3333
}
3434
compile group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4'
3535
compile group: 'commons-pool', name: 'commons-pool', version: '1.5.6'
36-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12'
37-
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.12'
36+
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
37+
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21'
3838

3939
testCompile project(':common')
4040
testCompile project(':config-server')

plugin-infra/go-plugin-infra/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ dependencies {
2525
compile(group: 'commons-digester', name: 'commons-digester', version: '1.8') {
2626
exclude(module: 'commons-logging')
2727
}
28-
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.12'
28+
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21'
2929
compile group: 'com.google.code.gson', name: 'gson', version: '2.3.1'
3030
testCompile project(':test-utils')
3131
testCompile group: 'org.ops4j.pax.exam', name: 'pax-exam-container-native', version: '3.0.0.M4'

server-launcher/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ dependencies {
4141
packagingInLibDir group: 'commons-io', name: 'commons-io', version: '2.5'
4242
packagingInLibDir group: 'joda-time', name: 'joda-time', version: '2.3'
4343
packagingInLibDir group: 'log4j', name: 'log4j', version: '1.2.17'
44-
packagingInLibDir group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12'
45-
packagingInLibDir group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.12'
44+
packagingInLibDir group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
45+
packagingInLibDir group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21'
4646
packagingInLibDir group: 'com.jezhumble', name: 'javasysmon', version: '0.3.6'
4747

4848
extractedAtTopLevel group: 'one-jar', name: 'boot', version: '0.96'
@@ -291,8 +291,8 @@ task verifyFatJar(type: VerifyJarTask) {
291291
"jetty-xml-9.2.17.v20160517.jar",
292292
"joda-time-2.3.jar",
293293
"log4j-1.2.17.jar",
294-
"slf4j-api-1.7.12.jar",
295-
"slf4j-log4j12-1.7.12.jar",
294+
"slf4j-api-1.7.21.jar",
295+
"slf4j-log4j12-1.7.21.jar",
296296
"tfs-impl.jar",
297297
"websocket-api-9.2.17.v20160517.jar",
298298
"websocket-client-9.2.17.v20160517.jar",

server/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ dependencies {
182182
exclude(module: 'xercesImpl')
183183
exclude(module: 'jdom')
184184
}
185-
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12'
186-
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.12'
187-
compile group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.12'
185+
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
186+
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.21'
187+
compile group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.21'
188188
compile group: 'org.eclipse.jgit', name: 'org.eclipse.jgit.http.server', version: '4.1.0.201509280440-r'
189189
testCompile group: 'com.unboundid', name: 'unboundid-ldapsdk', version: '2.3.6'
190190
testCompile project(path: ':common', configuration: 'testOutput')
@@ -540,7 +540,7 @@ task verifyWar(type: VerifyJarTask) {
540540
"jta-1.1.jar",
541541
"juel-api-2.1.2.jar",
542542
"juel-impl-2.1.2.jar",
543-
"jul-to-slf4j-1.7.12.jar",
543+
"jul-to-slf4j-1.7.21.jar",
544544
"kahadb-5.5.0.jar",
545545
"kxml2-2.3.0.jar",
546546
"kxml2-min-2.3.0.jar",
@@ -566,8 +566,8 @@ task verifyWar(type: VerifyJarTask) {
566566
"shindig-common-1.1-BETA5-incubating.jar",
567567
"shindig-features-1.1-BETA5-incubating.jar",
568568
"shindig-gadgets-1.1-BETA5-incubating.jar",
569-
"slf4j-api-1.7.12.jar",
570-
"slf4j-log4j12-1.7.12.jar",
569+
"slf4j-api-1.7.21.jar",
570+
"slf4j-log4j12-1.7.21.jar",
571571
"smtp-1.4.4.jar",
572572
"spring-aop-3.1.3.RELEASE.jar",
573573
"spring-asm-3.1.3.RELEASE.jar",

0 commit comments

Comments
 (0)