Merge branch 'jruby-9.1'

jruby · Oct 27, 2017 · e37d117 · e37d117
2 parents c1d2963 + 6906808
commit e37d117
Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -80,6 +80,27 @@ matrix:
       jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
+    - env: PHASE='-Prake -Dtask=test:jruby:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=test:mri:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=spec:ruby:fast'
+      jdk: oraclejdk9
+    - env: PHASE='-Pmain'
+      jdk: oraclejdk9
+    - env: PHASE='-Pcomplete'
+      jdk: oraclejdk9
+  allow_failures:
+    - env: PHASE='-Prake -Dtask=test:jruby:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=test:mri:jit'
+      jdk: oraclejdk9
+    - env: PHASE='-Prake -Dtask=spec:ruby:fast'
+      jdk: oraclejdk9
+    - env: PHASE='-Pmain'
+      jdk: oraclejdk9
+    - env: PHASE='-Pcomplete'
+      jdk: oraclejdk9
 
 install:
   - ./mvnw $MAVEN_CLI_OPTS package -B -Dinvoker.skip -Dmaven.test.skip
@@ -101,3 +122,8 @@ notifications:
 
 services:
   - redis-server
+
+addons:
+  apt:
+    packages:
+      - oracle-java9-installer
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -62,7 +62,7 @@ def initialize( name, version, default_spec = true )
   # just depends on jruby-core so we are sure the jruby.jar is in place
   jar "org.jruby:jruby-core:#{version}", :scope => 'test'
 
-  extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'
+  extension 'org.torquebox.mojo:mavengem-wagon:0.2.2'
 
   repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'
 

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -212,7 +212,7 @@ DO NOT MODIFIY - GENERATED CODE
       <extension>
         <groupId>org.torquebox.mojo</groupId>
         <artifactId>mavengem-wagon</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.2</version>
       </extension>
     </extensions>
     <resources>