From 63b669a52bcfd327c36f06cf7b213d007dd1c0ca Mon Sep 17 00:00:00 2001 From: Helen Y <56097766+heyams@users.noreply.github.com> Date: Fri, 14 Jan 2022 10:37:02 -0800 Subject: [PATCH] Legacy-sdk compliance continue (#2051) * Miss logback-classic in logback * Update gson and exclude module-info.class in our jar --- core/build.gradle | 5 +++-- core/gradle/dependency-locks/runtimeClasspath.lockfile | 2 +- .../gradle/dependency-locks/runtimeClasspath.lockfile | 2 +- .../gradle/dependency-locks/runtimeClasspath.lockfile | 2 +- .../gradle/dependency-locks/runtimeClasspath.lockfile | 2 +- logging/logback/build.gradle | 2 +- .../gradle/dependency-locks/runtimeClasspath.lockfile | 8 ++++---- test/fakeIngestion/servlet/build.gradle | 2 +- test/fakeIngestion/standalone/build.gradle | 2 +- test/smoke/framework/utils/build.gradle | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 536203b0b59..8213c8fa4f3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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' } @@ -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 { diff --git a/core/gradle/dependency-locks/runtimeClasspath.lockfile b/core/gradle/dependency-locks/runtimeClasspath.lockfile index 2418fdf3c11..a06919e0a50 100644 --- a/core/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/core/gradle/dependency-locks/runtimeClasspath.lockfile @@ -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 diff --git a/logging/common/gradle/dependency-locks/runtimeClasspath.lockfile b/logging/common/gradle/dependency-locks/runtimeClasspath.lockfile index f0416a55ed3..49830911b37 100644 --- a/logging/common/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/logging/common/gradle/dependency-locks/runtimeClasspath.lockfile @@ -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 diff --git a/logging/log4j1_2/gradle/dependency-locks/runtimeClasspath.lockfile b/logging/log4j1_2/gradle/dependency-locks/runtimeClasspath.lockfile index f0416a55ed3..49830911b37 100644 --- a/logging/log4j1_2/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/logging/log4j1_2/gradle/dependency-locks/runtimeClasspath.lockfile @@ -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 diff --git a/logging/log4j2/gradle/dependency-locks/runtimeClasspath.lockfile b/logging/log4j2/gradle/dependency-locks/runtimeClasspath.lockfile index f0416a55ed3..49830911b37 100644 --- a/logging/log4j2/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/logging/log4j2/gradle/dependency-locks/runtimeClasspath.lockfile @@ -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 diff --git a/logging/logback/build.gradle b/logging/logback/build.gradle index 20e83aec6a4..36bafc753e2 100644 --- a/logging/logback/build.gradle +++ b/logging/logback/build.gradle @@ -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' } diff --git a/logging/logback/gradle/dependency-locks/runtimeClasspath.lockfile b/logging/logback/gradle/dependency-locks/runtimeClasspath.lockfile index 8266848d0b1..f4a8020bbdc 100644 --- a/logging/logback/gradle/dependency-locks/runtimeClasspath.lockfile +++ b/logging/logback/gradle/dependency-locks/runtimeClasspath.lockfile @@ -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 @@ -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 diff --git a/test/fakeIngestion/servlet/build.gradle b/test/fakeIngestion/servlet/build.gradle index 862b6f8c09e..802f956701e 100644 --- a/test/fakeIngestion/servlet/build.gradle +++ b/test/fakeIngestion/servlet/build.gradle @@ -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') diff --git a/test/fakeIngestion/standalone/build.gradle b/test/fakeIngestion/standalone/build.gradle index c057c179c91..637bc91b40c 100644 --- a/test/fakeIngestion/standalone/build.gradle +++ b/test/fakeIngestion/standalone/build.gradle @@ -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') } diff --git a/test/smoke/framework/utils/build.gradle b/test/smoke/framework/utils/build.gradle index f37b9b0a2f8..c81002d12ec 100644 --- a/test/smoke/framework/utils/build.gradle +++ b/test/smoke/framework/utils/build.gradle @@ -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'