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 2020/01/04 22:42:49 UTC

[camel-quarkus] branch master updated: build: add Java 12 to PR build action

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-quarkus.git


The following commit(s) were added to refs/heads/master by this push:
     new fc8fe2e  build: add Java 12 to PR build action
fc8fe2e is described below

commit fc8fe2eae80c31e009ab83b18d3a103dd3bf814e
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Sat Jan 4 23:27:08 2020 +0100

    build: add Java 12 to PR build action
---
 .github/workflows/pr-build-jvm.yml   | 2 +-
 tooling/package-maven-plugin/pom.xml | 6 +++++-
 tooling/pom.xml                      | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr-build-jvm.yml b/.github/workflows/pr-build-jvm.yml
index 70b60f2..5f52e3a 100644
--- a/.github/workflows/pr-build-jvm.yml
+++ b/.github/workflows/pr-build-jvm.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '1.8', '11' ]
+        java: [ '1.8', '11' , '12' ]
     steps:
     - uses: actions/checkout@v1
     - name: Set up JDK ${{ matrix.java }}
diff --git a/tooling/package-maven-plugin/pom.xml b/tooling/package-maven-plugin/pom.xml
index 7eb1fdc..ad49f19 100644
--- a/tooling/package-maven-plugin/pom.xml
+++ b/tooling/package-maven-plugin/pom.xml
@@ -46,6 +46,10 @@
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctorj</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.mvel</groupId>
+                    <artifactId>mvel2</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -99,7 +103,7 @@
         <dependency>
             <groupId>org.mvel</groupId>
             <artifactId>mvel2</artifactId>
-            <version>2.4.4.Final</version>
+            <version>${mvel.version}</version>
         </dependency>
 
     </dependencies>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index e79985d..db3593f 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -46,6 +46,7 @@
         <plexus-container-default-version>2.0.0</plexus-container-default-version>
         <plexus-utils-version>3.2.1</plexus-utils-version>
         <rpkgtests-maven-plugin.version>0.6.0</rpkgtests-maven-plugin.version>
+        <mvel.version>2.4.5.Final</mvel.version>
     </properties>
 
     <modules>