From 8e77846dc36f236171c3a8a89c94a0f9f5676f45 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Tue, 10 Dec 2024 23:41:06 -0600 Subject: [PATCH] Update to jruby-maven-plugins 3.0.4 Various small fixes, but notably File.exists? replaced so it works with JRuby 10. --- lib/pom.rb | 2 +- lib/pom.xml | 2 +- maven/jruby-complete/src/it/extended/Mavenfile | 2 +- maven/jruby-complete/src/it/runnable/Mavenfile | 2 +- .../osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb | 2 +- .../src/templates/osgi_many_bundles_with_embedded_gems/pom.rb | 2 +- maven/jruby-jars/Mavenfile | 2 +- maven/jruby/src/it/j2ee_jetty/pom.rb | 2 +- maven/jruby/src/it/j2ee_jetty_rack/Mavenfile | 2 +- maven/jruby/src/it/j2ee_tomcat/pom.rb | 2 +- maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile | 2 +- maven/jruby/src/it/j2ee_wildfly/pom.rb | 2 +- maven/jruby/src/it/jetty/Mavenfile | 2 +- maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb | 2 +- maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb | 2 +- maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb | 2 +- maven/jruby/src/it/tomcat/pom.rb | 2 +- maven/jruby/src/templates/hellowarld/Mavenfile | 2 +- maven/jruby/src/templates/j2ee_wlp/pom.rb | 2 +- maven/jruby/src/templates/osgi_all_inclusive/pom.rb | 2 +- pom.rb | 2 +- pom.xml | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/pom.rb b/lib/pom.rb index df08e17a7f0..ab8c18cb6dc 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -153,7 +153,7 @@ def log(message=nil) properties( 'polyglot.dump.pom' => 'pom.xml', 'polyglot.dump.readonly' => true, - 'jruby.plugins.version' => '3.0.2', + 'jruby.plugins.version' => '3.0.4', 'gem.home' => '${basedir}/ruby/gems/shared', # we copy everything into the target/classes/META-INF # so the jar plugin just packs it - see build/resources below diff --git a/lib/pom.xml b/lib/pom.xml index 58ff703357c..6c261050e01 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -20,7 +20,7 @@ DO NOT MODIFY - GENERATED CODE ${basedir}/ruby/gems/shared ${jruby.complete.home}/lib/ruby/gems/shared ${project.build.outputDirectory}/META-INF/jruby.home - 3.0.2 + 3.0.4 pom.xml true diff --git a/maven/jruby-complete/src/it/extended/Mavenfile b/maven/jruby-complete/src/it/extended/Mavenfile index 415066351e8..60f487346ec 100644 --- a/maven/jruby-complete/src/it/extended/Mavenfile +++ b/maven/jruby-complete/src/it/extended/Mavenfile @@ -1,7 +1,7 @@ #-*- mode: ruby -*- # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8', 'jruby.home' => '${basedir}/../../../../..' ) diff --git a/maven/jruby-complete/src/it/runnable/Mavenfile b/maven/jruby-complete/src/it/runnable/Mavenfile index e5b6d955ddd..cb13fa060de 100644 --- a/maven/jruby-complete/src/it/runnable/Mavenfile +++ b/maven/jruby-complete/src/it/runnable/Mavenfile @@ -1,7 +1,7 @@ #-*- mode: ruby -*- # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'mavengem.wagon.version' => '2.0.1', 'jruby.version' => '9.4.3.0' ) diff --git a/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb b/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb index 0f48d9e7ac3..765fa31a418 100644 --- a/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb +++ b/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb @@ -12,7 +12,7 @@ packaging 'bundle' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', # needed bundle plugin 'polyglot.dump.pom' => 'pom.xml' ) diff --git a/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/pom.rb b/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/pom.rb index 109754789dd..b503e7e7e3b 100644 --- a/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/pom.rb +++ b/maven/jruby-complete/src/templates/osgi_many_bundles_with_embedded_gems/pom.rb @@ -5,7 +5,7 @@ packaging :pom # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8' ) modules [ 'gems-bundle', 'scripts-bundle', 'test' ] diff --git a/maven/jruby-jars/Mavenfile b/maven/jruby-jars/Mavenfile index 0d20a7322dc..bc1b66b2ddf 100644 --- a/maven/jruby-jars/Mavenfile +++ b/maven/jruby-jars/Mavenfile @@ -28,7 +28,7 @@ end properties( 'tesla.dump.pom' => 'pom.xml', 'tesla.dump.readonly' => true, - 'jruby.plugins.version' => '3.0.2', + 'jruby.plugins.version' => '3.0.4', # we share the already installed gems 'gem.home' => '${jruby_home}/lib/ruby/gems/shared', # need jruby_home but not jruby.home as name otherwise diff --git a/maven/jruby/src/it/j2ee_jetty/pom.rb b/maven/jruby/src/it/j2ee_jetty/pom.rb index da72b7354ea..47c7054590e 100644 --- a/maven/jruby/src/it/j2ee_jetty/pom.rb +++ b/maven/jruby/src/it/j2ee_jetty/pom.rb @@ -2,7 +2,7 @@ packaging 'war' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) diff --git a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile index 51e8b1638c6..7a59559c02b 100644 --- a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile +++ b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile @@ -4,7 +4,7 @@ packaging 'war' # get jruby dependencies -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8', 'public.dir' => '${basedir}/public' ) diff --git a/maven/jruby/src/it/j2ee_tomcat/pom.rb b/maven/jruby/src/it/j2ee_tomcat/pom.rb index 0fbeef5fd2b..5b126a45f48 100644 --- a/maven/jruby/src/it/j2ee_tomcat/pom.rb +++ b/maven/jruby/src/it/j2ee_tomcat/pom.rb @@ -2,7 +2,7 @@ packaging 'war' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) diff --git a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile index a2e6346d16e..032db5fc86e 100644 --- a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile +++ b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile @@ -4,7 +4,7 @@ packaging 'war' # get jruby dependencies -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8', 'public.dir' => '${basedir}/public' ) diff --git a/maven/jruby/src/it/j2ee_wildfly/pom.rb b/maven/jruby/src/it/j2ee_wildfly/pom.rb index d01f61774d0..5e0d558a344 100644 --- a/maven/jruby/src/it/j2ee_wildfly/pom.rb +++ b/maven/jruby/src/it/j2ee_wildfly/pom.rb @@ -2,7 +2,7 @@ packaging 'war' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'wildfly.version' => '9.0.2.Final', 'project.build.sourceEncoding' => 'utf-8' ) diff --git a/maven/jruby/src/it/jetty/Mavenfile b/maven/jruby/src/it/jetty/Mavenfile index c396b9ecfbb..c0a73969a8e 100644 --- a/maven/jruby/src/it/jetty/Mavenfile +++ b/maven/jruby/src/it/jetty/Mavenfile @@ -4,7 +4,7 @@ packaging 'war' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8', 'public.dir' => '${basedir}/public' ) diff --git a/maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb index 82356e06317..ba38d779d2d 100644 --- a/maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb +++ b/maven/jruby/src/it/many_jars_with_embedded_gems/app/pom.rb @@ -1,5 +1,5 @@ # two jars with embedded gems -jar 'org.jruby.maven:maven-tools', '3.0.2' +jar 'org.jruby.maven:maven-tools', '3.0.4' jar 'org.rubygems:zip', '2.0.2' # jruby scripting container diff --git a/maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb index f5c4a97213b..e1d9ac514e5 100644 --- a/maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb +++ b/maven/jruby/src/it/many_jars_with_embedded_gems/pom.rb @@ -1,7 +1,7 @@ #-*- mode: ruby -*- # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2' ) +properties( 'jruby.plugins.version' => '3.0.4' ) packaging :pom diff --git a/maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb index 09d7998d2d7..8016b14d721 100644 --- a/maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb +++ b/maven/jruby/src/it/many_jars_with_embedded_gems_ng/pom.rb @@ -1,7 +1,7 @@ #-*- mode: ruby -*- # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2' ) +properties( 'jruby.plugins.version' => '3.0.4' ) packaging :pom diff --git a/maven/jruby/src/it/tomcat/pom.rb b/maven/jruby/src/it/tomcat/pom.rb index c930c0d64b0..cdfb4720eec 100644 --- a/maven/jruby/src/it/tomcat/pom.rb +++ b/maven/jruby/src/it/tomcat/pom.rb @@ -4,7 +4,7 @@ packaging 'war' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) diff --git a/maven/jruby/src/templates/hellowarld/Mavenfile b/maven/jruby/src/templates/hellowarld/Mavenfile index 379f6acc6a3..5a78758f9a3 100644 --- a/maven/jruby/src/templates/hellowarld/Mavenfile +++ b/maven/jruby/src/templates/hellowarld/Mavenfile @@ -12,7 +12,7 @@ packaging 'pom' # TODO add extension to .mvn/extensions.xml extension 'org.jruby.maven', 'jruby9-extensions', '${jruby9.plugins.version}' -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'jruby9.plugins.version' => '0.2.0' ) # integration tests diff --git a/maven/jruby/src/templates/j2ee_wlp/pom.rb b/maven/jruby/src/templates/j2ee_wlp/pom.rb index 8be9cffe49f..f70e8132dd9 100644 --- a/maven/jruby/src/templates/j2ee_wlp/pom.rb +++ b/maven/jruby/src/templates/j2ee_wlp/pom.rb @@ -2,7 +2,7 @@ packaging 'war' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) diff --git a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb index b6e07af2e7e..411681ea6cf 100644 --- a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb +++ b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb @@ -3,7 +3,7 @@ packaging 'bundle' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '3.0.2', +properties( 'jruby.plugins.version' => '3.0.4', 'exam.version' => '3.0.3', 'url.version' => '1.5.2', 'logback.version' => '1.0.13', diff --git a/pom.rb b/pom.rb index e6c83063cfa..8e967f82794 100644 --- a/pom.rb +++ b/pom.rb @@ -63,7 +63,7 @@ 'github.global.server' => 'github', 'polyglot.dump.pom' => 'pom.xml', 'polyglot.dump.readonly' => 'true', - 'jruby.plugins.version' => '3.0.2', + 'jruby.plugins.version' => '3.0.4', # versions for default gems with bin executables # used in ./lib/pom.rb and ./maven/jruby-stdlib/pom.rb diff --git a/pom.xml b/pom.xml index 0d7c39e3a7f..81c07408a13 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ DO NOT MODIFY - GENERATED CODE 2.12.7 1.1.6 ${project.basedir} - 3.0.2 + 3.0.4 ${project.basedir} pom.xml true