From 43054f54de5970f13b04e4b02b8f9053f0ac026e Mon Sep 17 00:00:00 2001 From: Christian Meier Date: Sat, 15 Feb 2025 14:38:00 +0100 Subject: [PATCH] Remove JRuby-17 SSL support --- .../de/saumya/mojo/gem/AbstractGemMojo.java | 11 ---------- .../java/de/saumya/mojo/gem/PushMojo.java | 3 --- .../de/saumya/mojo/jruby/JRubyVersion.java | 5 ----- .../de/saumya/mojo/ruby/gems/GemsConfig.java | 13 +----------- .../saumya/mojo/ruby/gems/GemsInstaller.java | 21 ------------------- 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/AbstractGemMojo.java b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/AbstractGemMojo.java index 1bfb646a..3fbba670 100644 --- a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/AbstractGemMojo.java +++ b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/AbstractGemMojo.java @@ -38,16 +38,6 @@ public abstract class AbstractGemMojo extends AbstractJRubyMojo { @Parameter( defaultValue = "${plugin}", readonly = true ) protected PluginDescriptor plugin; - /** - * flag whether to include open-ssl gem or not - * - * Command line -Dgem.includeOpenSSL=... - * - */ - @Parameter( defaultValue = "false", property = "gem.includeOpenSSL" ) - @Deprecated - protected boolean includeOpenSSL; - /** * flag whether to include all gems to test-resources, i.e. to test-classpath or not * @@ -228,7 +218,6 @@ public void execute() throws MojoExecutionException, MojoFailureException{ this.gemsConfig.setBinDirectory(this.binDirectory); // this.gemsConfig.setUserInstall(userInstall); // this.gemsConfig.setSystemInstall(systemInstall); - this.gemsConfig.setSkipJRubyOpenSSL( ! (this.includeOpenSSL && getJrubyVersion().needsOpenSSL() ) ); super.execute(); } diff --git a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PushMojo.java b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PushMojo.java index 3fd10b37..8c6dfe6c 100644 --- a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PushMojo.java +++ b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PushMojo.java @@ -54,9 +54,6 @@ public void execute() throws MojoExecutionException, MojoFailureException{ @Override public void executeWithGems() throws MojoExecutionException, ScriptException, IOException, MojoFailureException, GemException { - if ( getJrubyVersion().needsOpenSSL() ) { - gemsInstaller.installOpenSSLGem(this.repoSession, localRepository, getRemoteRepos() ); - } final Script script = this.factory.newScriptFromJRubyJar("gem") .addArg("push"); if(this.project.getArtifact().getFile() == null){ diff --git a/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/JRubyVersion.java b/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/JRubyVersion.java index e29ef5b9..7b3dc507 100644 --- a/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/JRubyVersion.java +++ b/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/JRubyVersion.java @@ -85,11 +85,6 @@ public boolean hasMode( Mode mode ) } } - public boolean needsOpenSSL() - { - return this.major == 1 && this.minor < 7; - } - public String toString() { return this.version; diff --git a/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsConfig.java b/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsConfig.java index 96366595..ac9a1223 100644 --- a/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsConfig.java +++ b/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsConfig.java @@ -34,16 +34,6 @@ public class GemsConfig { private boolean systemInstall = false; - private boolean skipJRubyOpenSSL = false; - - public void setSkipJRubyOpenSSL(final boolean skip) { - this.skipJRubyOpenSSL = skip; - } - - public boolean skipJRubyOpenSSL() { - return this.skipJRubyOpenSSL; - } - public void setAddRI(final boolean addRI) { this.addRI = addRI; } @@ -204,10 +194,9 @@ public GemsConfig clone() { clone.userInstall = this.userInstall; clone.systemInstall = this.systemInstall; clone.verbose = this.verbose; - clone.skipJRubyOpenSSL = this.skipJRubyOpenSSL; clone.binDirectory = this.binDirectory; return clone; } -} \ No newline at end of file +} diff --git a/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsInstaller.java b/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsInstaller.java index 29864287..2520364c 100644 --- a/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsInstaller.java +++ b/ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsInstaller.java @@ -166,27 +166,6 @@ public void installGems(final MavenProject pom, final Collection artif && pom.getArtifact().getFile().getName().endsWith(".gem") ) { script = maybeAddArtifact(script, pom.getArtifact()); } - if (!this.config.skipJRubyOpenSSL() && !hasAlreadyOpenSSL && script != null) { - // keep the version hard-coded to stay reproducible - final Artifact openssl = this.manager.createGemArtifact(OPENSSL, - OPENSSL_VERSION); - - if (pom.getFile() == null) { - // we do not have a pom so we need the default gems repo - this.manager.addDefaultGemRepositories(remoteRepos); - } - for(Artifact a : this.manager.resolve(openssl, - localRepository, - remoteRepos, true) ) { - if (a.getFile() == null || !a.getFile().exists()) { - this.manager.resolve(a, - localRepository, - remoteRepos); - - } - script = maybeAddArtifact(script, a); - } - } } if (script != null) {