Skip to content

Commit b453266

Browse files
authored
Merge pull request #106 from abelsromero/fix-compatibility-with-jruby-9-2-10-0-or-higher
adds compatibility to install gems with jruby > 9.2.10.x
2 parents 3688ff9 + a9194eb commit b453266

File tree

64 files changed

+907
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+907
-236
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ target
77
tmp
88
*Backup
99
release.properties
10+
.idea/
11+
*.iml

bundler-maven-plugin/src/it/bundler-pom/verify.bsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import org.codehaus.plexus.util.FileUtils;
55
File f = new File( basedir, "Gemfile.lock" );
66
if ( !f.exists() )
77
{
8-
throw new RuntimeException( "file does not exists: " + f );
8+
throw new RuntimeException( "file does not exist: " + f );
99
}

cucumber-maven-plugin/src/it/cucumber-summary-report/verify.bsh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ if ( !log.contains( expected ) )
1111
File file = new File( basedir, "target/surefire-reports/TEST-simplest-1.6.5--1.8.xml");
1212
if ( !file.exists() )
1313
{
14-
throw new RuntimeException( "file does not exists: '" + file.getAbsolutePath() + "'" );
14+
throw new RuntimeException( "file does not exist: '" + file.getAbsolutePath() + "'" );
1515
}
1616

1717
file = new File( basedir, "target/summary.xml");
1818
if ( !file.exists() )
1919
{
20-
throw new RuntimeException( "file does not exists: '" + file.getAbsolutePath() + "'" );
20+
throw new RuntimeException( "file does not exist: '" + file.getAbsolutePath() + "'" );
2121
}
Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
import java.io.*;
2+
import java.util.*;
23
import org.codehaus.plexus.util.FileUtils;
34

45

56
String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
6-
String expected = "Successfully installed compass-";
7-
if ( !log.contains( expected ) )
8-
{
9-
throw new RuntimeException( "log file does not contain '" + expected + "'" );
10-
}
11-
expected = "Successfully installed sass-";
12-
if ( !log.contains( expected ) )
13-
{
14-
throw new RuntimeException( "log file does not contain '" + expected + "'" );
15-
}
16-
expected = "Individual stylesheets must be in the sass directory.";
17-
if ( !log.contains( expected ) )
7+
8+
String installMessage = "Successfully installed ";
9+
String[] expectedGems = new String[] { "compass-", "sass-", "rb-inotify-" };
10+
11+
for ( String expectedGem: expectedGems )
1812
{
19-
throw new RuntimeException( "log file does not contain '" + expected + "'" );
13+
String expected = installMessage + expectedGem;
14+
if ( !log.contains( expected ) )
15+
{
16+
throw new RuntimeException( "log file does not contain '" + expected + "'" );
17+
}
2018
}

gem-maven-plugin/src/it/gemfile-to-pom-forced/verify.bsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.codehaus.plexus.util.FileUtils;
55
File f = new File( basedir, "pom.xml" );
66
if ( !f.exists() )
77
{
8-
throw new RuntimeException( "file does not exists: " + f );
8+
throw new RuntimeException( "file does not exist: " + f );
99
}
1010
if ( f.lastModified() < new File( basedir, "timestamp" ).lastModified())
1111
{

gem-maven-plugin/src/it/gemfile-to-pom/verify.bsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import org.codehaus.plexus.util.FileUtils;
55
File f = new File( basedir, "pom.xml" );
66
if ( !f.exists() )
77
{
8-
throw new RuntimeException( "file does not exists: " + f );
8+
throw new RuntimeException( "file does not exist: " + f );
99
}

gem-maven-plugin/src/it/gemspec-to-pom-forced/verify.bsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.codehaus.plexus.util.FileUtils;
55
File f = new File( basedir, "pom.xml" );
66
if ( !f.exists() )
77
{
8-
throw new RuntimeException( "file does not exists: " + f );
8+
throw new RuntimeException( "file does not exist: " + f );
99
}
1010
if ( f.lastModified() < new File( basedir, "timestamp" ).lastModified())
1111
{

gem-maven-plugin/src/it/gemspec-to-pom/verify.bsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ import org.codehaus.plexus.util.FileUtils;
55
File f = new File( basedir, "pom.xml" );
66
if ( !f.exists() )
77
{
8-
throw new RuntimeException( "file does not exists: " + f );
8+
throw new RuntimeException( "file does not exist: " + f );
99
}

gem-maven-plugin/src/it/include-rubygems-in-test-resources-failure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.example</groupId>
6-
<artifactId>target/rubygems-in-test-resources</artifactId>
6+
<artifactId>rubygems-in-test-resources-failure</artifactId>
77
<version>testing</version>
88
<repositories>
99
<repository>

gem-maven-plugin/src/it/include-rubygems-in-test-resources/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<dependencies>
1515
<dependency>
1616
<groupId>rubygems</groupId>
17-
<artifactId>yard</artifactId>
18-
<version>0.8.0</version>
17+
<artifactId>sass</artifactId>
18+
<version>3.2.7</version>
1919
<type>gem</type>
2020
</dependency>
2121
<dependency>

0 commit comments

Comments
 (0)