Skip to content

Remove JRuby-17 SSL support #139

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove JRuby-17 SSL support #139

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
11 changes: 0 additions & 11 deletions gem-maven-plugin/src/main/java/de/saumya/mojo/gem/AbstractGemMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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();
}
Expand Down
3 changes: 0 additions & 3 deletions gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PushMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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){
Expand Down
5 changes: 0 additions & 5 deletions jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/JRubyVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 1 addition & 12 deletions ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}

}
}
21 changes: 0 additions & 21 deletions ruby-tools/src/main/java/de/saumya/mojo/ruby/gems/GemsInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,27 +166,6 @@ public void installGems(final MavenProject pom, final Collection<Artifact> 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) {
Expand Down
Loading