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: 7855222611d7
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 819e30022986
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 30, 2015

  1. adjust count of default gems for jruby-dist

    @mkristian
    mkristian committed Jun 30, 2015
    Copy the full SHA
    1c9f49b View commit details

  2. fix the assert on the osgi test after merge of jruby-1_7

    @mkristian
    mkristian committed Jun 30, 2015
    Copy the full SHA
    819e300 View commit details
2 changes: 1 addition & 1 deletion maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 9";
expected = "gems count 11";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
2 changes: 1 addition & 1 deletion ...plates/osgi_all_inclusive/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -95,7 +95,7 @@ public void testJRubyCreate() throws InterruptedException {

gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
// TODO fix the URLResource to produce uri:classloader:// urls only
assertEquals( gemPath, "[\"uri:classloader:/specifications\", \"uri:classloader://META-INF/jruby.home/lib/ruby/gems/shared/specifications\", \"uri:classloader://specifications\"]" );
assertEquals( gemPath, "[\"uri:classloader:/specifications\", \"uri:classloader://specifications\"]" );

jruby.runScriptlet( "require 'jar-dependencies'" );
list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );