You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/01/25 08:28:49 UTC
[camel-k] branch master updated: chore(deps): update kotlin to
v1.3.20
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new e7427c7 chore(deps): update kotlin to v1.3.20
e7427c7 is described below
commit e7427c726d75800303ca7a37985112a515736a0e
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Wed Jan 23 23:12:34 2019 +0100
chore(deps): update kotlin to v1.3.20
---
contributing.adoc | 10 ----------
.../kotlin/org/apache/camel/k/kotlin/KotlinRoutesLoader.kt | 9 ---------
runtime/pom.xml | 2 +-
script/travis_build.sh | 3 +--
4 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/contributing.adoc b/contributing.adoc
index d8c1904..99234ac 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 efd01ee..55604ad 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(
@@ -65,12 +62,6 @@ class KotlinRoutesLoader : RoutesLoader {
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 ced3a52..9aa1108 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -39,7 +39,7 @@
<log4j2.version>2.11.1</log4j2.version>
<slf4j.version>1.7.25</slf4j.version>
<groovy.version>2.5.5</groovy.version>
- <kotlin.version>1.3.11</kotlin.version>
+ <kotlin.version>1.3.20</kotlin.version>
<snakeyaml.version>1.23</snakeyaml.version>
<spock.version>1.2-groovy-2.5</spock.version>
<jackson.version>2.9.8</jackson.version>
diff --git a/script/travis_build.sh b/script/travis_build.sh
index 2590f6b..797294b 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