Skip to content

Commit

Permalink
Legacy-sdk compliance continue (#2051)
Browse files Browse the repository at this point in the history
* Miss logback-classic in logback

* Update gson and exclude module-info.class in our jar
  • Loading branch information
heyams authored Jan 14, 2022
1 parent c3ffe90 commit 63b669a
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
5 changes: 3 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ dependencies {
compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
compile ([group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'])
compile ([group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.15'])
compile ([group: 'com.google.code.gson', name: 'gson', version: '2.8.2'])
compile ([group: 'com.google.code.gson', name: 'gson', version: '2.8.9'])
// update transitive dependency version
compile ([group: 'com.google.guava', name: 'guava', version: '27.1-android'])
testCompile group: 'org.hamcrest', name:'hamcrest-core', version:'1.3'
testCompile group: 'org.hamcrest', name:'hamcrest-library', version:'1.3'
testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
testCompile group: 'com.google.code.gson', name: 'gson', version: '2.8.9'
testCompile group: 'io.grpc', name:'grpc-testing', version:'1.16.1'
testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0'
}
Expand All @@ -106,6 +106,7 @@ shadowJar {
exclude 'com/thoughtworks/xstream/converters/reflection/LambdaConverter.class'
exclude 'com/thoughtworks/xstream/mapper/LambdaMapper.class'
exclude 'com/thoughtworks/xstream/core/util/ISO8601JavaTimeConverter.class'
exclude 'module-info.class'
}

jar {
Expand Down
2 changes: 1 addition & 1 deletion core/gradle/dependency-locks/runtimeClasspath.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.2
com.google.code.gson:gson:2.8.9
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0.1
com.google.guava:guava:27.1-android
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.2
com.google.code.gson:gson:2.8.9
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0.1
com.google.guava:guava:27.1-android
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.2
com.google.code.gson:gson:2.8.9
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0.1
com.google.guava:guava:27.1-android
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.2
com.google.code.gson:gson:2.8.9
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0.1
com.google.guava:guava:27.1-android
Expand Down
2 changes: 1 addition & 1 deletion logging/logback/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ projectPomDescription = "This module provides a $project.msftAppInsights appende
// endregion Publishing properties

dependencies {
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.8'
compile group: 'ch.qos.logback', name: 'logback-core', version: '1.2.3'
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
ch.qos.logback:logback-classic:1.2.3
ch.qos.logback:logback-core:1.2.3
ch.qos.logback:logback-classic:1.2.8
ch.qos.logback:logback-core:1.2.8
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.2
com.google.code.gson:gson:2.8.9
com.google.errorprone:error_prone_annotations:2.2.0
com.google.guava:failureaccess:1.0.1
com.google.guava:guava:27.1-android
Expand All @@ -20,6 +20,6 @@ org.apache.httpcomponents:httpclient:4.5.3
org.apache.httpcomponents:httpcore:4.4.6
org.checkerframework:checker-compat-qual:2.5.2
org.codehaus.mojo:animal-sniffer-annotations:1.17
org.slf4j:slf4j-api:1.7.25
org.slf4j:slf4j-api:1.7.32
xmlpull:xmlpull:1.1.3.1
xpp3:xpp3_min:1.1.4c
2 changes: 1 addition & 1 deletion test/fakeIngestion/servlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repositories {
dependencies {
compile 'com.google.guava:guava:23.0'
providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
compile 'com.google.code.gson:gson:2.8.2'
compile 'com.google.code.gson:gson:2.8.9'
compile project(':core')
compile project(':test:smoke:framework:utils')

Expand Down
2 changes: 1 addition & 1 deletion test/fakeIngestion/standalone/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
compile 'com.google.guava:guava:23.0'
compile 'junit:junit:4.12'
compile 'org.eclipse.jetty.aggregate:jetty-all:9.4.7.v20170914'
compile 'com.google.code.gson:gson:2.8.2'
compile 'com.google.code.gson:gson:2.8.9'
compile project(':core')
compile project(':test:fakeIngestion:servlet')
}
Expand Down
2 changes: 1 addition & 1 deletion test/smoke/framework/utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ repositories {
}

dependencies {
compile 'com.google.code.gson:gson:2.8.2'
compile 'com.google.code.gson:gson:2.8.9'
compile 'org.apache.httpcomponents:httpclient:4.5.3'
compile 'com.google.guava:guava:20.0'
compile 'org.apache.commons:commons-lang3:3.7'
Expand Down

0 comments on commit 63b669a

Please sign in to comment.