Update travis ci and mergify for jdk 10 and next

boretti · boretti · commit bf4f8e898d08 · 2019-11-11T20:53:33.000+01:00
diff --git a/.mergify.yml b/.mergify.yml
@@ -52,11 +52,11 @@ pull_request_rules:
       merge:
         method: merge
         strict: smart
-  - name: backport dependencies to version 1.2.X
+  - name: backport dependencies to version 2.2.X
     conditions:
       - base=master
       - label=dependencies
     actions:
       backport:
         branches:
-          - versions/1.2.X
+          - versions/2.2.X
diff --git a/.travis.yml b/.travis.yml
@@ -10,10 +10,12 @@ matrix:
     jdk: openjdk10
   - os: linux
     jdk: openjdk11
+  - os: linux
+    jdk: openjdk12
 jobs:
   allow_failures:
-#    - os: linux
-#      jdk: openjdk11
+    - os: linux
+      jdk: openjdk12
 sudo: false
 addons:
     apt:
