Skip to content

Commit

Permalink
Revert "update jar-dependencies gem hooks"
Browse files Browse the repository at this point in the history
  • Loading branch information
headius committed Aug 4, 2022
1 parent ba2e92b commit a7e8f4f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
8 changes: 1 addition & 7 deletions lib/ruby/stdlib/rubygems/defaults/jruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ def spec_directories_from_classpath
end

begin
Gem.post_install do |gem_installer|
# defer this require until the post-install hook is actually called
# since otherwise Bundler will not be able to activate any other
# version of jar-dependencies than the pre-packaged default gem.
require "jars/post_install_hook"
Jars.post_install_hook(gem_installer)
end
require 'jar_install_post_install_hook'
rescue LoadError
end
2 changes: 1 addition & 1 deletion pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
'jruby-launcher.version' => '1.1.6',
'ant.version' => '1.9.8',
'asm.version' => '9.2',
'jar-dependencies.version' => '0.4.2',
'jar-dependencies.version' => '0.4.1',
'jffi.version' => '1.3.9',
'joda.time.version' => '2.10.10' )

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ DO NOT MODIFIY - GENERATED CODE
<invoker.skip>true</invoker.skip>
<its.j2ee>j2ee*/pom.xml</its.j2ee>
<its.osgi>osgi*/pom.xml</its.osgi>
<jar-dependencies.version>0.4.2</jar-dependencies.version>
<jar-dependencies.version>0.4.1</jar-dependencies.version>
<jffi.version>1.3.9</jffi.version>
<joda.time.version>2.10.10</joda.time.version>
<jruby-launcher.version>1.1.6</jruby-launcher.version>
Expand Down

0 comments on commit a7e8f4f

Please sign in to comment.