From bb778b479ee9ecf2939887f64588cf4b9e730ae2 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Fri, 4 Aug 2023 16:15:54 -0500 Subject: [PATCH] Update polyglot-maven to a prerelease build This commit also pulls in the jruby-maven-plugins update to 3.0 for integration tests that were still using the old artifacts. --- .mvn/extensions.xml | 2 +- lib/pom.rb | 2 +- lib/pom.xml | 4 ++-- .../osgi_many_bundles_with_embedded_gems/gems-bundle/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 +- .../jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb | 2 +- .../jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.rb | 2 +- .../jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.rb | 2 +- maven/jruby/src/it/tomcat/pom.rb | 2 +- maven/jruby/src/templates/j2ee_wlp/pom.rb | 2 +- maven/jruby/src/templates/osgi_all_inclusive/pom.rb | 2 +- test/pom.rb | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 443f84825363..8e783898ab22 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ io.takari.polyglot polyglot-ruby - 0.4.7 + 0.4.11-SNAPSHOT diff --git a/lib/pom.rb b/lib/pom.rb index d3472ab4dda6..dfabfe0dcda6 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -259,7 +259,7 @@ def log(message=nil) ghome = default_gemnames.member?( a.artifact_id ) ? gem_home : jruby_gems if Dir[ File.join( ghome, 'cache', File.basename( a.file.to_pathname ).sub( /.gem/, '*.gem' ) ) ].empty? log a.file.to_pathname - installer = Gem::Installer.new( a.file.to_pathname, + installer = Gem::Installer.new( Gem::Package.new(a.file.to_pathname), wrappers: true, ignore_dependencies: true, install_dir: ghome, diff --git a/lib/pom.xml b/lib/pom.xml index 79dcb9686d15..416a3aea74b7 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -1365,7 +1365,7 @@ DO NOT MODIFY - GENERATED CODE io.takari.polyglot polyglot-maven-plugin - 0.4.7 + 0.4.11-SNAPSHOT install_gems @@ -1416,7 +1416,7 @@ DO NOT MODIFY - GENERATED CODE io.takari.polyglot polyglot-ruby - 0.4.7 + 0.4.11-SNAPSHOT false 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 36dad9c3100b..eaed724e0854 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 @@ -16,7 +16,7 @@ # needed bundle plugin 'polyglot.dump.pom' => 'pom.xml' ) -plugin! 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' +jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' plugin( 'org.apache.felix:maven-bundle-plugin', '2.4.0', :instructions => { diff --git a/maven/jruby-jars/Mavenfile b/maven/jruby-jars/Mavenfile index 4756e165ae5e..55e54e4b9c00 100644 --- a/maven/jruby-jars/Mavenfile +++ b/maven/jruby-jars/Mavenfile @@ -51,7 +51,7 @@ end # do not push the gem during deploy phase # the bang reuses the plugin declaration which is already in place and # adds the extra execute_goal to it -plugin!('org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', +jruby_plugin!( :gem, :gemspec => 'jruby-jars.gemspec', # tell maven to include the jar files into gem :includeDependencies => true, diff --git a/maven/jruby/src/it/j2ee_jetty/pom.rb b/maven/jruby/src/it/j2ee_jetty/pom.rb index 4f6538490520..1d25dbd6d457 100644 --- a/maven/jruby/src/it/j2ee_jetty/pom.rb +++ b/maven/jruby/src/it/j2ee_jetty/pom.rb @@ -13,7 +13,7 @@ extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile index d850f9ffc5d5..cc4f032baca9 100644 --- a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile +++ b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile @@ -19,7 +19,7 @@ gem 'flickraw', '0.9.7' extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/it/j2ee_tomcat/pom.rb b/maven/jruby/src/it/j2ee_tomcat/pom.rb index 69385e04c1b7..7ef2fd43ee9c 100644 --- a/maven/jruby/src/it/j2ee_tomcat/pom.rb +++ b/maven/jruby/src/it/j2ee_tomcat/pom.rb @@ -13,7 +13,7 @@ extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile index 044990089b56..61376213730f 100644 --- a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile +++ b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile @@ -19,7 +19,7 @@ gem 'flickraw', '0.9.7' extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/it/j2ee_wildfly/pom.rb b/maven/jruby/src/it/j2ee_wildfly/pom.rb index 1398f92c3902..3a7527c2db20 100644 --- a/maven/jruby/src/it/j2ee_wildfly/pom.rb +++ b/maven/jruby/src/it/j2ee_wildfly/pom.rb @@ -14,7 +14,7 @@ extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/it/jetty/Mavenfile b/maven/jruby/src/it/jetty/Mavenfile index 16796bf3c431..cfef4e3abb4d 100644 --- a/maven/jruby/src/it/jetty/Mavenfile +++ b/maven/jruby/src/it/jetty/Mavenfile @@ -19,7 +19,7 @@ gem 'flickraw', '0.9.7' extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb index 7fa4d373fac1..e46e3b0ae1d6 100644 --- a/maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb +++ b/maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb @@ -9,4 +9,4 @@ id 'org.rubygems:zip', VERSION -plugin! 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' +jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' diff --git a/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.rb index 9e0535c2ceb2..80b12f97a254 100644 --- a/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.rb +++ b/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem1/pom.rb @@ -9,4 +9,4 @@ id 'org.rubygems:gem1', '1' -plugin! 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' +jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' diff --git a/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.rb index f38f1cb1eaa7..25ba4f2f5159 100644 --- a/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.rb +++ b/maven/jruby/src/it/many_jars_with_embedded_gems_ng/gem2/pom.rb @@ -9,4 +9,4 @@ id 'org.rubygems:gem2', '2' -plugin! 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' +jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' diff --git a/maven/jruby/src/it/tomcat/pom.rb b/maven/jruby/src/it/tomcat/pom.rb index 6a7a5b7f6ea6..107ae9e05ce6 100644 --- a/maven/jruby/src/it/tomcat/pom.rb +++ b/maven/jruby/src/it/tomcat/pom.rb @@ -15,7 +15,7 @@ extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/templates/j2ee_wlp/pom.rb b/maven/jruby/src/templates/j2ee_wlp/pom.rb index 1aa24c00b7d3..9dbf36ebb0d8 100644 --- a/maven/jruby/src/templates/j2ee_wlp/pom.rb +++ b/maven/jruby/src/templates/j2ee_wlp/pom.rb @@ -13,7 +13,7 @@ extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do +jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do execute_goal :initialize end diff --git a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb index 52350d4245fe..cf8c99b53dfd 100644 --- a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb +++ b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb @@ -17,7 +17,7 @@ extension 'org.jruby.maven:mavengem-wagon:2.0.0-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' -plugin! 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}', :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' +jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' # add some ruby scripts to bundle resource :directory => 'src/main/ruby' diff --git a/test/pom.rb b/test/pom.rb index c03e8affa6c1..658a5e095169 100644 --- a/test/pom.rb +++ b/test/pom.rb @@ -52,7 +52,7 @@ } ) end - plugin 'org.jruby.maven:gem-maven-plugin:${jruby.plugins.version}' do + jruby_plugin :gem, '${jruby.plugins.version}' do options = { :phase => 'initialize', 'gemPath' => '${gem.home}', 'gemHome' => '${gem.home}',