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: 1b1c25908d3f
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4eb2a21909bd
Choose a head ref
7 contributors
Loading
Showing with 942 additions and 567 deletions.
  1. +2 −2 .travis.yml
  2. +1 −0 BUILDING.md
  3. +3 −1 README.md
  4. +95 −95 core/src/main/java/org/jruby/RubyInstanceConfig.java
  5. +15 −33 core/src/main/java/org/jruby/RubyRegexp.java
  6. +12 −1 core/src/main/java/org/jruby/RubyTime.java
  7. +8 −6 core/src/main/java/org/jruby/compiler/JITCompiler.java
  8. +10 −7 core/src/main/java/org/jruby/embed/util/SystemPropertyCatcher.java
  9. +43 −24 core/src/main/java/org/jruby/ir/Compiler.java
  10. +36 −28 core/src/main/java/org/jruby/runtime/load/ClassExtensionLibrary.java
  11. +3 −4 core/src/main/java/org/jruby/runtime/load/LoadService.java
  12. +3 −0 core/src/main/java/org/jruby/truffle/nodes/RubyNode.java
  13. +33 −8 core/src/main/java/org/jruby/truffle/nodes/{debug/TraceInstrument.java → control/TraceNode.java}
  14. +4 −11 core/src/main/java/org/jruby/truffle/nodes/{debug/ProxyNode.java → control/WrapperNode.java}
  15. +3 −15 core/src/main/java/org/jruby/truffle/nodes/core/FalseClassNodes.java
  16. +2 −11 core/src/main/java/org/jruby/truffle/nodes/core/TrueClassNodes.java
  17. +0 −62 core/src/main/java/org/jruby/truffle/nodes/debug/RubyASTProber.java
  18. +0 −21 core/src/main/java/org/jruby/truffle/nodes/debug/RubyNodeProber.java
  19. +0 −95 core/src/main/java/org/jruby/truffle/nodes/debug/RubyWrapper.java
  20. +0 −45 core/src/main/java/org/jruby/truffle/nodes/debug/TraceProber.java
  21. +0 −19 core/src/main/java/org/jruby/truffle/runtime/RubyContext.java
  22. +2 −5 core/src/main/java/org/jruby/truffle/translator/BodyTranslator.java
  23. +0 −2 core/src/main/java/org/jruby/truffle/translator/MethodTranslator.java
  24. +1 −0 core/src/main/java/org/jruby/util/cli/Options.java
  25. +4 −36 core/src/main/java/org/jruby/util/collections/WeakValuedIdentityMap.java
  26. +98 −0 core/src/main/java/org/jruby/util/collections/WeakValuedMap.java
  27. +31 −0 core/src/test/java/org/jruby/TestRegexpCache.java
  28. +3 −0 core/src/test/java/org/jruby/test/MainTestSuite.java
  29. +27 −0 maven/jruby-complete/src/it/integrity/pom.xml
  30. +5 −0 maven/jruby-complete/src/it/integrity/verify.bsh
  31. +25 −0 maven/jruby-dist/src/it/integrity/pom.xml
  32. +7 −2 maven/jruby-dist/src/it/integrity/verify.bsh
  33. +1 −1 maven/jruby-jars/jruby-jars.gemspec
  34. +0 −1 maven/jruby-jars/src/it/extended/src/test/java/org/example/SimpleTest.java
  35. +25 −0 maven/jruby-jars/src/it/integrity/pom.xml
  36. +5 −0 maven/jruby-jars/src/it/integrity/verify.bsh
  37. +27 −0 maven/jruby-noasm/src/it/integrity/pom.xml
  38. +5 −0 maven/jruby-noasm/src/it/integrity/verify.bsh
  39. +0 −1 maven/jruby/src/it/extended/src/test/java/org/example/SimpleTest.java
  40. +27 −0 maven/jruby/src/it/integrity/pom.xml
  41. +5 −0 maven/jruby/src/it/integrity/verify.bsh
  42. +2 −2 maven/pom.rb
  43. +1 −1 maven/pom.xml
  44. +1 −1 pom.rb
  45. +1 −1 pom.xml
  46. +1 −1 ...980_multiple_nonlocal_returns_in_flight.rb → GH-1980_multiple_nonlocal_returns_in_flight_spec.rb}
  47. +23 −0 spec/regression/GH-2008_multi_args_system_method_on_windows_spec.rb
  48. +3 −3 test/jruby/test_file.rb
  49. +1 −1 test/jruby/test_helper.rb
  50. +3 −3 test/jruby/test_jarred_gems_with_spaces_in_directory.rb
  51. +2 −1 test/mri/excludes/TestTime.rb
  52. +21 −15 test/pom.rb
  53. +293 −2 test/pom.xml
  54. +19 −0 test/test_adding_pem_to_x509store.rb
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -58,11 +58,11 @@ matrix:
allow_failures:
- env: PHASE='-Pcomplete'
- env: PHASE='-Prake -Dtask=spec:jrubyc'
- env: PHASE='-Pjruby_complete_jar_jruby'
- env: PHASE='-Pj2ee'
- env: PHASE='-Pjruby_complete_jar_extended'
- env: PHASE='-Prake -Dtask=spec:profiler'
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
- env: PHASE='-Pj2ee'

branches:
only:
1 change: 1 addition & 0 deletions BUILDING.md
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ Prerequisites:

* A Java 7-compatible (or higher) Java development kit (JDK)
* Maven 3+
* Apache Ant 1.8+ (see https://github.com/jruby/jruby/issues/2236)

JRuby uses Maven for building and bootstrapping itself, along with Rake,
RSpec, and MSpec for running integration tests.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,9 @@ See the [docs](docs) directory for more information.

## Prerequisites

JRuby 1.7.x requires Java 6 or greater.
* A Java 7-compatible (or higher) Java development kit (JDK)
* Maven 3+
* Apache Ant 1.8+ (see https://github.com/jruby/jruby/issues/2236)

## Run

Loading