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/08/23 08:57:56 UTC

[camel] 02/06: CAMEL-12618: Use fork of MVEL that supports Jav...

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 ddad9e58599831c1f69e997378b66ac97af72929
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jul 13 11:43:54 2018 +0200

    CAMEL-12618: Use fork of MVEL that supports Jav...
    
    ...a 11
    
    Try to fix Java 10 build with MVEL dependency built by jitpack.io.
    
    See mvel/mvel#159[2]
    
    [1] http://openjdk.java.net/jeps/320
    [2] https://github.com/mvel/mvel/issues/159
---
 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>