From 40482a50dacd577a0abe0f19333de84083979d70 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Fri, 30 Sep 2022 12:32:19 -0700 Subject: [PATCH] Merge pull request #472 from sejli/CVE-fix-1.3.6 Updating Kotlin and Jsoup (cherry picked from commit 50eac1732041e7a5a7bb0e3fbaa26c4858f4f940) --- reports-scheduler/build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle index f5a2be62..114277f2 100644 --- a/reports-scheduler/build.gradle +++ b/reports-scheduler/build.gradle @@ -15,7 +15,7 @@ buildscript { opensearch_build = opensearch_version.replaceAll(/(\.\d)([^\d]*)$/, '$1.0$2') common_utils_version = System.getProperty("common_utils.version", opensearch_build) job_scheduler_version = System.getProperty("job_scheduler.version", opensearch_build) - kotlin_version = System.getProperty("kotlin.version", "1.4.0") + kotlin_version = System.getProperty("kotlin.version", "1.6.0") } repositories { @@ -30,7 +30,7 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}" classpath "org.jetbrains.kotlin:kotlin-allopen:${kotlin_version}" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.12.0" - classpath "org.jacoco:org.jacoco.agent:0.8.5" + classpath "org.jacoco:org.jacoco.agent:0.8.7" } } @@ -111,6 +111,7 @@ allprojects { plugins.withId('java') { sourceCompatibility = targetCompatibility = "1.8" } + jacoco.toolVersion = "0.8.7" } repositories { @@ -130,7 +131,7 @@ dependencies { compile group: 'com.google.guava', name: 'guava', version: '31.0.1-jre' compile "org.json:json:20180813" compile group: 'com.github.wnameless', name: 'json-flattener', version: '0.1.0' - implementation 'org.jsoup:jsoup:1.14.3' + implementation 'org.jsoup:jsoup:1.15.3' testImplementation( 'org.assertj:assertj-core:3.16.1',