Merge branch 'small_fixes'

headius · headius · commit 5bfc4ed7f0fa · 2024-12-10T23:15:04.000-06:00
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
@@ -327,7 +327,7 @@ public String toString(){
         }
     private void getHistoryLogScript(RubyStringBuilder builder) {
         builder.appendLine("log = File.join('log', 'history.log')");
-        builder.appendLine("if File.exists? File.dirname(log)");
+        builder.appendLine("if File.exist? File.dirname(log)");
         builder.appendLine("  File.open(log, 'a') do |f|");
         builder.appendLine("    f.puts \"#{$0.sub(/.*\\//, '')} #{ARGV.join ' '}\"");
         builder.appendLine("  end");
diff --git a/gem-assembly-descriptors/src/it/assemble-project-with-gems/application/pom.xml b/gem-assembly-descriptors/src/it/assemble-project-with-gems/application/pom.xml
@@ -56,7 +56,7 @@
       </plugin>   
       <plugin>
 	<artifactId>maven-assembly-plugin</artifactId>
-	<version>2.2-beta-5</version>
+	<version>3.7.1</version>
 	<configuration>
 	  <descriptorRefs>
 	    <descriptorRef>jar-with-dependencies-and-gems</descriptorRef>
@@ -71,7 +71,7 @@
 	  <execution>
 	    <phase>package</phase>
 	    <goals>
-	      <goal>assembly</goal>
+	      <goal>single</goal>
 	    </goals>
 	  </execution>
 	</executions>
diff --git a/gem-assembly-descriptors/src/it/assemble-project-without-gems/application/pom.xml b/gem-assembly-descriptors/src/it/assemble-project-without-gems/application/pom.xml
@@ -43,8 +43,8 @@
 	<artifactId>maven-compiler-plugin</artifactId>
 	<version>3.1</version>
 	<configuration>
-	  <source>1.6</source>
-	  <target>1.6</target>
+	  <source>8</source>
+	  <target>8</target>
 	</configuration>
       </plugin>
       <plugin>
diff --git a/gem-assembly-descriptors/src/it/assemble-project-without-gems/java-world/pom.xml b/gem-assembly-descriptors/src/it/assemble-project-without-gems/java-world/pom.xml
@@ -12,8 +12,8 @@
 	<artifactId>maven-compiler-plugin</artifactId>
 	<version>3.1</version>
 	<configuration>
-	  <source>1.6</source>
-	  <target>1.6</target>
+	  <source>8</source>
+	  <target>8</target>
 	</configuration>
       </plugin>
     </plugins>
diff --git a/gem-maven-plugin/src/it/gemify-pom/pom.xml b/gem-maven-plugin/src/it/gemify-pom/pom.xml
@@ -25,6 +25,10 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
       </plugin>
     </plugins>
   </build>
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
@@ -80,6 +80,10 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
             </plugin>
         </plugins>
     </build>
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
@@ -60,8 +60,8 @@
 	<artifactId>maven-compiler-plugin</artifactId>
 	<version>3.1</version>
 	<configuration>
-	  <target>1.6</target>
-	  <source>1.6</source>
+	  <target>8</target>
+	  <source>8</source>
 	</configuration>
       </plugin>
       <plugin>
diff --git a/gem-maven-plugin/src/it/small-project/java-world/pom.xml b/gem-maven-plugin/src/it/small-project/java-world/pom.xml
@@ -11,6 +11,10 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.1</version>
+        <configuration>
+          <source>8</source>
+          <target>8</target>
+        </configuration>
       </plugin>
     </plugins>
   </build>
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
@@ -370,7 +370,7 @@ else if ((Artifact.SCOPE_PROVIDED + Artifact.SCOPE_TEST).contains(dependency.get
                 writer.append("end\n");
                 writer.append("\n");
                 writer.append("load File.dirname(__FILE__) + '/" + this.gemHook
-                        + "' if File.exists?( File.dirname(__FILE__) + '/"
+                        + "' if File.exist?( File.dirname(__FILE__) + '/"
                         + this.gemHook + "')\n");
             }
             catch (final IOException e) {
diff --git a/parent-mojo/pom.xml b/parent-mojo/pom.xml
@@ -50,7 +50,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.4</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <goals><goal>jar</goal></goals>
diff --git a/pom.xml b/pom.xml
@@ -140,7 +140,7 @@
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3</version>
+          <version>3.4.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
diff --git a/ruby-tools/src/main/scripts/install_gems.rb b/ruby-tools/src/main/scripts/install_gems.rb
@@ -10,7 +10,7 @@
 
 Dir[ 'target/dependency/*gem' ].each do |file|
   f = "../target/rubygems/gems/#{File.basename(file).sub(/.gem/, '')}/lib"
-  unless File.exists?( f )
+  unless File.exist?( f )
     f = "../target/rubygems/gems/#{File.basename(file).sub(/.gem/, '')}-java/lib"
   end
   Dir[ File.expand_path( f ) + "/*" ].each do |ff|
diff --git a/ruby-tools/src/test/resources/repository/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom b/ruby-tools/src/test/resources/repository/org/apache/ant/ant-launcher/1.7.1/ant-launcher-1.7.1.pom
@@ -39,8 +39,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>8</source>
+          <target>8</target>
           <includes>
             <include>org/apache/tools/ant/launch/*.java</include>
           </includes>
diff --git a/ruby-tools/src/test/resources/repository/org/apache/ant/ant/1.7.1/ant-1.7.1.pom b/ruby-tools/src/test/resources/repository/org/apache/ant/ant/1.7.1/ant-1.7.1.pom
@@ -111,8 +111,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.2</source>
-          <target>1.2</target>
+          <source>8</source>
+          <target>8</target>
           <excludes>
             <exclude>org/apache/tools/ant/taskdefs/optional/**</exclude>
             <exclude>org/apache/tools/ant/filters/util/JavaClassHelper*</exclude>

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ public String toString(){`
`327`	`327`	`}`
`328`	`328`	`private void getHistoryLogScript(RubyStringBuilder builder) {`
`329`	`329`	`builder.appendLine("log = File.join('log', 'history.log')");`
`330`		`- builder.appendLine("if File.exists? File.dirname(log)");`
	`330`	`+ builder.appendLine("if File.exist? File.dirname(log)");`
`331`	`331`	`builder.appendLine(" File.open(log, 'a') do \|f\|");`
`332`	`332`	`builder.appendLine(" f.puts \"#{$0.sub(/.*\\//, '')} #{ARGV.join ' '}\"");`
`333`	`333`	`builder.appendLine(" end");`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ else if ((Artifact.SCOPE_PROVIDED + Artifact.SCOPE_TEST).contains(dependency.get`
`370`	`370`	`writer.append("end\n");`
`371`	`371`	`writer.append("\n");`
`372`	`372`	`writer.append("load File.dirname(__FILE__) + '/" + this.gemHook`
`373`		`- + "' if File.exists?( File.dirname(__FILE__) + '/"`
	`373`	`+ + "' if File.exist?( File.dirname(__FILE__) + '/"`
`374`	`374`	`+ this.gemHook + "')\n");`
`375`	`375`	`}`
`376`	`376`	`catch (final IOException e) {`