From 56d472451cb9ae5f8322ae59023bd868bd9ad0fd Mon Sep 17 00:00:00 2001
From: Ilya Muradyan <ilya.muradyan@jetbrains.com>
Date: Tue, 9 Nov 2021 16:31:32 +0300
Subject: [PATCH] Mark packages for relocation to fix classpath interferring in
 main-kts

KT-49476 fixed
---
 .../scripting/dependencies-maven-all/build.gradle.kts      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts
index 0ecb543e253aa..3c8155f6fab71 100644
--- a/libraries/scripting/dependencies-maven-all/build.gradle.kts
+++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts
@@ -42,6 +42,11 @@ noDefaultJar()
 sourcesJar()
 javadocJar()
 
+val mavenPackagesToRelocate = listOf(
+    "org.eclipse",
+    "org.codehaus",
+)
+
 val relocatedJar by task<ShadowJar> {
     configurations = listOf(embedded)
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
@@ -51,7 +56,7 @@ val relocatedJar by task<ShadowJar> {
     transform(ComponentsXmlResourceTransformerPatched())
 
     if (kotlinBuildProperties.relocation) {
-        packagesToRelocate.forEach {
+        (packagesToRelocate + mavenPackagesToRelocate).forEach {
             relocate(it, "$kotlinEmbeddableRootPackage.$it")
         }
     }