From 1c8a1f183983aa881a5b716683d051d48dce5589 Mon Sep 17 00:00:00 2001
From: Christian Meier <meier.kristian@gmail.com>
Date: Wed, 11 Mar 2020 18:16:28 +0100
Subject: [PATCH 1/6] first step for upgrade
---
.../invoker.properties | 0
.../pom.xml | 0
.../setup.bsh | 0
.../test.properties | 0
.../verify.bsh | 0
.../invoker.properties | 0
.../it/{irb-help-pom => irb-help-pom-skip}/pom.xml | 0
.../test.properties | 0
.../{irb-help-pom => irb-help-pom-skip}/verify.bsh | 0
.../invoker.properties | 0
.../pom.xml | 0
.../src/main/ruby/file.class | Bin
.../src/main/ruby/file.rb | 0
.../verify.bsh | 0
.../src/it/compile-failures/verify.bsh | 2 +-
.../src/it/compile-verbose/verify.bsh | 9 ++++-----
jruby-maven-plugin/src/it/jruby-version/verify.bsh | 4 ++--
.../de/saumya/mojo/jruby/AbstractJRubyMojo.java | 2 +-
parent-mojo/pom.xml | 1 +
19 files changed, 9 insertions(+), 9 deletions(-)
rename gem-maven-plugin/src/it/{irb-help-no-pom => irb-help-no-pom-skip}/invoker.properties (100%)
rename gem-maven-plugin/src/it/{irb-help-no-pom => irb-help-no-pom-skip}/pom.xml (100%)
rename gem-maven-plugin/src/it/{irb-help-no-pom => irb-help-no-pom-skip}/setup.bsh (100%)
rename gem-maven-plugin/src/it/{irb-help-no-pom => irb-help-no-pom-skip}/test.properties (100%)
rename gem-maven-plugin/src/it/{irb-help-no-pom => irb-help-no-pom-skip}/verify.bsh (100%)
rename gem-maven-plugin/src/it/{irb-help-pom => irb-help-pom-skip}/invoker.properties (100%)
rename gem-maven-plugin/src/it/{irb-help-pom => irb-help-pom-skip}/pom.xml (100%)
rename gem-maven-plugin/src/it/{irb-help-pom => irb-help-pom-skip}/test.properties (100%)
rename gem-maven-plugin/src/it/{irb-help-pom => irb-help-pom-skip}/verify.bsh (100%)
rename jruby-maven-plugin/src/it/{compile-failures-but-ignore-failures => compile-failures-but-ignore-failures-skip}/invoker.properties (100%)
rename jruby-maven-plugin/src/it/{compile-failures-but-ignore-failures => compile-failures-but-ignore-failures-skip}/pom.xml (100%)
rename jruby-maven-plugin/src/it/{compile-failures-but-ignore-failures => compile-failures-but-ignore-failures-skip}/src/main/ruby/file.class (100%)
rename jruby-maven-plugin/src/it/{compile-failures-but-ignore-failures => compile-failures-but-ignore-failures-skip}/src/main/ruby/file.rb (100%)
rename jruby-maven-plugin/src/it/{compile-failures-but-ignore-failures => compile-failures-but-ignore-failures-skip}/verify.bsh (100%)
diff --git a/gem-maven-plugin/src/it/irb-help-no-pom/invoker.properties b/gem-maven-plugin/src/it/irb-help-no-pom-skip/invoker.properties
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-no-pom/invoker.properties
rename to gem-maven-plugin/src/it/irb-help-no-pom-skip/invoker.properties
diff --git a/gem-maven-plugin/src/it/irb-help-no-pom/pom.xml b/gem-maven-plugin/src/it/irb-help-no-pom-skip/pom.xml
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-no-pom/pom.xml
rename to gem-maven-plugin/src/it/irb-help-no-pom-skip/pom.xml
diff --git a/gem-maven-plugin/src/it/irb-help-no-pom/setup.bsh b/gem-maven-plugin/src/it/irb-help-no-pom-skip/setup.bsh
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-no-pom/setup.bsh
rename to gem-maven-plugin/src/it/irb-help-no-pom-skip/setup.bsh
diff --git a/gem-maven-plugin/src/it/irb-help-no-pom/test.properties b/gem-maven-plugin/src/it/irb-help-no-pom-skip/test.properties
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-no-pom/test.properties
rename to gem-maven-plugin/src/it/irb-help-no-pom-skip/test.properties
diff --git a/gem-maven-plugin/src/it/irb-help-no-pom/verify.bsh b/gem-maven-plugin/src/it/irb-help-no-pom-skip/verify.bsh
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-no-pom/verify.bsh
rename to gem-maven-plugin/src/it/irb-help-no-pom-skip/verify.bsh
diff --git a/gem-maven-plugin/src/it/irb-help-pom/invoker.properties b/gem-maven-plugin/src/it/irb-help-pom-skip/invoker.properties
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-pom/invoker.properties
rename to gem-maven-plugin/src/it/irb-help-pom-skip/invoker.properties
diff --git a/gem-maven-plugin/src/it/irb-help-pom/pom.xml b/gem-maven-plugin/src/it/irb-help-pom-skip/pom.xml
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-pom/pom.xml
rename to gem-maven-plugin/src/it/irb-help-pom-skip/pom.xml
diff --git a/gem-maven-plugin/src/it/irb-help-pom/test.properties b/gem-maven-plugin/src/it/irb-help-pom-skip/test.properties
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-pom/test.properties
rename to gem-maven-plugin/src/it/irb-help-pom-skip/test.properties
diff --git a/gem-maven-plugin/src/it/irb-help-pom/verify.bsh b/gem-maven-plugin/src/it/irb-help-pom-skip/verify.bsh
similarity index 100%
rename from gem-maven-plugin/src/it/irb-help-pom/verify.bsh
rename to gem-maven-plugin/src/it/irb-help-pom-skip/verify.bsh
diff --git a/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/invoker.properties b/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/invoker.properties
similarity index 100%
rename from jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/invoker.properties
rename to jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/invoker.properties
diff --git a/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/pom.xml b/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/pom.xml
similarity index 100%
rename from jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/pom.xml
rename to jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/pom.xml
diff --git a/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/src/main/ruby/file.class b/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/src/main/ruby/file.class
similarity index 100%
rename from jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/src/main/ruby/file.class
rename to jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/src/main/ruby/file.class
diff --git a/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/src/main/ruby/file.rb b/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/src/main/ruby/file.rb
similarity index 100%
rename from jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/src/main/ruby/file.rb
rename to jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/src/main/ruby/file.rb
diff --git a/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/verify.bsh b/jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/verify.bsh
similarity index 100%
rename from jruby-maven-plugin/src/it/compile-failures-but-ignore-failures/verify.bsh
rename to jruby-maven-plugin/src/it/compile-failures-but-ignore-failures-skip/verify.bsh
diff --git a/jruby-maven-plugin/src/it/compile-failures/verify.bsh b/jruby-maven-plugin/src/it/compile-failures/verify.bsh
index 0c3d8c77..6993545b 100644
--- a/jruby-maven-plugin/src/it/compile-failures/verify.bsh
+++ b/jruby-maven-plugin/src/it/compile-failures/verify.bsh
@@ -3,7 +3,7 @@ import org.codehaus.plexus.util.FileUtils;
String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "Failure during compilation";
+String expected = "SyntaxError";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
diff --git a/jruby-maven-plugin/src/it/compile-verbose/verify.bsh b/jruby-maven-plugin/src/it/compile-verbose/verify.bsh
index d53ac1bf..66f22f4b 100644
--- a/jruby-maven-plugin/src/it/compile-verbose/verify.bsh
+++ b/jruby-maven-plugin/src/it/compile-verbose/verify.bsh
@@ -2,9 +2,8 @@ import java.io.*;
import org.codehaus.plexus.util.FileUtils;
-String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "Compiling ./file.rb";
-if ( !log.contains( expected ) )
+String file = new File( basedir, "target/classes/file.class" ).toString();
+if ( ! FileUtils.fileExists(file) )
{
- throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
\ No newline at end of file
+ throw new RuntimeException( "class file does not exists '" + file + "'" );
+}
diff --git a/jruby-maven-plugin/src/it/jruby-version/verify.bsh b/jruby-maven-plugin/src/it/jruby-version/verify.bsh
index 102fe2d3..a027cf7f 100644
--- a/jruby-maven-plugin/src/it/jruby-version/verify.bsh
+++ b/jruby-maven-plugin/src/it/jruby-version/verify.bsh
@@ -3,8 +3,8 @@ import org.codehaus.plexus.util.FileUtils;
String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "[INFO] jruby 1.";
+String expected = "[INFO] jruby 9.";
if ( !log.contains( expected ) )
{
throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
\ No newline at end of file
+}
diff --git a/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/AbstractJRubyMojo.java b/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/AbstractJRubyMojo.java
index b1b4c1c5..54dc4b3b 100644
--- a/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/AbstractJRubyMojo.java
+++ b/jruby-maven-plugin/src/main/java/de/saumya/mojo/jruby/AbstractJRubyMojo.java
@@ -40,7 +40,7 @@ public abstract class AbstractJRubyMojo extends AbstractMojo {
protected static final String JRUBY_STDLIB = "jruby-stdlib";
- protected static final String DEFAULT_JRUBY_VERSION = "1.7.22";
+ protected static final String DEFAULT_JRUBY_VERSION = "9.2.9.0";
/**
diff --git a/parent-mojo/pom.xml b/parent-mojo/pom.xml
index b683afa1..e2a3218c 100644
--- a/parent-mojo/pom.xml
+++ b/parent-mojo/pom.xml
@@ -125,6 +125,7 @@
<preBuildHookScript>setup.bsh</preBuildHookScript>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<streamLogs>true</streamLogs>
+ <pomExcludes>*-skip/pom.xml</pomExcludes>
</configuration>
<executions>
<execution>
--
GitLab
From a9ae5684ed02f0aad87f49fe283eeae49f6bd413 Mon Sep 17 00:00:00 2001
From: Christian Meier <meier.kristian@gmail.com>
Date: Sun, 12 Apr 2020 20:52:29 +0200
Subject: [PATCH 2/6] skip ITs for old jrubies and deprecated plugins
---
.../features/simplest.feature | 0
.../features/step_definitions/simplest_steps.rb | 0
.../invoker.properties | 0
.../it/{cucumber-failure-19 => cucumber-failure-19-skip}/pom.xml | 0
.../test.properties | 0
.../{cucumber-failure-19 => cucumber-failure-19-skip}/verify.bsh | 0
.../features/simplest.feature | 0
.../features/step_definitions/simplest_steps.rb | 0
.../invoker.properties | 0
.../src/it/{cucumber-failure => cucumber-failure-skip}/pom.xml | 0
.../{cucumber-failure => cucumber-failure-skip}/test.properties | 0
.../src/it/{cucumber-failure => cucumber-failure-skip}/verify.bsh | 0
.../{cucumber-pom => cucumber-pom-skip}/features/simplest.feature | 0
.../features/step_definitions/simplest_steps.rb | 0
.../src/it/{cucumber-pom => cucumber-pom-skip}/invoker.properties | 0
.../src/it/{cucumber-pom => cucumber-pom-skip}/pom.xml | 0
.../src/it/{cucumber-pom => cucumber-pom-skip}/test.properties | 0
.../src/it/{cucumber-pom => cucumber-pom-skip}/verify.bsh | 0
.../invoker.properties | 0
.../it/{cucumber-somewhere => cucumber-somewhere-skip}/pom.xml | 0
.../somewhere/features/simplest.feature | 0
.../somewhere/features/step_definitions/simplest_steps.rb | 0
.../test.properties | 0
.../it/{cucumber-somewhere => cucumber-somewhere-skip}/verify.bsh | 0
.../invoker.properties | 0
.../pom.xml | 0
.../spec/success_spec.rb | 0
.../test.properties | 0
.../verify.bsh | 0
.../invoker.properties | 0
.../src/it/{rspec-failure-19 => rspec-failure-19-skip}/pom.xml | 0
.../spec/failure_spec.rb | 0
.../{rspec-failure-19 => rspec-failure-19-skip}/test.properties | 0
.../src/it/{rspec-failure-19 => rspec-failure-19-skip}/verify.bsh | 0
34 files changed, 0 insertions(+), 0 deletions(-)
rename cucumber-maven-plugin/src/it/{cucumber-failure-19 => cucumber-failure-19-skip}/features/simplest.feature (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure-19 => cucumber-failure-19-skip}/features/step_definitions/simplest_steps.rb (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure-19 => cucumber-failure-19-skip}/invoker.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure-19 => cucumber-failure-19-skip}/pom.xml (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure-19 => cucumber-failure-19-skip}/test.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure-19 => cucumber-failure-19-skip}/verify.bsh (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure => cucumber-failure-skip}/features/simplest.feature (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure => cucumber-failure-skip}/features/step_definitions/simplest_steps.rb (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure => cucumber-failure-skip}/invoker.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure => cucumber-failure-skip}/pom.xml (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure => cucumber-failure-skip}/test.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-failure => cucumber-failure-skip}/verify.bsh (100%)
rename cucumber-maven-plugin/src/it/{cucumber-pom => cucumber-pom-skip}/features/simplest.feature (100%)
rename cucumber-maven-plugin/src/it/{cucumber-pom => cucumber-pom-skip}/features/step_definitions/simplest_steps.rb (100%)
rename cucumber-maven-plugin/src/it/{cucumber-pom => cucumber-pom-skip}/invoker.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-pom => cucumber-pom-skip}/pom.xml (100%)
rename cucumber-maven-plugin/src/it/{cucumber-pom => cucumber-pom-skip}/test.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-pom => cucumber-pom-skip}/verify.bsh (100%)
rename cucumber-maven-plugin/src/it/{cucumber-somewhere => cucumber-somewhere-skip}/invoker.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-somewhere => cucumber-somewhere-skip}/pom.xml (100%)
rename cucumber-maven-plugin/src/it/{cucumber-somewhere => cucumber-somewhere-skip}/somewhere/features/simplest.feature (100%)
rename cucumber-maven-plugin/src/it/{cucumber-somewhere => cucumber-somewhere-skip}/somewhere/features/step_definitions/simplest_steps.rb (100%)
rename cucumber-maven-plugin/src/it/{cucumber-somewhere => cucumber-somewhere-skip}/test.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-somewhere => cucumber-somewhere-skip}/verify.bsh (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-18and19-156_161 => rspec-failure-18and19-156_161-skip}/invoker.properties (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-18and19-156_161 => rspec-failure-18and19-156_161-skip}/pom.xml (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-18and19-156_161 => rspec-failure-18and19-156_161-skip}/spec/success_spec.rb (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-18and19-156_161 => rspec-failure-18and19-156_161-skip}/test.properties (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-18and19-156_161 => rspec-failure-18and19-156_161-skip}/verify.bsh (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-19 => rspec-failure-19-skip}/invoker.properties (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-19 => rspec-failure-19-skip}/pom.xml (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-19 => rspec-failure-19-skip}/spec/failure_spec.rb (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-19 => rspec-failure-19-skip}/test.properties (100%)
rename rspec-maven-plugin/src/it/{rspec-failure-19 => rspec-failure-19-skip}/verify.bsh (100%)
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure-19/features/simplest.feature b/cucumber-maven-plugin/src/it/cucumber-failure-19-skip/features/simplest.feature
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure-19/features/simplest.feature
rename to cucumber-maven-plugin/src/it/cucumber-failure-19-skip/features/simplest.feature
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure-19/features/step_definitions/simplest_steps.rb b/cucumber-maven-plugin/src/it/cucumber-failure-19-skip/features/step_definitions/simplest_steps.rb
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure-19/features/step_definitions/simplest_steps.rb
rename to cucumber-maven-plugin/src/it/cucumber-failure-19-skip/features/step_definitions/simplest_steps.rb
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure-19/invoker.properties b/cucumber-maven-plugin/src/it/cucumber-failure-19-skip/invoker.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure-19/invoker.properties
rename to cucumber-maven-plugin/src/it/cucumber-failure-19-skip/invoker.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure-19/pom.xml b/cucumber-maven-plugin/src/it/cucumber-failure-19-skip/pom.xml
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure-19/pom.xml
rename to cucumber-maven-plugin/src/it/cucumber-failure-19-skip/pom.xml
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure-19/test.properties b/cucumber-maven-plugin/src/it/cucumber-failure-19-skip/test.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure-19/test.properties
rename to cucumber-maven-plugin/src/it/cucumber-failure-19-skip/test.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure-19/verify.bsh b/cucumber-maven-plugin/src/it/cucumber-failure-19-skip/verify.bsh
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure-19/verify.bsh
rename to cucumber-maven-plugin/src/it/cucumber-failure-19-skip/verify.bsh
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure/features/simplest.feature b/cucumber-maven-plugin/src/it/cucumber-failure-skip/features/simplest.feature
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure/features/simplest.feature
rename to cucumber-maven-plugin/src/it/cucumber-failure-skip/features/simplest.feature
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure/features/step_definitions/simplest_steps.rb b/cucumber-maven-plugin/src/it/cucumber-failure-skip/features/step_definitions/simplest_steps.rb
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure/features/step_definitions/simplest_steps.rb
rename to cucumber-maven-plugin/src/it/cucumber-failure-skip/features/step_definitions/simplest_steps.rb
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure/invoker.properties b/cucumber-maven-plugin/src/it/cucumber-failure-skip/invoker.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure/invoker.properties
rename to cucumber-maven-plugin/src/it/cucumber-failure-skip/invoker.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure/pom.xml b/cucumber-maven-plugin/src/it/cucumber-failure-skip/pom.xml
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure/pom.xml
rename to cucumber-maven-plugin/src/it/cucumber-failure-skip/pom.xml
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure/test.properties b/cucumber-maven-plugin/src/it/cucumber-failure-skip/test.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure/test.properties
rename to cucumber-maven-plugin/src/it/cucumber-failure-skip/test.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-failure/verify.bsh b/cucumber-maven-plugin/src/it/cucumber-failure-skip/verify.bsh
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-failure/verify.bsh
rename to cucumber-maven-plugin/src/it/cucumber-failure-skip/verify.bsh
diff --git a/cucumber-maven-plugin/src/it/cucumber-pom/features/simplest.feature b/cucumber-maven-plugin/src/it/cucumber-pom-skip/features/simplest.feature
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-pom/features/simplest.feature
rename to cucumber-maven-plugin/src/it/cucumber-pom-skip/features/simplest.feature
diff --git a/cucumber-maven-plugin/src/it/cucumber-pom/features/step_definitions/simplest_steps.rb b/cucumber-maven-plugin/src/it/cucumber-pom-skip/features/step_definitions/simplest_steps.rb
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-pom/features/step_definitions/simplest_steps.rb
rename to cucumber-maven-plugin/src/it/cucumber-pom-skip/features/step_definitions/simplest_steps.rb
diff --git a/cucumber-maven-plugin/src/it/cucumber-pom/invoker.properties b/cucumber-maven-plugin/src/it/cucumber-pom-skip/invoker.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-pom/invoker.properties
rename to cucumber-maven-plugin/src/it/cucumber-pom-skip/invoker.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-pom/pom.xml b/cucumber-maven-plugin/src/it/cucumber-pom-skip/pom.xml
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-pom/pom.xml
rename to cucumber-maven-plugin/src/it/cucumber-pom-skip/pom.xml
diff --git a/cucumber-maven-plugin/src/it/cucumber-pom/test.properties b/cucumber-maven-plugin/src/it/cucumber-pom-skip/test.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-pom/test.properties
rename to cucumber-maven-plugin/src/it/cucumber-pom-skip/test.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-pom/verify.bsh b/cucumber-maven-plugin/src/it/cucumber-pom-skip/verify.bsh
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-pom/verify.bsh
rename to cucumber-maven-plugin/src/it/cucumber-pom-skip/verify.bsh
diff --git a/cucumber-maven-plugin/src/it/cucumber-somewhere/invoker.properties b/cucumber-maven-plugin/src/it/cucumber-somewhere-skip/invoker.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-somewhere/invoker.properties
rename to cucumber-maven-plugin/src/it/cucumber-somewhere-skip/invoker.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-somewhere/pom.xml b/cucumber-maven-plugin/src/it/cucumber-somewhere-skip/pom.xml
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-somewhere/pom.xml
rename to cucumber-maven-plugin/src/it/cucumber-somewhere-skip/pom.xml
diff --git a/cucumber-maven-plugin/src/it/cucumber-somewhere/somewhere/features/simplest.feature b/cucumber-maven-plugin/src/it/cucumber-somewhere-skip/somewhere/features/simplest.feature
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-somewhere/somewhere/features/simplest.feature
rename to cucumber-maven-plugin/src/it/cucumber-somewhere-skip/somewhere/features/simplest.feature
diff --git a/cucumber-maven-plugin/src/it/cucumber-somewhere/somewhere/features/step_definitions/simplest_steps.rb b/cucumber-maven-plugin/src/it/cucumber-somewhere-skip/somewhere/features/step_definitions/simplest_steps.rb
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-somewhere/somewhere/features/step_definitions/simplest_steps.rb
rename to cucumber-maven-plugin/src/it/cucumber-somewhere-skip/somewhere/features/step_definitions/simplest_steps.rb
diff --git a/cucumber-maven-plugin/src/it/cucumber-somewhere/test.properties b/cucumber-maven-plugin/src/it/cucumber-somewhere-skip/test.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-somewhere/test.properties
rename to cucumber-maven-plugin/src/it/cucumber-somewhere-skip/test.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-somewhere/verify.bsh b/cucumber-maven-plugin/src/it/cucumber-somewhere-skip/verify.bsh
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-somewhere/verify.bsh
rename to cucumber-maven-plugin/src/it/cucumber-somewhere-skip/verify.bsh
diff --git a/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/invoker.properties b/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/invoker.properties
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/invoker.properties
rename to rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/invoker.properties
diff --git a/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/pom.xml b/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/pom.xml
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/pom.xml
rename to rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/pom.xml
diff --git a/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/spec/success_spec.rb b/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/spec/success_spec.rb
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/spec/success_spec.rb
rename to rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/spec/success_spec.rb
diff --git a/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/test.properties b/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/test.properties
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/test.properties
rename to rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/test.properties
diff --git a/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/verify.bsh b/rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/verify.bsh
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-18and19-156_161/verify.bsh
rename to rspec-maven-plugin/src/it/rspec-failure-18and19-156_161-skip/verify.bsh
diff --git a/rspec-maven-plugin/src/it/rspec-failure-19/invoker.properties b/rspec-maven-plugin/src/it/rspec-failure-19-skip/invoker.properties
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-19/invoker.properties
rename to rspec-maven-plugin/src/it/rspec-failure-19-skip/invoker.properties
diff --git a/rspec-maven-plugin/src/it/rspec-failure-19/pom.xml b/rspec-maven-plugin/src/it/rspec-failure-19-skip/pom.xml
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-19/pom.xml
rename to rspec-maven-plugin/src/it/rspec-failure-19-skip/pom.xml
diff --git a/rspec-maven-plugin/src/it/rspec-failure-19/spec/failure_spec.rb b/rspec-maven-plugin/src/it/rspec-failure-19-skip/spec/failure_spec.rb
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-19/spec/failure_spec.rb
rename to rspec-maven-plugin/src/it/rspec-failure-19-skip/spec/failure_spec.rb
diff --git a/rspec-maven-plugin/src/it/rspec-failure-19/test.properties b/rspec-maven-plugin/src/it/rspec-failure-19-skip/test.properties
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-19/test.properties
rename to rspec-maven-plugin/src/it/rspec-failure-19-skip/test.properties
diff --git a/rspec-maven-plugin/src/it/rspec-failure-19/verify.bsh b/rspec-maven-plugin/src/it/rspec-failure-19-skip/verify.bsh
similarity index 100%
rename from rspec-maven-plugin/src/it/rspec-failure-19/verify.bsh
rename to rspec-maven-plugin/src/it/rspec-failure-19-skip/verify.bsh
--
GitLab
From f4b5f2c7808f52abf486accc77f512cdbde0fb17 Mon Sep 17 00:00:00 2001
From: Christian Meier <meier.kristian@gmail.com>
Date: Wed, 22 Apr 2020 09:46:20 +0200
Subject: [PATCH 3/6] skip broken ITs
---
.../src/it/{bundler-pom => bundler-pom-skip}/Gemfile | 0
.../src/it/{bundler-pom => bundler-pom-skip}/invoker.properties | 0
.../src/it/{bundler-pom => bundler-pom-skip}/pom.xml | 0
.../src/it/{bundler-pom => bundler-pom-skip}/setup.bsh | 0
.../src/it/{bundler-pom => bundler-pom-skip}/verify.bsh | 0
rake-maven-plugin/src/it/{rake-file => rake-file-skip}/file | 0
.../src/it/{rake-file => rake-file-skip}/invoker.properties | 0
rake-maven-plugin/src/it/{rake-file => rake-file-skip}/pom.xml | 0
.../src/it/{rake-file => rake-file-skip}/test.properties | 0
rake-maven-plugin/src/it/{rake-file => rake-file-skip}/verify.bsh | 0
.../src/it/{rake-tasks => rake-tasks-skip}/invoker.properties | 0
rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/pom.xml | 0
rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/rakefile | 0
.../src/it/{rake-tasks => rake-tasks-skip}/test.properties | 0
.../src/it/{rake-tasks => rake-tasks-skip}/verify.bsh | 0
15 files changed, 0 insertions(+), 0 deletions(-)
rename bundler-maven-plugin/src/it/{bundler-pom => bundler-pom-skip}/Gemfile (100%)
rename bundler-maven-plugin/src/it/{bundler-pom => bundler-pom-skip}/invoker.properties (100%)
rename bundler-maven-plugin/src/it/{bundler-pom => bundler-pom-skip}/pom.xml (100%)
rename bundler-maven-plugin/src/it/{bundler-pom => bundler-pom-skip}/setup.bsh (100%)
rename bundler-maven-plugin/src/it/{bundler-pom => bundler-pom-skip}/verify.bsh (100%)
rename rake-maven-plugin/src/it/{rake-file => rake-file-skip}/file (100%)
rename rake-maven-plugin/src/it/{rake-file => rake-file-skip}/invoker.properties (100%)
rename rake-maven-plugin/src/it/{rake-file => rake-file-skip}/pom.xml (100%)
rename rake-maven-plugin/src/it/{rake-file => rake-file-skip}/test.properties (100%)
rename rake-maven-plugin/src/it/{rake-file => rake-file-skip}/verify.bsh (100%)
rename rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/invoker.properties (100%)
rename rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/pom.xml (100%)
rename rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/rakefile (100%)
rename rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/test.properties (100%)
rename rake-maven-plugin/src/it/{rake-tasks => rake-tasks-skip}/verify.bsh (100%)
diff --git a/bundler-maven-plugin/src/it/bundler-pom/Gemfile b/bundler-maven-plugin/src/it/bundler-pom-skip/Gemfile
similarity index 100%
rename from bundler-maven-plugin/src/it/bundler-pom/Gemfile
rename to bundler-maven-plugin/src/it/bundler-pom-skip/Gemfile
diff --git a/bundler-maven-plugin/src/it/bundler-pom/invoker.properties b/bundler-maven-plugin/src/it/bundler-pom-skip/invoker.properties
similarity index 100%
rename from bundler-maven-plugin/src/it/bundler-pom/invoker.properties
rename to bundler-maven-plugin/src/it/bundler-pom-skip/invoker.properties
diff --git a/bundler-maven-plugin/src/it/bundler-pom/pom.xml b/bundler-maven-plugin/src/it/bundler-pom-skip/pom.xml
similarity index 100%
rename from bundler-maven-plugin/src/it/bundler-pom/pom.xml
rename to bundler-maven-plugin/src/it/bundler-pom-skip/pom.xml
diff --git a/bundler-maven-plugin/src/it/bundler-pom/setup.bsh b/bundler-maven-plugin/src/it/bundler-pom-skip/setup.bsh
similarity index 100%
rename from bundler-maven-plugin/src/it/bundler-pom/setup.bsh
rename to bundler-maven-plugin/src/it/bundler-pom-skip/setup.bsh
diff --git a/bundler-maven-plugin/src/it/bundler-pom/verify.bsh b/bundler-maven-plugin/src/it/bundler-pom-skip/verify.bsh
similarity index 100%
rename from bundler-maven-plugin/src/it/bundler-pom/verify.bsh
rename to bundler-maven-plugin/src/it/bundler-pom-skip/verify.bsh
diff --git a/rake-maven-plugin/src/it/rake-file/file b/rake-maven-plugin/src/it/rake-file-skip/file
similarity index 100%
rename from rake-maven-plugin/src/it/rake-file/file
rename to rake-maven-plugin/src/it/rake-file-skip/file
diff --git a/rake-maven-plugin/src/it/rake-file/invoker.properties b/rake-maven-plugin/src/it/rake-file-skip/invoker.properties
similarity index 100%
rename from rake-maven-plugin/src/it/rake-file/invoker.properties
rename to rake-maven-plugin/src/it/rake-file-skip/invoker.properties
diff --git a/rake-maven-plugin/src/it/rake-file/pom.xml b/rake-maven-plugin/src/it/rake-file-skip/pom.xml
similarity index 100%
rename from rake-maven-plugin/src/it/rake-file/pom.xml
rename to rake-maven-plugin/src/it/rake-file-skip/pom.xml
diff --git a/rake-maven-plugin/src/it/rake-file/test.properties b/rake-maven-plugin/src/it/rake-file-skip/test.properties
similarity index 100%
rename from rake-maven-plugin/src/it/rake-file/test.properties
rename to rake-maven-plugin/src/it/rake-file-skip/test.properties
diff --git a/rake-maven-plugin/src/it/rake-file/verify.bsh b/rake-maven-plugin/src/it/rake-file-skip/verify.bsh
similarity index 100%
rename from rake-maven-plugin/src/it/rake-file/verify.bsh
rename to rake-maven-plugin/src/it/rake-file-skip/verify.bsh
diff --git a/rake-maven-plugin/src/it/rake-tasks/invoker.properties b/rake-maven-plugin/src/it/rake-tasks-skip/invoker.properties
similarity index 100%
rename from rake-maven-plugin/src/it/rake-tasks/invoker.properties
rename to rake-maven-plugin/src/it/rake-tasks-skip/invoker.properties
diff --git a/rake-maven-plugin/src/it/rake-tasks/pom.xml b/rake-maven-plugin/src/it/rake-tasks-skip/pom.xml
similarity index 100%
rename from rake-maven-plugin/src/it/rake-tasks/pom.xml
rename to rake-maven-plugin/src/it/rake-tasks-skip/pom.xml
diff --git a/rake-maven-plugin/src/it/rake-tasks/rakefile b/rake-maven-plugin/src/it/rake-tasks-skip/rakefile
similarity index 100%
rename from rake-maven-plugin/src/it/rake-tasks/rakefile
rename to rake-maven-plugin/src/it/rake-tasks-skip/rakefile
diff --git a/rake-maven-plugin/src/it/rake-tasks/test.properties b/rake-maven-plugin/src/it/rake-tasks-skip/test.properties
similarity index 100%
rename from rake-maven-plugin/src/it/rake-tasks/test.properties
rename to rake-maven-plugin/src/it/rake-tasks-skip/test.properties
diff --git a/rake-maven-plugin/src/it/rake-tasks/verify.bsh b/rake-maven-plugin/src/it/rake-tasks-skip/verify.bsh
similarity index 100%
rename from rake-maven-plugin/src/it/rake-tasks/verify.bsh
rename to rake-maven-plugin/src/it/rake-tasks-skip/verify.bsh
--
GitLab
From 03d6600db5c08f197d0e8bddf563902470b5f250 Mon Sep 17 00:00:00 2001
From: Christian Meier <meier.kristian@gmail.com>
Date: Wed, 22 Apr 2020 09:46:56 +0200
Subject: [PATCH 4/6] depreacte with warning bunlder,cucumber,rake
---
.../src/main/java/de/saumya/mojo/bundler/InstallMojo.java | 3 ++-
.../src/main/java/de/saumya/mojo/bundler/UpdateMojo.java | 2 ++
.../src/main/java/de/saumya/mojo/cucumber/CucumberMojo.java | 2 ++
.../src/main/java/de/saumya/mojo/rake/RakeMojo.java | 1 +
4 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java b/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
index c46bf397..f27f380e 100644
--- a/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
+++ b/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
@@ -25,6 +25,7 @@ import de.saumya.mojo.ruby.script.ScriptException;
* maven wrapper around the bundler install command.
*/
@Mojo(name = "install", defaultPhase = LifecyclePhase.INITIALIZE, requiresDependencyResolution = ResolutionScope.TEST)
+@Deprecated
public class InstallMojo extends AbstractGemMojo {
/**
@@ -99,7 +100,7 @@ public class InstallMojo extends AbstractGemMojo {
@Override
public void executeWithGems() throws MojoExecutionException,
ScriptException, IOException, GemException {
- if(project.getFile() != null){
+ logger.warn("bundler-maven-plugin is deprecated and is not maintained anymore"); if(project.getFile() != null){
String pomSha1 = sha1(FileUtils.fileRead(project.getFile()));
File sha1 = new File(project.getBuild().getDirectory(), project.getFile().getName() + ".sha1");
if(sha1.exists()){
diff --git a/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/UpdateMojo.java b/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/UpdateMojo.java
index 924a9d6c..6aae2f8e 100644
--- a/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/UpdateMojo.java
+++ b/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/UpdateMojo.java
@@ -17,6 +17,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
* maven wrapper around the bundler update command.
*/
@Mojo(name = "update", defaultPhase = LifecyclePhase.INITIALIZE, requiresDependencyResolution = ResolutionScope.TEST)
+@Deprecated
public class UpdateMojo extends AbstractGemMojo {
/**
@@ -29,6 +30,7 @@ public class UpdateMojo extends AbstractGemMojo {
@Override
public void executeWithGems() throws MojoExecutionException,
ScriptException, IOException, GemException {
+ logger.warn("bundler-maven-plugin is deprecated and is not maintained anymore");
final Script script = this.factory.newScriptFromSearchPath("bundle");
script.addArg("update");
if (this.bundlerArgs != null) {
diff --git a/cucumber-maven-plugin/src/main/java/de/saumya/mojo/cucumber/CucumberMojo.java b/cucumber-maven-plugin/src/main/java/de/saumya/mojo/cucumber/CucumberMojo.java
index d57cc44c..1ad464c5 100644
--- a/cucumber-maven-plugin/src/main/java/de/saumya/mojo/cucumber/CucumberMojo.java
+++ b/cucumber-maven-plugin/src/main/java/de/saumya/mojo/cucumber/CucumberMojo.java
@@ -24,6 +24,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
* maven wrapper around the cucumber command.
*/
@Mojo(name = "test", defaultPhase = LifecyclePhase.TEST, requiresDependencyResolution = ResolutionScope.TEST)
+@Deprecated
public class CucumberMojo extends AbstractTestMojo {
enum ResultEnum {
@@ -50,6 +51,7 @@ public class CucumberMojo extends AbstractTestMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
+ logger.warn("cucumber-maven-plugin is deprecated and is not maintained anymore");
if (this.skip || this.skipTests || this.skipCucumber) {
getLog().info("Skipping Cucumber tests");
}
diff --git a/rake-maven-plugin/src/main/java/de/saumya/mojo/rake/RakeMojo.java b/rake-maven-plugin/src/main/java/de/saumya/mojo/rake/RakeMojo.java
index 42db0505..cf0c4865 100644
--- a/rake-maven-plugin/src/main/java/de/saumya/mojo/rake/RakeMojo.java
+++ b/rake-maven-plugin/src/main/java/de/saumya/mojo/rake/RakeMojo.java
@@ -37,6 +37,7 @@ public class RakeMojo extends AbstractGemMojo {
@Override
public void executeWithGems() throws MojoExecutionException,
ScriptException, IOException, GemException {
+ logger.warn("rake-maven-plugin is deprecated and is not maintained anymore");
final Script script = this.factory.newScriptFromJRubyJar("rake");
if (this.rakefile != null){
script.addArg("-f", this.rakefile);
--
GitLab
From 92ce8658683c253578a2daf0cc1dadb522614271 Mon Sep 17 00:00:00 2001
From: Christian Meier <meier.kristian@gmail.com>
Date: Wed, 29 Apr 2020 11:30:01 +0200
Subject: [PATCH 5/6] fix most tests
---
.../src/main/java/de/saumya/mojo/bundler/InstallMojo.java | 3 ++-
.../features/simplest.feature | 0
.../features/step_definitions/simplest_steps.rb | 0
.../invoker.properties | 0
.../pom.xml | 0
.../test.properties | 0
.../verify.bsh | 0
.../invoker.properties | 0
.../{minitest-failure-19 => minitest-failure-19-skip}/pom.xml | 0
.../test.properties | 0
.../test/simple_test.rb | 0
.../verify.bsh | 0
.../src/it/minitest-from-jruby/test.properties | 2 ++
runit-maven-plugin/src/it/runit-failure-19/test.properties | 3 ++-
runit-maven-plugin/src/it/runit-failure/test.properties | 1 +
runit-maven-plugin/src/it/runit-pom/test.properties | 1 +
runit-maven-plugin/src/it/runit-somewhere/test.properties | 1 +
runit-maven-plugin/src/it/runit-summary-report/test.properties | 1 +
.../src/main/java/de/saumya/mojo/runit/RUnitMojo.java | 3 ++-
19 files changed, 12 insertions(+), 3 deletions(-)
rename cucumber-maven-plugin/src/it/{cucumber-summary-report => cucumber-summary-report-skip}/features/simplest.feature (100%)
rename cucumber-maven-plugin/src/it/{cucumber-summary-report => cucumber-summary-report-skip}/features/step_definitions/simplest_steps.rb (100%)
rename cucumber-maven-plugin/src/it/{cucumber-summary-report => cucumber-summary-report-skip}/invoker.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-summary-report => cucumber-summary-report-skip}/pom.xml (100%)
rename cucumber-maven-plugin/src/it/{cucumber-summary-report => cucumber-summary-report-skip}/test.properties (100%)
rename cucumber-maven-plugin/src/it/{cucumber-summary-report => cucumber-summary-report-skip}/verify.bsh (100%)
rename minitest-maven-plugin/src/it/{minitest-failure-19 => minitest-failure-19-skip}/invoker.properties (100%)
rename minitest-maven-plugin/src/it/{minitest-failure-19 => minitest-failure-19-skip}/pom.xml (100%)
rename minitest-maven-plugin/src/it/{minitest-failure-19 => minitest-failure-19-skip}/test.properties (100%)
rename minitest-maven-plugin/src/it/{minitest-failure-19 => minitest-failure-19-skip}/test/simple_test.rb (100%)
rename minitest-maven-plugin/src/it/{minitest-failure-19 => minitest-failure-19-skip}/verify.bsh (100%)
create mode 100644 minitest-maven-plugin/src/it/minitest-from-jruby/test.properties
create mode 100644 runit-maven-plugin/src/it/runit-failure/test.properties
create mode 100644 runit-maven-plugin/src/it/runit-pom/test.properties
create mode 100644 runit-maven-plugin/src/it/runit-somewhere/test.properties
create mode 100644 runit-maven-plugin/src/it/runit-summary-report/test.properties
diff --git a/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java b/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
index f27f380e..67eae2a6 100644
--- a/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
+++ b/bundler-maven-plugin/src/main/java/de/saumya/mojo/bundler/InstallMojo.java
@@ -100,7 +100,8 @@ public class InstallMojo extends AbstractGemMojo {
@Override
public void executeWithGems() throws MojoExecutionException,
ScriptException, IOException, GemException {
- logger.warn("bundler-maven-plugin is deprecated and is not maintained anymore"); if(project.getFile() != null){
+ logger.warn("bundler-maven-plugin is deprecated and is not maintained anymore");
+ if(project.getFile() != null){
String pomSha1 = sha1(FileUtils.fileRead(project.getFile()));
File sha1 = new File(project.getBuild().getDirectory(), project.getFile().getName() + ".sha1");
if(sha1.exists()){
diff --git a/cucumber-maven-plugin/src/it/cucumber-summary-report/features/simplest.feature b/cucumber-maven-plugin/src/it/cucumber-summary-report-skip/features/simplest.feature
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-summary-report/features/simplest.feature
rename to cucumber-maven-plugin/src/it/cucumber-summary-report-skip/features/simplest.feature
diff --git a/cucumber-maven-plugin/src/it/cucumber-summary-report/features/step_definitions/simplest_steps.rb b/cucumber-maven-plugin/src/it/cucumber-summary-report-skip/features/step_definitions/simplest_steps.rb
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-summary-report/features/step_definitions/simplest_steps.rb
rename to cucumber-maven-plugin/src/it/cucumber-summary-report-skip/features/step_definitions/simplest_steps.rb
diff --git a/cucumber-maven-plugin/src/it/cucumber-summary-report/invoker.properties b/cucumber-maven-plugin/src/it/cucumber-summary-report-skip/invoker.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-summary-report/invoker.properties
rename to cucumber-maven-plugin/src/it/cucumber-summary-report-skip/invoker.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-summary-report/pom.xml b/cucumber-maven-plugin/src/it/cucumber-summary-report-skip/pom.xml
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-summary-report/pom.xml
rename to cucumber-maven-plugin/src/it/cucumber-summary-report-skip/pom.xml
diff --git a/cucumber-maven-plugin/src/it/cucumber-summary-report/test.properties b/cucumber-maven-plugin/src/it/cucumber-summary-report-skip/test.properties
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-summary-report/test.properties
rename to cucumber-maven-plugin/src/it/cucumber-summary-report-skip/test.properties
diff --git a/cucumber-maven-plugin/src/it/cucumber-summary-report/verify.bsh b/cucumber-maven-plugin/src/it/cucumber-summary-report-skip/verify.bsh
similarity index 100%
rename from cucumber-maven-plugin/src/it/cucumber-summary-report/verify.bsh
rename to cucumber-maven-plugin/src/it/cucumber-summary-report-skip/verify.bsh
diff --git a/minitest-maven-plugin/src/it/minitest-failure-19/invoker.properties b/minitest-maven-plugin/src/it/minitest-failure-19-skip/invoker.properties
similarity index 100%
rename from minitest-maven-plugin/src/it/minitest-failure-19/invoker.properties
rename to minitest-maven-plugin/src/it/minitest-failure-19-skip/invoker.properties
diff --git a/minitest-maven-plugin/src/it/minitest-failure-19/pom.xml b/minitest-maven-plugin/src/it/minitest-failure-19-skip/pom.xml
similarity index 100%
rename from minitest-maven-plugin/src/it/minitest-failure-19/pom.xml
rename to minitest-maven-plugin/src/it/minitest-failure-19-skip/pom.xml
diff --git a/minitest-maven-plugin/src/it/minitest-failure-19/test.properties b/minitest-maven-plugin/src/it/minitest-failure-19-skip/test.properties
similarity index 100%
rename from minitest-maven-plugin/src/it/minitest-failure-19/test.properties
rename to minitest-maven-plugin/src/it/minitest-failure-19-skip/test.properties
diff --git a/minitest-maven-plugin/src/it/minitest-failure-19/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-failure-19-skip/test/simple_test.rb
similarity index 100%
rename from minitest-maven-plugin/src/it/minitest-failure-19/test/simple_test.rb
rename to minitest-maven-plugin/src/it/minitest-failure-19-skip/test/simple_test.rb
diff --git a/minitest-maven-plugin/src/it/minitest-failure-19/verify.bsh b/minitest-maven-plugin/src/it/minitest-failure-19-skip/verify.bsh
similarity index 100%
rename from minitest-maven-plugin/src/it/minitest-failure-19/verify.bsh
rename to minitest-maven-plugin/src/it/minitest-failure-19-skip/verify.bsh
diff --git a/minitest-maven-plugin/src/it/minitest-from-jruby/test.properties b/minitest-maven-plugin/src/it/minitest-from-jruby/test.properties
new file mode 100644
index 00000000..926f8e04
--- /dev/null
+++ b/minitest-maven-plugin/src/it/minitest-from-jruby/test.properties
@@ -0,0 +1,2 @@
+jruby.version=1.7.5
+jruby.verbose=true
diff --git a/runit-maven-plugin/src/it/runit-failure-19/test.properties b/runit-maven-plugin/src/it/runit-failure-19/test.properties
index 95cbf1ae..6705edf6 100644
--- a/runit-maven-plugin/src/it/runit-failure-19/test.properties
+++ b/runit-maven-plugin/src/it/runit-failure-19/test.properties
@@ -1 +1,2 @@
-jruby.switches=--1.9
\ No newline at end of file
+jruby.switches=--1.9
+jruby.version=1.7.5
\ No newline at end of file
diff --git a/runit-maven-plugin/src/it/runit-failure/test.properties b/runit-maven-plugin/src/it/runit-failure/test.properties
new file mode 100644
index 00000000..f9a2e870
--- /dev/null
+++ b/runit-maven-plugin/src/it/runit-failure/test.properties
@@ -0,0 +1 @@
+jruby.version=1.7.5
\ No newline at end of file
diff --git a/runit-maven-plugin/src/it/runit-pom/test.properties b/runit-maven-plugin/src/it/runit-pom/test.properties
new file mode 100644
index 00000000..f9a2e870
--- /dev/null
+++ b/runit-maven-plugin/src/it/runit-pom/test.properties
@@ -0,0 +1 @@
+jruby.version=1.7.5
\ No newline at end of file
diff --git a/runit-maven-plugin/src/it/runit-somewhere/test.properties b/runit-maven-plugin/src/it/runit-somewhere/test.properties
new file mode 100644
index 00000000..f9a2e870
--- /dev/null
+++ b/runit-maven-plugin/src/it/runit-somewhere/test.properties
@@ -0,0 +1 @@
+jruby.version=1.7.5
\ No newline at end of file
diff --git a/runit-maven-plugin/src/it/runit-summary-report/test.properties b/runit-maven-plugin/src/it/runit-summary-report/test.properties
new file mode 100644
index 00000000..f9a2e870
--- /dev/null
+++ b/runit-maven-plugin/src/it/runit-summary-report/test.properties
@@ -0,0 +1 @@
+jruby.version=1.7.5
\ No newline at end of file
diff --git a/runit-maven-plugin/src/main/java/de/saumya/mojo/runit/RUnitMojo.java b/runit-maven-plugin/src/main/java/de/saumya/mojo/runit/RUnitMojo.java
index bcf5974d..0c4c9b9e 100644
--- a/runit-maven-plugin/src/main/java/de/saumya/mojo/runit/RUnitMojo.java
+++ b/runit-maven-plugin/src/main/java/de/saumya/mojo/runit/RUnitMojo.java
@@ -53,7 +53,8 @@ public class RUnitMojo extends AbstractTestMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
- if (this.skip || this.skipTests || this.skipRunit) {
+ logger.warn("runit-maven-plugin is deprecated and is not maintained anymore");
+ if (this.skip || this.skipTests || this.skipRunit) {
getLog().info("Skipping RUnit tests");
return;
} else {
--
GitLab
From eb28c81746c3a123b708be57090b9b6ae28e0764 Mon Sep 17 00:00:00 2001
From: Christian Meier <meier.kristian@gmail.com>
Date: Wed, 29 Apr 2020 11:30:21 +0200
Subject: [PATCH 6/6] ignore idea
---
.gitignore | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index aaf23d24..f976ffb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,7 @@ target
tmp
*Backup
release.properties
+<<<<<<< HEAD
.idea/
-*.iml
\ No newline at end of file
+*.iml
+.idea
--
GitLab