Use only Java 8 in travis and for build.

jruby · Sep 5, 2017 · 66d028d · 66d028d
1 parent 6e9854f
commit 66d028d
Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,8 +21,7 @@ before_script:
   - echo $MAVEN_OPTS
 
 jdk:
-  - openjdk7
-#  - oraclejdk8
+  - oraclejdk8
 
 os:
   - linux
@@ -58,13 +57,13 @@ matrix:
     - env: PHASE='-Pdist'
       jdk: oraclejdk8
     - env: PHASE='-Pjruby-jars'
-      jdk: openjdk7
+      jdk: oraclejdk8
     - env: PHASE='-Pmain'
       jdk: oraclejdk8
     - env: PHASE='-Pcomplete'
       jdk: oraclejdk8
     - env: PHASE='-Posgi'
-      jdk: openjdk7
+      jdk: oraclejdk8
     - env: PHASE='-Pj2ee'
       jdk: oraclejdk8
     # These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
@@ -76,15 +75,6 @@ matrix:
       jdk: oraclejdk8
     - env: COMMAND=test/check_versions.sh
       jdk: oraclejdk8
-  allow_failures:
-    #- env: PHASE='-Pj2ee'
-    #  jdk: oraclejdk7
-    # NOTE: build seems to never start (waited for any to finish for more than a day) - probably a travis-ci bug
-    #- env: PHASE='-Pmain'
-    #  sudo: required
-    #  dist: trusty
-    #  group: edge
-    #  jdk: oraclejdk9
 
 install:
   - ./mvnw $MAVEN_CLI_OPTS package -B -Dinvoker.skip -Dmaven.test.skip

diff --git a/pom.rb b/pom.rb
@@ -56,8 +56,8 @@
               'jruby.basedir' => '${project.basedir}',
               'main.basedir' => '${project.basedir}',
               'project.build.sourceEncoding' => 'utf-8',
-              'base.java.version' => '1.7',
-              'base.javac.version' => '1.7',
+              'base.java.version' => '1.8',
+              'base.javac.version' => '1.8',
               'invoker.skip' => 'true',
               'version.jruby' => '${project.version}',
               'github.global.server' => 'github',

diff --git a/pom.xml b/pom.xml
@@ -118,11 +118,11 @@ DO NOT MODIFIY - GENERATED CODE
     <asm.version>5.0.4</asm.version>
     <rspec-expectations.version>3.4.0</rspec-expectations.version>
     <its.osgi>osgi*/pom.xml</its.osgi>
-    <base.javac.version>1.7</base.javac.version>
+    <base.javac.version>1.8</base.javac.version>
     <test-unit.version>3.1.1</test-unit.version>
     <rdoc.version>5.0.0</rdoc.version>
     <rspec.version>3.4.0</rspec.version>
-    <base.java.version>1.7</base.java.version>
+    <base.java.version>1.8</base.java.version>
     <rspec-mocks.version>3.4.1</rspec-mocks.version>
     <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <invoker.skip>true</invoker.skip>