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: 8b16e6b00a3e
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2608b87b3dcd
Choose a head ref
  • 17 commits
  • 25 files changed
  • 3 contributors

Commits on Dec 19, 2014

  1. remove those "bundle" is not a known protocol error 

    [skip ci]
    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    4022827 View commit details

  2. [openssl] X509 cert extension authority key identifier finally matche… 

    …s MRI ...
    @kares @mkristian
    kares authored and mkristian committed Dec 19, 2014
    Copy the full SHA
    045c3f7 View commit details

  3. we can not guarantee extension ordering using Java APIs (otherwise th… 

    …is rolls fine)

... and there's the same test without the extension order passing at :
jruby/jruby-openssl@eb30f9bd73ae25750593
    @kares @mkristian
    kares authored and mkristian committed Dec 19, 2014
    Copy the full SHA
    abdbb33 View commit details

  4. WiP - do not exclude those that no longer fail ... (at least on 1.9)

    @kares @mkristian
    kares authored and mkristian committed Dec 19, 2014
    Copy the full SHA
    e0cd2cb View commit details

  5. test_decode_all and test_decode_pem now pass (on JRuby-OpenSSL master)

    @kares @mkristian
    kares authored and mkristian committed Dec 19, 2014
    Copy the full SHA
    d7ed2f1 View commit details

  6. use jruby-openssl-0.9.6.dev-SNAPSHOT

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    b967da6 View commit details

  7. get the adding pem to x509store test back

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    5f831d2 View commit details

  8. fix pem test since some are not self signed

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    463f8ad View commit details

  9. follow the fix of jruby/jruby-openssl#18 

    Sponsored by Lookout Inc.
    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    d7c39c6 View commit details

  10. no more krypt as default gem

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    5160be1 View commit details

  11. fix how to find the ssl_certs in stdlib

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    7e83990 View commit details

  12. [build] removed obsolete monkey patches

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    d50d7ac View commit details

  13. Revert "[build] removed obsolete monkey patches" 

    This reverts commit 30dad24.
    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    0a3ba73 View commit details

  14. Merge branch 'test-jossl-0.9.6-master'

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    58a493a View commit details

  15. use jruby-openssl-0.9.6

    @mkristian
    mkristian committed Dec 19, 2014
    Copy the full SHA
    5fb1882 View commit details

  16. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed Dec 19, 2014
    Copy the full SHA
    8bda6d2 View commit details

  17. [Truffle] Update Graal version to 0.6.

    @chrisseaton
    chrisseaton committed Dec 19, 2014
    Copy the full SHA
    2608b87 View commit details
1 change: 1 addition & 0 deletions antlib/extra.xml
View file
Original file line number Diff line number Diff line change
@@ -32,6 +32,7 @@ build jruby-complete.jar
<arg value='-rminitest/excludes'/>
<arg value='lib/ruby/gems/shared/gems/rake-10.1.0/lib/rake/rake_test_loader.rb'/>
<arg value='test/test_globals.rb'/>
<arg value='test/test_adding_pem_to_x509store.rb'/>
<arg value='test/test_argf.rb'/>
<arg value='test/test_array.rb'/>
<arg value='test/test_autoload.rb'/>
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/cli/ArgumentProcessor.java
View file
Original file line number Diff line number Diff line change
@@ -705,7 +705,7 @@ private void logScriptResolutionFailure(String path) {
public static void checkGraalVersion() {
if (Options.TRUFFLE_RUNTIME_VERSION_CHECK.load()) {
final String graalVersion = System.getProperty("graal.version", "unknown");
final String expectedGraalVersion = "0.6-dev";
final String expectedGraalVersion = "0.6";

if (graalVersion.equals("unknown")) {
return;
26 changes: 2 additions & 24 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -17,21 +17,15 @@ def version
end
end

KRYPT_VERSION = '0.0.2'

# the versions are declared in ../pom.xml
default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.5', true ),
ImportedGem.new( 'jruby-openssl', '0.9.6', true ),
ImportedGem.new( 'jruby-readline', '1.0.dev-SNAPSHOT', false ),
ImportedGem.new( 'jruby-ripper', '2.1.0.dev-SNAPSHOT', false ),
ImportedGem.new( 'rake', 'rake.version', true ),
ImportedGem.new( 'rdoc', 'rdoc.version', true ),
ImportedGem.new( 'json', 'json.version', true ),
ImportedGem.new( 'krypt', KRYPT_VERSION, true ),
ImportedGem.new( 'krypt-core', KRYPT_VERSION, true ),
ImportedGem.new( 'krypt-provider-jdk', KRYPT_VERSION, true ),
ImportedGem.new( 'ffi', '1.9.3', true ),
ImportedGem.new( 'jar-dependencies', '0.1.2', true ),
ImportedGem.new( 'minitest', 'minitest.version', true ),
ImportedGem.new( 'test-unit', 'test-unit.version', true ),
@@ -222,22 +216,6 @@ def to_pathname
f = File.join( ruby_dir, 'stdlib', 'jruby-openssl.rb' )
File.delete( f ) if File.exists?( f )

# PATCH krypt
if KRYPT_VERSION == '0.0.2'
file = ctx.basedir.to_pathname + '/ruby/stdlib/krypt/provider.rb'
content = File.read( file )
content.sub! /begin(.|[\n])*/, <<EOS
unless java?
require_relative 'provider/ffi'
end
EOS
File.open( file, 'w' ) do |f|
f.print content
end
else
raise "please remove the obsolete PATCH for krypt in lib/pom.rb"
end

# we do not want rubygems_plugin.rb within jruby
f = File.join( ruby_dir, 'stdlib', 'rubygems_plugin.rb' )
File.delete( f ) if File.exists?( f )
@@ -246,5 +224,5 @@ def to_pathname
( Dir[ File.join( jruby_gems, '**/*' ) ] + Dir[ File.join( jruby_gems, '**/.*' ) ] ).each do |f|
File.chmod( 0644, f ) rescue nil if File.file?( f )
end
end
end
end
26 changes: 1 addition & 25 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.5</version>
<version>0.9.6</version>
<type>gem</type>
</dependency>
<dependency>
@@ -58,30 +58,6 @@
<version>${json.version}</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>krypt</artifactId>
<version>0.0.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>krypt-core</artifactId>
<version>0.0.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>krypt-provider-jdk</artifactId>
<version>0.0.2</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>ffi</artifactId>
<version>1.9.3</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
1 change: 0 additions & 1 deletion maven/jruby-complete/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -125,7 +125,6 @@
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
4 changes: 2 additions & 2 deletions maven/jruby-complete/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 12";
expected = "gems count 8";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
expected = "jar-dependencies,jruby-openssl";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
6 changes: 3 additions & 3 deletions ...s_with_embedded_gems/test/src/test/java/org/jruby/embed/osgi/test/JRubyOsgiEmbedTest.java
View file
Original file line number Diff line number Diff line change
@@ -110,15 +110,15 @@ public void testJRubyCreate() throws Exception {
loaded = (Boolean) jruby.runScriptlet( "require 'openssl'" );
assertEquals(true, loaded);

jruby.runScriptlet( "require 'jar-dependencies'; require 'krypt'" );
jruby.runScriptlet( "require 'jar-dependencies'" );
list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\"]");

// ensure we can load can load embedded gems
loaded = (Boolean) jruby.runScriptlet( "require 'virtus'" );
assertEquals(true, loaded);

list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
}
}
1 change: 0 additions & 1 deletion maven/jruby-dist/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -142,7 +142,6 @@
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
4 changes: 2 additions & 2 deletions maven/jruby-dist/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 12";
expected = "gems count 8";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
expected = "jar-dependencies,jruby-openssl";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
1 change: 0 additions & 1 deletion maven/jruby-jars/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -131,7 +131,6 @@
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
4 changes: 2 additions & 2 deletions maven/jruby-jars/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 12";
expected = "gems count 8";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
expected = "jar-dependencies,jruby-openssl";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
1 change: 0 additions & 1 deletion maven/jruby/src/it/integrity/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -125,7 +125,6 @@
<argument>
require 'jar-dependencies'
require 'openssl'
require 'krypt'
puts Gem.loaded_specs.keys.sort.join(',')
</argument>
</arguments>
4 changes: 2 additions & 2 deletions maven/jruby/src/it/integrity/verify.bsh
View file
Original file line number Diff line number Diff line change
@@ -28,12 +28,12 @@ if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "gems count 12";
expected = "gems count 8";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
}
expected = "ffi,jar-dependencies,jruby-openssl,krypt,krypt-core,krypt-provider-jdk";
expected = "jar-dependencies,jruby-openssl";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
6 changes: 3 additions & 3 deletions ...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,15 +95,15 @@ public void testJRubyCreate() throws InterruptedException {
gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
assertEquals( gemPath, "[\"uri:classloader:/specifications\", \"uri:classloader:/META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );

jruby.runScriptlet( "require 'jar-dependencies'; require 'krypt'" );
jruby.runScriptlet( "require 'jar-dependencies'" );
list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\"]");
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\"]");

// ensure we can load can load embedded gems
loaded = (Boolean) jruby.runScriptlet( "require 'virtus'" );
assertEquals(true, loaded);

list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
assertEquals(list, "[\"rake\", \"jruby-openssl\", \"jar-dependencies\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
}
}
4 changes: 2 additions & 2 deletions spec/java_integration/rubygems/rubygems_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
url_paths = ["file:/var/tmp",
"http://jruby.org",
"classpath:/META-INF/jruby.home",
"uri:jar:file://META-INF/jruby.home",
"uri:jar:file://META-INF/jruby.home!/some/path",
"jar:file:/var/tmp/some.jar!/some/path"]
Gem.use_paths(nil, url_paths)
Gem.path.should include(*url_paths)
@@ -32,6 +32,6 @@
File.exist?("file:").should be_false
Gem.ensure_gem_subdirectories("uri:file://bogus/classpath")
File.exist?("uri:file:///nothing").should be_false
File.exist?("uri:jar://bogus/classpath").should be_false
File.exist?("uri:file://bogus/classpath").should be_false
end
end
20 changes: 0 additions & 20 deletions spec/regression/GH-1800_krypt_ffi_regression_spec.rb
View file

This file was deleted.

1 change: 1 addition & 0 deletions test/externals/ruby1.9/excludes/OpenSSL/TestX509CRL.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exclude :test_extension, 'Can not guarantee extension order using Java APIs'
Loading