Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ target
tmp
*Backup
release.properties
<<<<<<< HEAD
.idea/
*.iml
*.iml
.idea
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* maven wrapper around the bundler install command.
*/
@Mojo(name = "install", defaultPhase = LifecyclePhase.INITIALIZE, requiresDependencyResolution = ResolutionScope.TEST)
@Deprecated
public class InstallMojo extends AbstractGemMojo {

/**
Expand Down Expand Up @@ -99,7 +100,8 @@ else if(b < 16) {
@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()){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* maven wrapper around the bundler update command.
*/
@Mojo(name = "update", defaultPhase = LifecyclePhase.INITIALIZE, requiresDependencyResolution = ResolutionScope.TEST)
@Deprecated
public class UpdateMojo extends AbstractGemMojo {

/**
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* maven wrapper around the cucumber command.
*/
@Mojo(name = "test", defaultPhase = LifecyclePhase.TEST, requiresDependencyResolution = ResolutionScope.TEST)
@Deprecated
public class CucumberMojo extends AbstractTestMojo {

enum ResultEnum {
Expand All @@ -50,6 +51,7 @@ enum ResultEnum {

@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");
}
Expand Down
2 changes: 1 addition & 1 deletion jruby-maven-plugin/src/it/compile-failures/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "'" );
Expand Down
9 changes: 4 additions & 5 deletions jruby-maven-plugin/src/it/compile-verbose/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "'" );
}
throw new RuntimeException( "class file does not exists '" + file + "'" );
}
4 changes: 2 additions & 2 deletions jruby-maven-plugin/src/it/jruby-version/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -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 + "'" );
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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";


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jruby.version=1.7.5
jruby.verbose=true
1 change: 1 addition & 0 deletions parent-mojo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@
<preBuildHookScript>setup.bsh</preBuildHookScript>
<postBuildHookScript>verify.bsh</postBuildHookScript>
<streamLogs>true</streamLogs>
<pomExcludes>*-skip/pom.xml</pomExcludes>
</configuration>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion runit-maven-plugin/src/it/runit-failure-19/test.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
jruby.switches=--1.9
jruby.switches=--1.9
jruby.version=1.7.5
1 change: 1 addition & 0 deletions runit-maven-plugin/src/it/runit-failure/test.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jruby.version=1.7.5
1 change: 1 addition & 0 deletions runit-maven-plugin/src/it/runit-pom/test.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jruby.version=1.7.5
1 change: 1 addition & 0 deletions runit-maven-plugin/src/it/runit-somewhere/test.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jruby.version=1.7.5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
jruby.version=1.7.5
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ enum ResultEnum {

@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 {
Expand Down