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.
headius · Aug 4, 2023 · bb778b4 · bb778b4
1 parent 337ac4a
commit bb778b4
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 19 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.7</version>
+    <version>0.4.11-SNAPSHOT</version>
   </extension>
 </extensions>
diff --git 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
@@ -1365,7 +1365,7 @@ DO NOT MODIFY - GENERATED CODE
       <plugin>
         <groupId>io.takari.polyglot</groupId>
         <artifactId>polyglot-maven-plugin</artifactId>
-        <version>0.4.7</version>
+        <version>0.4.11-SNAPSHOT</version>
         <executions>
           <execution>
             <id>install_gems</id>
@@ -1416,7 +1416,7 @@ DO NOT MODIFY - GENERATED CODE
           <dependency>
             <groupId>io.takari.polyglot</groupId>
             <artifactId>polyglot-ruby</artifactId>
-            <version>0.4.7</version>
+            <version>0.4.11-SNAPSHOT</version>
           </dependency>
         </dependencies>
         <inherited>false</inherited>

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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}',