Merge pull request #119 from deivid-rodriguez/fix_ci

mkristian · web-flow · commit d91511cd0355 · 2021-11-01T15:36:14.000+01:00
Restore java 8 support
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,14 +3,20 @@ name: CI
 on:
   push:
     branches:
-      - fix_ci
+      - master
 
   pull_request:
 
 jobs:
   ci:
     runs-on: ubuntu-20.04
 
+    strategy:
+      fail-fast: false
+
+      matrix:
+        java: [8, 11]
+
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -19,7 +25,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: zulu
-          java-version: 11
+          java-version: ${{ matrix.java }}
 
       - name: Install dependencies
         run: ./mvnw install -Dmaven.test.skip -Dinvoker.skip
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/gem-maven-plugin/src/it/gems-with-compile-test-and-provided-scope/pom.xml b/gem-maven-plugin/src/it/gems-with-compile-test-and-provided-scope/pom.xml
@@ -86,7 +86,7 @@
             <artifactItem>
               <groupId>org.jruby</groupId>
               <artifactId>jruby-complete</artifactId>
-              <version>9.2.18.0</version>
+              <version>9.2.19.0</version>
               <outputDirectory>${project.build.directory}</outputDirectory>
             </artifactItem>
           </artifactItems>
@@ -116,7 +116,7 @@
 	    <configuration>
 	      <arguments>
 		<argument>-cp</argument>
-		<argument>${project.build.directory}/jruby-complete-9.2.18.0.jar${path.separator}${project.build.directory}/gems-test-0.0.0.jar</argument>
+		<argument>${project.build.directory}/jruby-complete-9.2.19.0.jar${path.separator}${project.build.directory}/gems-test-0.0.0.jar</argument>
 		<argument>org.jruby.Main</argument>
 		<argument>-e</argument>
 		<argument>
@@ -138,7 +138,7 @@
 	  <dependency>
 	    <groupId>org.jruby</groupId>
 	    <artifactId>jruby-complete</artifactId>
-	    <version>9.2.18.0</version>
+	    <version>9.2.19.0</version>
 	    <type>jar</type>
 	  </dependency>
 	</dependencies>
diff --git a/gem-maven-plugin/src/it/include-rubygems-in-resources/pom.xml b/gem-maven-plugin/src/it/include-rubygems-in-resources/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby-complete</artifactId>
-            <version>9.2.18.0</version>
+            <version>9.2.19.0</version>
         </dependency>
     </dependencies>
 
diff --git a/gem-maven-plugin/src/it/include-rubygems-in-test-resources-failure/pom.xml b/gem-maven-plugin/src/it/include-rubygems-in-test-resources-failure/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>9.2.18.0</version>
+      <version>9.2.19.0</version>
     </dependency>
   </dependencies>
   <properties>
diff --git a/gem-maven-plugin/src/it/include-rubygems-in-test-resources/pom.xml b/gem-maven-plugin/src/it/include-rubygems-in-test-resources/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>9.2.18.0</version>
+      <version>9.2.19.0</version>
     </dependency>
   </dependencies>
   <properties>
diff --git a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java
@@ -181,6 +181,7 @@ public void executeJRuby() throws MojoExecutionException,
                 this.factory.newScriptFromJRubyJar("gem")
                         .addArg("build", this.gemspec)
                         .addArg("--backtrace")
+                        .addArg("--verbose")
                         .executeIn(launchDirectory());
 
                 File newPom = new File( this.gemspec.getParentFile(), "pom." + this.gemspec.getName() + ".xml");
@@ -391,6 +392,7 @@ else if ((Artifact.SCOPE_PROVIDED + Artifact.SCOPE_TEST).contains(dependency.get
         this.factory.newScriptFromJRubyJar("gem")
                 .addArg("build", gemSpec)
                 .addArg("--backtrace")
+                .addArg("--verbose")
                 .executeIn(gemDir);
 
         if ((!localGemspec.exists() || !FileUtils.contentEquals(localGemspec,
diff --git a/gem-proxy/pom.xml b/gem-proxy/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>jruby-maven-plugins</artifactId>
     <groupId>de.saumya.mojo</groupId>
-    <version>1.0.10-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
   <artifactId>gem-proxy</artifactId>
   <packaging>war</packaging>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>9.2.18.0</version>
+      <version>9.2.19.0</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>parent-mojo</artifactId>
     <groupId>de.saumya.mojo</groupId>
-    <version>1.0.0-beta-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <relativePath>../parent-mojo/pom.xml</relativePath>
   </parent>
   <artifactId>integration-tests</artifactId>
diff --git a/jruby-maven-plugin/src/it/generate-java-and-compile/pom.xml b/jruby-maven-plugin/src/it/generate-java-and-compile/pom.xml
@@ -10,7 +10,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-complete</artifactId>
-      <version>9.2.18.0</version>
+      <version>9.2.19.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -35,8 +35,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
       <plugin>
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
@@ -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 = "9.2.18.0";
+    protected static final String DEFAULT_JRUBY_VERSION = "9.2.19.0";
 
 
     /**
diff --git a/minitest-maven-plugin/src/it/minispec-with-jar-dependencies/test.properties b/minitest-maven-plugin/src/it/minispec-with-jar-dependencies/test.properties
@@ -1 +1 @@
-jruby.versions=9.2.18.0
+jruby.versions=9.2.19.0
diff --git a/parent-mojo/pom.xml b/parent-mojo/pom.xml
@@ -108,8 +108,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.1</version>
           <configuration>
-            <source>11</source>
-            <target>11</target>
+            <source>8</source>
+            <target>8</target>
           </configuration>
         </plugin>
         <plugin>
diff --git a/pom.xml b/pom.xml
@@ -101,8 +101,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.8.1</version>
           <configuration>
-            <source>11</source>
-            <target>11</target>
+            <source>8</source>
+            <target>8</target>
           </configuration>
         </plugin>
         <plugin>
@@ -132,7 +132,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <invoker.skip>true</invoker.skip>
     <maven.version>3.0.3</maven.version>
-    <jruby.version>9.2.18.0</jruby.version>
+    <jruby.version>9.2.19.0</jruby.version>
     <jruby.rack.version>1.0.10</jruby.rack.version>
     <jetty.version>7.5.1.v20110908</jetty.version>
     <war.version>2.1.1</war.version>
diff --git a/rake-maven-plugin/pom.xml b/rake-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>gem-parent-mojo</artifactId>
     <groupId>de.saumya.mojo</groupId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.1-SNAPSHOT</version>
     <relativePath>../gem-parent-mojo/pom.xml</relativePath>
   </parent>
   <artifactId>rake-maven-plugin</artifactId>
diff --git a/rspec-maven-plugin/src/it/rspec-path/test.properties b/rspec-maven-plugin/src/it/rspec-path/test.properties
@@ -1,2 +1,2 @@
 # to allow the verify script to work
-jruby.version=9.2.18.0
+jruby.version=9.2.19.0
diff --git a/rspec-maven-plugin/src/it/rspec-path/verify.bsh b/rspec-maven-plugin/src/it/rspec-path/verify.bsh
@@ -3,7 +3,7 @@ import org.codehaus.plexus.util.FileUtils;
 
 
 String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "jruby-9.2.18.0 mode : 1 example, 0 failures";
+String expected = "jruby-9.2.19.0 mode : 1 example, 0 failures";
 if ( !log.contains( expected ) )
 {
     throw new RuntimeException( "log file does not contain '" + expected + "'" );
diff --git a/rspec-maven-plugin/src/it/rspec-with-jar-dependencies/test.properties b/rspec-maven-plugin/src/it/rspec-with-jar-dependencies/test.properties
@@ -1 +1 @@
-jruby.versions=9.2.18.0
+jruby.versions=9.2.19.0
diff --git a/ruby-tools/pom.xml b/ruby-tools/pom.xml
@@ -71,7 +71,7 @@
     </dependency>
   </dependencies>
   <properties>
-    <jruby.versions>9.2.18.0</jruby.versions>
+    <jruby.versions>9.2.19.0</jruby.versions>
     <jruby.18and19>true</jruby.18and19>
     <plexus.version>1.5.4</plexus.version>
     <root.dir>${basedir}/..</root.dir>
diff --git a/ruby-tools/src/test/java/de/saumya/mojo/ruby/script/AbstractLauncherTest.java b/ruby-tools/src/test/java/de/saumya/mojo/ruby/script/AbstractLauncherTest.java
@@ -44,7 +44,7 @@ public void should_execute_command_with_args_and_return_in_output_stream() throw
         launcher.execute(Arrays.asList("-v"), outputStream);
 
         final String output = outputStream.toString();
-        assertThat(output).startsWith("jruby 9.2.18.0 (2.5.8)");
+        assertThat(output).startsWith("jruby 9.2.19.0 (2.5.8)");
     }
 
     @Test
@@ -58,7 +58,7 @@ public void should_execute_command_with_args_and_return_in_file() throws IOExcep
         String[] lines = output.split("\n");
         assertThat(lines).hasSizeGreaterThan(3);
         // -v line
-        assertThat(lines[0]).startsWith("jruby 9.2.18.0 (2.5.8)");
+        assertThat(lines[0]).startsWith("jruby 9.2.19.0 (2.5.8)");
         // --help first
         assertThat(lines[1]).isEqualTo("Usage: jruby [switches] [--] [programfile] [arguments]");
     }
diff --git a/ruby-tools/src/test/java/de/saumya/mojo/ruby/script/ScriptFactoryTest.java b/ruby-tools/src/test/java/de/saumya/mojo/ruby/script/ScriptFactoryTest.java
@@ -25,7 +25,7 @@ public void should_execute_script_with_only_args_and_return_in_output_stream() t
                 .execute(outputStream);
 
         final String output = outputStream.toString();
-        assertThat(output).startsWith("jruby 9.2.18.0 (2.5.8)");
+        assertThat(output).startsWith("jruby 9.2.19.0 (2.5.8)");
     }
 
     @Test
@@ -40,7 +40,7 @@ public void should_execute_script_with_only_args_and_return_in_file() throws Scr
 
         byte[] fileBytes = Files.readAllBytes(outputFile.toPath());
         final String output = new String(fileBytes, StandardCharsets.UTF_8);
-        assertThat(output).startsWith("jruby 9.2.18.0 (2.5.8)");
+        assertThat(output).startsWith("jruby 9.2.19.0 (2.5.8)");
     }
 
     @Test
@@ -49,7 +49,7 @@ public void should_return_jruby_version() throws ScriptException, IOException {
 
         JRubyVersion version = gemScriptFactory.getVersion();
 
-        assertThat(version.getVersion()).isEqualTo("9.2.18.0");
+        assertThat(version.getVersion()).isEqualTo("9.2.19.0");
         assertThat(version.getLanguage()).isEqualTo("2.5.8");
     }
 }
diff --git a/runit-maven-plugin/src/it/runit-with-env/pom.xml b/runit-maven-plugin/src/it/runit-with-env/pom.xml
@@ -30,7 +30,7 @@
         <version>@project.version@</version>
         <configuration>
           <env><VERSION>123</VERSION></env>
-          <versions>9.2.18.0</versions>
+          <versions>9.2.19.0</versions>
 	</configuration>
 	<executions>
 	  <execution>
diff --git a/runit-maven-plugin/src/it/runit-with-jar-dependencies/test.properties b/runit-maven-plugin/src/it/runit-with-jar-dependencies/test.properties
@@ -1 +1 @@
-jruby.versions=9.2.18.0
+jruby.versions=9.2.19.0
