diff --git a/contributing.adoc b/contributing.adoc index d8c1904fd9..99234ac5ac 100644 --- a/contributing.adoc +++ b/contributing.adoc @@ -72,16 +72,6 @@ make dep The `make dep` command runs `dep ensure -v` under the hood, so make sure that `dep` is properly installed. -For now, you have to set environment variable `KOTLIN_JDK_HOME` pointing to your JDK (not JRE) home directory. -Also ensure, that you are using a Java version 8. - -For Mac you can just do a - -[source, bash] ----- -export KOTLIN_JDK_HOME=$(/usr/libexec/java_home -v 1.8) ----- - To build the whole project you now need to run: ``` diff --git a/runtime/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt b/runtime/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt index efd01ee659..55604adc20 100644 --- a/runtime/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt +++ b/runtime/camel-k-runtime-kotlin/src/main/kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt @@ -54,9 +54,6 @@ class KotlinRoutesLoader : RoutesLoader { val compiler = JvmScriptCompiler() val evaluator = BasicJvmScriptEvaluator() val host = BasicJvmScriptingHost(compiler = compiler, evaluator = evaluator) - val javaHome = System.getenv("KOTLIN_JDK_HOME") ?: "/usr/lib/jvm/java" - - LOGGER.info("JAVA_HOME is set to {}", javaHome) URIResolver.resolve(context, source).use { `is` -> val result = host.eval( @@ -64,12 +61,6 @@ class KotlinRoutesLoader : RoutesLoader { ScriptCompilationConfiguration { baseClass(IntegrationConfiguration::class) jvm { - // - // This is needed as workaround for: - // https://youtrack.jetbrains.com/issue/KT-27497 - // - javaHome(File(javaHome)) - // // The Kotlin script compiler does not inherit // the classpath by default diff --git a/runtime/pom.xml b/runtime/pom.xml index ced3a527a4..9aa1108af9 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -39,7 +39,7 @@ 2.11.1 1.7.25 2.5.5 - 1.3.11 + 1.3.20 1.23 1.2-groovy-2.5 2.9.8 diff --git a/script/travis_build.sh b/script/travis_build.sh index 2590f6bd78..797294b439 100755 --- a/script/travis_build.sh +++ b/script/travis_build.sh @@ -2,9 +2,8 @@ set -e -# Find the JAVA_HOME and set the KOTLIN_JDK_HOME +# Print JAVA_HOME echo "Java home: $JAVA_HOME" -export KOTLIN_JDK_HOME=$JAVA_HOME # First build the whole project make