Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b6a4df98c8ad
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d45787dec36
Choose a head ref
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Sep 5, 2017

  1. Use only Java 8 in travis and for build.

    @headius
    headius committed Sep 5, 2017
    Copy the full SHA
    66d028d View commit details

  2. Modify test to align with MRI. See #4761.

    @headius
    headius committed Sep 5, 2017
    Copy the full SHA
    bc262ee View commit details

  3. Tweak toplevel return test to run on JRuby and unexclude.

    @headius
    headius committed Sep 5, 2017
    Copy the full SHA
    c52ebf0 View commit details

Commits on Sep 7, 2017

  1. Exclude temporarily Psych tests not updated for DateTime change. 

    See #4784.
    @headius
    headius committed Sep 7, 2017
    Copy the full SHA
    ca0bc28 View commit details

  2. Merge branch 'java8'

    @headius
    headius committed Sep 7, 2017
    Copy the full SHA
    8d45787 View commit details
Showing with 9 additions and 17 deletions.
  1. +3 −13 .travis.yml
  2. +2 −2 pom.rb
  3. +2 −2 pom.xml
  4. +1 −0 test/mri/excludes/Psych/JSON/TestStream.rb
  5. +1 −0 test/mri/excludes/Psych/TestJSONTree.rb
16 changes: 3 additions & 13 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions pom.rb
View file
Original file line number Diff line number Diff line change
@@ -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',
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions test/mri/excludes/Psych/JSON/TestStream.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_datetime, "not updated for DateTime.to_time local time change in 2.4 (#4784)"
1 change: 1 addition & 0 deletions test/mri/excludes/Psych/TestJSONTree.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_datetime, "not updated for DateTime.to_time local time change in 2.4 (#4784)"