Skip to content

Upgrade polyglot and remove openssl lib hack #8962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 1 commit into from
Aug 15, 2025
Merged

Upgrade polyglot and remove openssl lib hack #8962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.5.0</version>
<version>0.8.1</version>
</extension>
</extensions>
15 changes: 0 additions & 15 deletions lib/pom.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,21 +222,6 @@ def log(message=nil)

FileUtils.mkdir_p( default_specs )

# have an empty openssl.rb so we do not run in trouble with not having
# jopenssl which is part of the default gems
lib_dir = File.join( target, 'lib' )
openssl = File.join( lib_dir, 'openssl.rb' )
FileUtils.mkdir_p( lib_dir )
FileUtils.touch( openssl )
$LOAD_PATH.unshift lib_dir

# since the bouncy castle .jars are version-ed (e.g. bcprov-jdk15on-1.47)
# make sure we cleanup before adding the ones from the jruby-openssl.gem:
Dir.glob( File.join( lib_dir, "bc{prov,pkix}*.jar" ) ).each do |f|
# use this instead of FileUtils.rm_f - issue #1698
File.delete( f ) if File.exists?( f )
end

# now we can require the rubygems staff
require 'rubygems/installer'
require 'rubygems/package'
Expand Down
4 changes: 2 additions & 2 deletions lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1413,7 +1413,7 @@ DO NOT MODIFY - GENERATED CODE
<plugin>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
<version>0.5.0</version>
<version>0.8.1</version>
<executions>
<execution>
<id>install_gems</id>
Expand Down Expand Up @@ -1453,7 +1453,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.5.0</version>
<version>0.8.1</version>
</dependency>
</dependencies>
<inherited>false</inherited>
Expand Down
Loading