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

Commits on Jun 2, 2018

  1. pack bundled gems into jruby-stdlib=jar 

    fixes #5196
    @mkristian
    mkristian committed Jun 2, 2018
    1
    Copy the full SHA
    d9f1ecb View commit details
Showing with 59 additions and 2 deletions.
  1. +17 −2 lib/pom.rb
  2. +42 −0 lib/pom.xml
19 changes: 17 additions & 2 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -298,8 +298,23 @@ def installer.ensure_required_ruby_version_met; end
plugin( 'org.codehaus.mojo:build-helper-maven-plugin' )

build do

# both resources are includes for the $jruby_home/lib directory
resource do
directory '${gem.home}'
# assume all dependencies are met with this gems + the default gems
incl = bundled_gems.collect do |bgem|
[
"cache/#{bgem[0]}*#{bgem[1]}.gem",
"gems/#{bgem[0]}*#{bgem[1]}/*",
"specifications/#{bgem[0]}*#{bgem[1]}.gemspec"
]
end.flatten
excl = default_gems.collect do |bgem|
"gems/#{bgem.name}*#{bgem.version}/*"
end
includes incl
excludes excl
target_path '${jruby.complete.gems}'
end

resource do
directory '${gem.home}'
42 changes: 42 additions & 0 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -307,6 +307,48 @@ DO NOT MODIFIY - GENERATED CODE
</extension>
</extensions>
<resources>
<resource>
<targetPath>${jruby.complete.gems}</targetPath>
<directory>${gem.home}</directory>
<includes>
<include>cache/did_you_mean*1.2.0.gem</include>
<include>gems/did_you_mean*1.2.0/*</include>
<include>specifications/did_you_mean*1.2.0.gemspec</include>
<include>cache/minitest*${minitest.version}.gem</include>
<include>gems/minitest*${minitest.version}/*</include>
<include>specifications/minitest*${minitest.version}.gemspec</include>
<include>cache/net-telnet*0.1.1.gem</include>
<include>gems/net-telnet*0.1.1/*</include>
<include>specifications/net-telnet*0.1.1.gemspec</include>
<include>cache/power_assert*${power_assert.version}.gem</include>
<include>gems/power_assert*${power_assert.version}/*</include>
<include>specifications/power_assert*${power_assert.version}.gemspec</include>
<include>cache/rake*${rake.version}.gem</include>
<include>gems/rake*${rake.version}/*</include>
<include>specifications/rake*${rake.version}.gemspec</include>
<include>cache/test-unit*${test-unit.version}.gem</include>
<include>gems/test-unit*${test-unit.version}/*</include>
<include>specifications/test-unit*${test-unit.version}.gemspec</include>
<include>cache/xmlrpc*0.3.0.gem</include>
<include>gems/xmlrpc*0.3.0/*</include>
<include>specifications/xmlrpc*0.3.0.gemspec</include>
</includes>
<excludes>
<exclude>gems/cmath*1.0.0/*</exclude>
<exclude>gems/csv*1.0.0/*</exclude>
<exclude>gems/fileutils*1.1.0/*</exclude>
<exclude>gems/ipaddr*1.2.0/*</exclude>
<exclude>gems/jar-dependencies*${jar-dependencies.version}/*</exclude>
<exclude>gems/jruby-readline*1.2.2/*</exclude>
<exclude>gems/jruby-openssl*0.10.0/*</exclude>
<exclude>gems/json*${json.version}/*</exclude>
<exclude>gems/psych*3.0.2/*</exclude>
<exclude>gems/rake-ant*1.0.4/*</exclude>
<exclude>gems/rdoc*${rdoc.version}/*</exclude>
<exclude>gems/scanf*1.0.0/*</exclude>
<exclude>gems/webrick*1.4.2/*</exclude>
</excludes>
</resource>
<resource>
<targetPath>${jruby.complete.gems}</targetPath>
<directory>${gem.home}</directory>