From 400762635affa08b25f85bbffbc91680075602bc Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 3 Jan 2023 17:36:30 +0100 Subject: [PATCH] Scripting: update version of maven resolver dependencies --- gradle/verification-metadata.xml | 202 +++++++++--------- .../dependencies-maven-all/build.gradle.kts | 13 +- .../dependencies-maven/build.gradle.kts | 13 +- .../tools/kotlin-main-kts/build.gradle.kts | 2 +- 4 files changed, 119 insertions(+), 111 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index b2eb225a7c6..8ebfd5e310d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -4815,10 +4815,10 @@ - - - - + + + + @@ -4889,10 +4889,10 @@ - - - - + + + + @@ -5021,6 +5021,12 @@ + + + + + + @@ -5053,10 +5059,10 @@ - - - - + + + + @@ -5075,10 +5081,10 @@ - - - - + + + + @@ -5127,10 +5133,10 @@ - - - - + + + + @@ -5171,10 +5177,10 @@ - - - - + + + + @@ -5189,10 +5195,10 @@ - - - - + + + + @@ -5279,10 +5285,10 @@ - - - - + + + + @@ -5297,10 +5303,10 @@ - - - - + + + + @@ -5321,10 +5327,10 @@ - - - - + + + + @@ -5339,10 +5345,10 @@ - - - - + + + + @@ -5357,10 +5363,10 @@ - - - - + + + + @@ -5369,10 +5375,10 @@ - - - - + + + + @@ -5387,22 +5393,16 @@ - - - - + + + + - - - - - - - - - - + + + + @@ -5417,10 +5417,10 @@ - - - - + + + + @@ -5429,10 +5429,10 @@ - - - - + + + + @@ -5441,10 +5441,10 @@ - - - - + + + + @@ -5459,10 +5459,10 @@ - - - - + + + + @@ -5503,10 +5503,10 @@ - - - - + + + + @@ -5531,10 +5531,10 @@ - - - - + + + + @@ -5559,10 +5559,10 @@ - - - - + + + + @@ -9053,10 +9053,10 @@ - - - - + + + + @@ -9157,6 +9157,12 @@ + + + + + + diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts index f08399b1905..ccee4e4ea45 100644 --- a/libraries/scripting/dependencies-maven-all/build.gradle.kts +++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts @@ -22,12 +22,13 @@ dependencies { embedded(project(":kotlin-scripting-dependencies-maven")) { isTransitive = false } embedded(project(":kotlin-scripting-dependencies")) { isTransitive = false } - embedded("org.apache.maven.resolver:maven-resolver-connector-basic:1.8.0") - embedded("org.apache.maven.resolver:maven-resolver-transport-file:1.8.0") - embedded("org.apache.maven.resolver:maven-resolver-transport-wagon:1.8.0") - embedded("org.apache.maven.resolver:maven-resolver-impl:1.8.0") - embedded("org.apache.maven:maven-core:3.8.5") - embedded("org.apache.maven.wagon:wagon-http:3.5.1") + embedded("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.2") + embedded("org.apache.maven.resolver:maven-resolver-transport-file:1.9.2") + embedded("org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.2") + embedded("org.apache.maven.resolver:maven-resolver-impl:1.9.2") + embedded("org.apache.maven:maven-core:3.8.7") + embedded("org.apache.maven.wagon:wagon-http:3.5.3") + embedded("commons-io:commons-io:2.11.0") } sourceSets { diff --git a/libraries/scripting/dependencies-maven/build.gradle.kts b/libraries/scripting/dependencies-maven/build.gradle.kts index 693157c4674..37bff5d7bdb 100644 --- a/libraries/scripting/dependencies-maven/build.gradle.kts +++ b/libraries/scripting/dependencies-maven/build.gradle.kts @@ -9,12 +9,13 @@ dependencies { implementation(kotlinStdlib()) api(project(":kotlin-scripting-dependencies")) - implementation("org.apache.maven:maven-core:3.8.5") - implementation("org.apache.maven.wagon:wagon-http:3.5.1") - implementation("org.apache.maven.resolver:maven-resolver-connector-basic:1.8.0") - implementation("org.apache.maven.resolver:maven-resolver-transport-file:1.8.0") - implementation("org.apache.maven.resolver:maven-resolver-transport-wagon:1.8.0") - implementation("org.apache.maven.resolver:maven-resolver-impl:1.8.0") + implementation("org.apache.maven:maven-core:3.8.7") + implementation("org.apache.maven.wagon:wagon-http:3.5.3") + implementation("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.2") + implementation("org.apache.maven.resolver:maven-resolver-transport-file:1.9.2") + implementation("org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.2") + implementation("org.apache.maven.resolver:maven-resolver-impl:1.9.2") + implementation("commons-io:commons-io:2.11.0") testImplementation(projectTests(":kotlin-scripting-dependencies")) testImplementation(commonDependency("junit")) diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index f1931fbe435..e9a5ffb693f 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { embedded(project(":kotlin-scripting-jvm")) { isTransitive = false } embedded(project(":kotlin-scripting-jvm-host-unshaded")) { isTransitive = false } embedded(project(":kotlin-scripting-dependencies-maven-all")) { isTransitive = false } - embedded("org.slf4j:slf4j-nop:1.7.30") + embedded("org.slf4j:slf4j-nop:1.7.36") embedded(commonDependency("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm")) { isTransitive = false attributes {