You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2018/07/13 09:47:27 UTC
[camel] branch java-10-test created (now 825a00b)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a change to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git.
at 825a00b Temporary disable JDK 9 build
This branch includes the following new commits:
new f4d7fc9 Try to fix Java 10 build with MVEL snapshot dependency
new 825a00b Temporary disable JDK 9 build
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel] 01/02: Try to fix Java 10 build with MVEL snapshot
dependency
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4d7fc96415d501d68ee8c343fdb31df6a99db94
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:43:54 2018 +0200
Try to fix Java 10 build with MVEL snapshot dependency
---
tooling/maven/camel-package-maven-plugin/pom.xml | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 50afd0f..47cf92a 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -44,6 +44,17 @@
</dependencies>
</dependencyManagement>
+ <!-- added to allow for Java 10+ compatibility in MVEL
+ there is no release that includes this fix
+ https://github.com/mvel/mvel/issues/159
+ -->
+ <repositories>
+ <repository>
+ <id>jitpack.io</id>
+ <url>https://jitpack.io</url>
+ </repository>
+ </repositories>
+
<dependencies>
<!-- use our patched ordered json-simple parser -->
@@ -53,10 +64,11 @@
<version>${project.version}</version>
</dependency>
+ <!-- see above, targeting MVEL with Java 10+ support -->
<dependency>
- <groupId>org.mvel</groupId>
- <artifactId>mvel2</artifactId>
- <version>${mvel-version}</version>
+ <groupId>com.github.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>97071e83fb</version>
</dependency>
<dependency>
[camel] 02/02: Temporary disable JDK 9 build
Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 825a00b7ecd7e094d7f641c39eca7d3e6fbc03bd
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:47:05 2018 +0200
Temporary disable JDK 9 build
---
Jenkinsfile.daily | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/Jenkinsfile.daily b/Jenkinsfile.daily
index f49f417..666df82 100644
--- a/Jenkinsfile.daily
+++ b/Jenkinsfile.daily
@@ -23,7 +23,7 @@ def BUILD_JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY} -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"
-def jdk9_result, jdk10_result, jdk11_result
+def jdk10_result, jdk11_result
pipeline {
@@ -53,24 +53,6 @@ pipeline {
}
}
- stage('Test JDK 9') {
- tools {
- jdk 'JDK 1.9 (latest)'
- }
- steps {
- script {
- jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
- }
- }
- post {
- always {
- junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
- junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
- sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
- }
- }
- }
-
stage('Test JDK 10') {
tools {
jdk 'JDK 10 (latest)'
@@ -112,7 +94,7 @@ pipeline {
post {
always {
script {
- currentBuild.result = jdk9_result == 0 && jdk10_result == 0 && jdk11_result == 0 ? 'SUCCESS' : 'FAILURE'
+ currentBuild.result = jdk10_result == 0 && jdk11_result == 0 ? 'SUCCESS' : 'FAILURE'
}
}
}