azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Scripting] Fix Maven resolver dependencies

Browse Source
This commit is contained in:
Ilya Muradyan
2021-05-19 23:31:46 +03:00
committed by TeamCityServer
parent 261b42f5c5
commit bead0e3412
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/verification-metadata.xml
-6
View File
@@ -8788,12 +8788,6 @@
<sha256 value="a4a95d16f952e25cbf288ef0c7bcd6cba45a4465fcc484292bc3d651248fbf1a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.eclipse.aether" name="aether-impl" version="1.0.2.v20150114">
<artifact name="aether-impl-1.0.2.v20150114.jar">
<md5 value="90c5812e3e05a2419b47edd075920c3b" origin="Generated by Gradle"/>
<sha256 value="9a84f5863407acf2bf9cf280cd02f5a518952a386de61df3b8c5db8cfdec725d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.eclipse.aether" name="aether-impl" version="1.1.0">
<artifact name="aether-impl-1.1.0.jar">
<md5 value="35f73c191555140e9707c9147cbfb992" origin="Generated by Gradle"/>
libraries/scripting/dependencies-maven/build.gradle.kts
+16 -3
View File
@@ -5,6 +5,22 @@ plugins {
jvmTarget = "1.6"
configurations.compile {
/**
* Files with the same FQNs may exist both in these excluded artifacts and in dependencies of
* `org.apache.maven:maven-core`. If these classes fall into classpath together, it
* may lead to unpredictable errors, especially if these classes have different APIs.
*
* Example. Class `org.eclipse.aether.repository.RemoteRepository` is presented in both
* `maven-resolver-api-1.6.2` (which is resolved transitively from `maven-core`)
* and `aether-api-1.1.0` artifacts. One of the implementations has `isBlocked()`
* method, and another one lacks it. It leads to `NoSuchMethodError` in runtime.
*/
exclude("org.eclipse.aether", "aether-api")
exclude("org.eclipse.aether", "aether-util")
exclude("org.eclipse.aether", "aether-spi")
}
dependencies {
compile(kotlinStdlib())
compile(project(":kotlin-scripting-dependencies"))
@@ -12,9 +28,6 @@ dependencies {
compile("org.eclipse.aether:aether-transport-wagon:1.1.0")
compile("org.eclipse.aether:aether-transport-file:1.1.0")
compile("org.apache.maven:maven-core:3.8.1")
compile("org.apache.maven:maven-settings-builder:3.8.1")
compile("org.apache.maven:maven-aether-provider:3.3.9")
compile("org.apache.maven.wagon:wagon-provider-api:3.4.3")
compile("org.apache.maven.wagon:wagon-http:3.4.3")
testCompile(projectTests(":kotlin-scripting-dependencies"))
testCompile(commonDep("junit"))