File tree 2 files changed +7
-2
lines changed
dependencies-maven/src/kotlin/script/experimental/dependencies/maven/impl
2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change @@ -42,6 +42,11 @@ noDefaultJar()
42
42
sourcesJar()
43
43
javadocJar()
44
44
45
+ val mavenPackagesToRelocate = listOf (
46
+ " org.eclipse" ,
47
+ " org.codehaus"
48
+ )
49
+
45
50
val relocatedJar by task<ShadowJar > {
46
51
configurations = listOf (embedded)
47
52
duplicatesStrategy = DuplicatesStrategy .INCLUDE
@@ -51,7 +56,7 @@ val relocatedJar by task<ShadowJar> {
51
56
transform(ComponentsXmlResourceTransformerPatched ())
52
57
53
58
if (kotlinBuildProperties.relocation) {
54
- packagesToRelocate.forEach {
59
+ ( packagesToRelocate + mavenPackagesToRelocate) .forEach {
55
60
relocate(it, " $kotlinEmbeddableRootPackage .$it " )
56
61
}
57
62
}
Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ internal class AetherResolveSession(
245
245
): Settings {
246
246
var main = result.effectiveSettings
247
247
val files = File (System .getProperty(" user.dir" ))
248
- .parentFile.listFiles(
248
+ .parentFile? .listFiles(
249
249
NameFileFilter (" interpolated-settings.xml" ) as FileFilter
250
250
)
251
251
val settingsFile = files?.singleOrNull()
You can’t perform that action at this time.
0 commit comments