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: 43e158c56691
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8620894918dc
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 6, 2014

  1. [build] reduce j2ee profile to minimum

    @mkristian
    mkristian committed Oct 6, 2014
    Copy the full SHA
    15240bc View commit details

  2. [build] only delete bouncycastle gems on clean

    @mkristian
    mkristian committed Oct 6, 2014
    Copy the full SHA
    9cb8a37 View commit details

  3. make the osgi more independent of jruby-openssl version used

    @mkristian
    mkristian committed Oct 6, 2014
    Copy the full SHA
    8620894 View commit details
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ def to_pathname
:filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
:includes => [ '*' ] },
{ :directory => '${basedir}/ruby/shared',
:includes => [ '**/*.jar' ] } ] )
:includes => [ '**/bouncycastle/**/*.jar' ] } ] )

# tell maven to download the respective gem artifacts
default_gems.each do |g|
2 changes: 1 addition & 1 deletion lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@
<fileset>
<directory>${basedir}/ruby/shared</directory>
<includes>
<include>**/*.jar</include>
<include>**/bouncycastle/**/*.jar</include>
</includes>
</fileset>
</filesets>
11 changes: 6 additions & 5 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
@@ -96,8 +96,8 @@ public void testJRubyCreate() throws Exception {
String list = (String) jruby.runScriptlet( "Gem.loaded_specs.keys.inspect" );
assertEquals(list, "[\"rake\"]");

// ensure we can load openssl (with its bouncy-castle jars) and krypt
loaded = (Boolean) jruby.runScriptlet( "require 'openssl';require 'krypt'" );
// ensure we can load openssl (with its bouncy-castle jars)
loaded = (Boolean) jruby.runScriptlet( "require 'openssl'" );
assertEquals(true, loaded);

// ensure we can load ffi
@@ -108,14 +108,15 @@ public void testJRubyCreate() throws Exception {
gemPath = gemPath.replaceAll( "bundle[^:]*://[^/]*", "bundle:/" );
assertEquals( gemPath, "[\"uri:bundle://specifications\", \"uri:classloader:/specifications\", \"uri:classloader:/META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );

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

// 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\", \"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\", \"ffi\", \"krypt-provider-jdk\", \"krypt-core\", \"krypt\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
}
}
5 changes: 3 additions & 2 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
@@ -97,14 +97,15 @@ public void testJRubyCreate() throws InterruptedException {
String gemPath = (String) jruby.runScriptlet( "Gem::Specification.dirs.inspect" );
assertEquals( gemPath, "[\"uri:classloader:/specifications\", \"uri:classloader:/META-INF/jruby.home/lib/ruby/gems/shared/specifications\"]" );

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

// 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\", \"thread_safe\", \"descendants_tracker\", \"equalizer\", \"coercible\", \"ice_nine\", \"axiom-types\", \"virtus\"]");
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\"]");
}
}
2 changes: 1 addition & 1 deletion maven/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -24,13 +24,13 @@

# module to profile map
map = { 'jruby' => [ :release, :main, :osgi, :j2ee ],
'jruby-noasm' => [ :release, :main ],
'jruby-stdlib' => [ :release, :main, :complete, :dist, 'jruby-jars', :osgi, :j2ee ],
'jruby-complete' => [ :release, :complete, :osgi ],
'jruby-dist' => [ :release, :dist ],
'jruby-jars' => [ :release, 'jruby-jars' ],
'jruby-rake-plugin' => [ :release, 'jruby-rake-plugin']
}
map[ 'jruby-noasm' ] = map[ 'jruby' ]

profile :all do
modules map.keys
8 changes: 3 additions & 5 deletions maven/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -50,32 +50,32 @@
<id>all</id>
<modules>
<module>jruby</module>
<module>jruby-noasm</module>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
<module>jruby-dist</module>
<module>jruby-jars</module>
<module>jruby-rake-plugin</module>
<module>jruby-noasm</module>
</modules>
</profile>
<profile>
<id>release</id>
<modules>
<module>jruby</module>
<module>jruby-noasm</module>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
<module>jruby-dist</module>
<module>jruby-jars</module>
<module>jruby-rake-plugin</module>
<module>jruby-noasm</module>
</modules>
</profile>
<profile>
<id>main</id>
<modules>
<module>jruby</module>
<module>jruby-stdlib</module>
<module>jruby-noasm</module>
<module>jruby-stdlib</module>
</modules>
</profile>
<profile>
@@ -84,15 +84,13 @@
<module>jruby</module>
<module>jruby-stdlib</module>
<module>jruby-complete</module>
<module>jruby-noasm</module>
</modules>
</profile>
<profile>
<id>j2ee</id>
<modules>
<module>jruby</module>
<module>jruby-stdlib</module>
<module>jruby-noasm</module>
</modules>
</profile>
<profile>