Skip to content
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

Jump to bottom

Fixes for gem push issues on MacOS M1 #301

Merged
merged 2 commits into from
May 7, 2024
Merged

Fixes for gem push issues on MacOS M1 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71d03e1
Update maven plugins to latest
headius May 6, 2024
a011807
Convert IOException to Ruby exception correctly
headius May 6, 2024
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
6 changes: 3 additions & 3 deletions .mvn/extensions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>1.0.3</version>
<version>2.0.2</version>
</extension>
<extension>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.4.8</version>
<version>0.7.0</version>
</extension>
</extensions>
6 changes: 3 additions & 3 deletions Mavenfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ supported_bc_versions = %w{ 1.60 1.61 1.62 1.63 1.64 1.65 1.66 1.67 1.68 }
default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]

properties( 'jruby.plugins.version' => '2.0.1', # 2.0.1
properties( 'jruby.plugins.version' => '3.0.2',
'jruby.switches' => '-W0', # https://github.com/torquebox/jruby-maven-plugins/issues/94
'bc.versions' => default_bc_version,
'invoker.test' => '${bc.versions}',
# allow to skip all tests with -Dmaven.test.skip
'invoker.skip' => '${maven.test.skip}',
'runit.dir' => 'src/test/ruby/**/test_*.rb',
'mavengem.wagon.version' => '1.0.3', # for jruby plugin
'mavengem-wagon.version' => '1.0.3', # for polyglot-ruby
'mavengem.wagon.version' => '2.0.2', # for jruby plugin
'mavengem-wagon.version' => '2.0.2', # for polyglot-ruby
# use this version of jruby for the jruby-maven-plugins
'jruby.versions' => MVN_JRUBY_VERSION, 'jruby.version' => MVN_JRUBY_VERSION,
# dump pom.xml when running 'rmvn'
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ DO NOT MODIFY - GENERATED CODE
<bc.versions>1.78</bc.versions>
<invoker.skip>${maven.test.skip}</invoker.skip>
<invoker.test>${bc.versions}</invoker.test>
<jruby.plugins.version>2.0.1</jruby.plugins.version>
<jruby.plugins.version>3.0.2</jruby.plugins.version>
<jruby.switches>-W0</jruby.switches>
<jruby.version>9.2.19.0</jruby.version>
<jruby.versions>9.2.19.0</jruby.versions>
<mavengem-wagon.version>1.0.3</mavengem-wagon.version>
<mavengem.wagon.version>1.0.3</mavengem.wagon.version>
<mavengem-wagon.version>2.0.2</mavengem-wagon.version>
<mavengem.wagon.version>2.0.2</mavengem.wagon.version>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<polyglot.dump.readonly>false</polyglot.dump.readonly>
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
Expand Down Expand Up @@ -122,12 +122,12 @@ DO NOT MODIFY - GENERATED CODE
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>${mavengem.wagon.version}</version>
</extension>
<extension>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-with-jar-extension</artifactId>
<version>${jruby.plugins.version}</version>
</extension>
Expand Down Expand Up @@ -181,7 +181,7 @@ DO NOT MODIFY - GENERATED CODE
</executions>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>gem-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
Expand Down Expand Up @@ -351,7 +351,7 @@ DO NOT MODIFY - GENERATED CODE
</executions>
</plugin>
<plugin>
<groupId>de.saumya.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>runit-maven-plugin</artifactId>
<version>${jruby.plugins.version}</version>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jruby/ext/openssl/SSLSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ private IRubyObject syswriteImpl(final ThreadContext context,
}
catch (IOException ex) {
debugStackTrace(runtime, "SSLSocket.syswriteImpl", ex);
throw Utils.newError(runtime, runtime.getIOError(), ex);
throw runtime.newIOErrorFromException(ex);
}
}

Expand Down
Loading