Fix maven script executor after changes in the jdk path processing

ligee · Space Team · commit ea2e0bdc3ffd · 2023-04-21T12:17:11.000Z
also avoid unnecessary warnign about scripts in source roots #KT-58101 fixed
diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/ExecuteKotlinScriptMojo.java
@@ -62,6 +62,8 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static org.jetbrains.kotlin.cli.jvm.JvmArgumentsKt.configureJdkHomeFromSystemProperty;
+
 /**
  * Allows to execute kotlin script files during the build process.
  * You can specify script file or inline script to be executed.
@@ -173,6 +175,10 @@ private void executeScriptFile(File scriptFile) throws MojoExecutionException {
             configuration.add(ComponentRegistrar.Companion.getPLUGIN_COMPONENT_REGISTRARS(),
                               new ScriptingCompilerConfigurationComponentRegistrar());
 
+            configureJdkHomeFromSystemProperty(configuration);
+
+            configuration.put(CommonConfigurationKeys.ALLOW_ANY_SCRIPTS_IN_SOURCE_ROOTS, true);
+
             List<File> deps = new ArrayList<>();
 
             deps.addAll(getDependenciesForScript());
