From f976615f70b3df21b58eab2c38d34d088ec232c3 Mon Sep 17 00:00:00 2001 From: Charles Oliver Nutter Date: Tue, 1 Aug 2023 14:29:49 -0500 Subject: [PATCH] Migrate to new mavengem Mavengem has used the v1/dependencies API on rubygems.org to get gem information, but that API has now gone away (whitelisted for us until August 8). This change migrates to a newer version of mavengem that uses newer APIs to make up the same functionality. See jruby/mavengem#9 --- .mvn/extensions.xml | 2 +- lib/pom.rb | 6 +++--- lib/pom.xml | 10 +++++----- lifecycle-mapping-metadata.xml | 8 ++++---- maven/jruby-complete/pom.rb | 2 +- .../it/GH-3095-gem-install-with-forked-jruby/pom.xml | 4 ++-- maven/jruby-complete/src/it/extended/Mavenfile | 2 +- maven/jruby-complete/src/it/runnable/Mavenfile | 6 +++--- .../gems-bundle/pom.rb | 4 ++-- .../osgi_many_bundles_with_embedded_gems/pom.rb | 2 +- maven/jruby-jars/Mavenfile | 2 +- maven/jruby-jars/src/it/integrity/pom.xml | 7 ++----- maven/jruby/src/it/j2ee_jetty/pom.rb | 4 ++-- maven/jruby/src/it/j2ee_jetty_rack/Mavenfile | 4 ++-- maven/jruby/src/it/j2ee_tomcat/pom.rb | 4 ++-- maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile | 4 ++-- maven/jruby/src/it/j2ee_wildfly/pom.rb | 4 ++-- maven/jruby/src/it/jetty/Mavenfile | 4 ++-- .../src/it/many_jars_with_embedded_gems/app/pom.rb | 2 +- .../jruby/src/it/many_jars_with_embedded_gems/pom.rb | 2 +- .../it/many_jars_with_embedded_gems/zip_gem/pom.rb | 2 +- .../it/many_jars_with_embedded_gems_ng/gem1/pom.rb | 2 +- .../it/many_jars_with_embedded_gems_ng/gem2/pom.rb | 2 +- .../src/it/many_jars_with_embedded_gems_ng/pom.rb | 2 +- .../pom.xml | 11 ++++------- maven/jruby/src/it/tomcat/pom.rb | 4 ++-- maven/jruby/src/templates/hellowarld/Mavenfile | 4 ++-- maven/jruby/src/templates/j2ee_wlp/pom.rb | 4 ++-- maven/jruby/src/templates/osgi_all_inclusive/pom.rb | 4 ++-- pom.rb | 2 +- pom.xml | 2 +- test/pom.rb | 5 ++--- 32 files changed, 60 insertions(+), 67 deletions(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 443f8482536..8e783898ab2 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 6b03f77ca44..90740e9effe 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -72,7 +72,7 @@ def log(message=nil) properties( 'polyglot.dump.pom' => 'pom.xml', 'polyglot.dump.readonly' => true, - 'jruby.plugins.version' => '1.1.2', + 'jruby.plugins.version' => '3.0.0', '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 @@ -82,7 +82,7 @@ def log(message=nil) # just depends on jruby-core so we are sure the jruby.jar is in place jar "org.jruby:jruby-core:#{version}", :scope => 'test' - extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' + extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' @@ -177,7 +177,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 97e3cf1e326..830ce30da89 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 - 1.1.2 + 3.0.0 pom.xml true @@ -548,9 +548,9 @@ DO NOT MODIFY - GENERATED CODE - org.torquebox.mojo + org.jruby.maven mavengem-wagon - 1.0.3 + 2.0.0 @@ -757,7 +757,7 @@ DO NOT MODIFY - GENERATED CODE io.takari.polyglot polyglot-maven-plugin - 0.4.7 + 0.4.11-SNAPSHOT install_gems @@ -808,7 +808,7 @@ DO NOT MODIFY - GENERATED CODE io.takari.polyglot polyglot-ruby - 0.4.7 + 0.4.11-SNAPSHOT false diff --git a/lifecycle-mapping-metadata.xml b/lifecycle-mapping-metadata.xml index 5eb4ec494c4..ade1ee806f0 100644 --- a/lifecycle-mapping-metadata.xml +++ b/lifecycle-mapping-metadata.xml @@ -29,9 +29,9 @@ - de.saumya.mojo + org.jruby.maven gem-maven-plugin - 1.0.0-rc + 3.0.0 initialize @@ -42,9 +42,9 @@ - de.saumya.mojo + org.jruby.maven gem-maven-plugin - 1.0.0-rc2 + 3.0.0 initialize diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb index 2dee3e28615..5c998b516c0 100644 --- a/maven/jruby-complete/pom.rb +++ b/maven/jruby-complete/pom.rb @@ -11,7 +11,7 @@ packaging 'bundle' - extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' + extension 'org.jruby.maven:mavengem-wagon:2.0.0' plugin_repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' diff --git a/maven/jruby-complete/src/it/GH-3095-gem-install-with-forked-jruby/pom.xml b/maven/jruby-complete/src/it/GH-3095-gem-install-with-forked-jruby/pom.xml index 1f6fcfbc333..cc36012652f 100644 --- a/maven/jruby-complete/src/it/GH-3095-gem-install-with-forked-jruby/pom.xml +++ b/maven/jruby-complete/src/it/GH-3095-gem-install-with-forked-jruby/pom.xml @@ -29,9 +29,9 @@ - org.torquebox.mojo + org.jruby.maven mavengem-wagon - 1.0.3 + 2.0.0 diff --git a/maven/jruby-complete/src/it/extended/Mavenfile b/maven/jruby-complete/src/it/extended/Mavenfile index 4df43bf35d7..ab4b4cee6b3 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', '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 c99afc5eaea..62943173540 100644 --- a/maven/jruby-complete/src/it/runnable/Mavenfile +++ b/maven/jruby-complete/src/it/runnable/Mavenfile @@ -1,9 +1,9 @@ #-*- mode: ruby -*- # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '1.0.10', - 'mavengem.wagon.version' => '1.0.3', - 'jruby.version' => '9.0.5.0' ) +properties( 'jruby.plugins.version' => '3.0.0', + 'mavengem.wagon.version' => '2.0.0', + 'jruby.version' => '9.4.3.0' ) gemfile 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 3c83cf2f79e..8243018f924 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 @@ -4,7 +4,7 @@ model.repositories.clear -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' id 'org.jruby.osgi:gems-bundle', '1.0' @@ -12,7 +12,7 @@ packaging 'bundle' # default versions will be overwritten by pom.rb from root directory -properties( 'jruby.plugins.version' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', # 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 f38a95a1302..b46cce057db 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8' ) modules [ 'gems-bundle', 'scripts-bundle', 'test' ] diff --git a/maven/jruby-jars/Mavenfile b/maven/jruby-jars/Mavenfile index dae2db16a0d..073dd17ce4f 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' => '1.1.8', + 'jruby.plugins.version' => '3.0.0', # 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-jars/src/it/integrity/pom.xml b/maven/jruby-jars/src/it/integrity/pom.xml index 493d993f31b..16b7a970f12 100644 --- a/maven/jruby-jars/src/it/integrity/pom.xml +++ b/maven/jruby-jars/src/it/integrity/pom.xml @@ -16,17 +16,14 @@ - de.saumya.mojo + org.jruby.maven gem-maven-plugin - 1.0.5 + 3.0.0 initialize - - 1.7.22 - org.codehaus.mojo diff --git a/maven/jruby/src/it/j2ee_jetty/pom.rb b/maven/jruby/src/it/j2ee_jetty/pom.rb index d53ad9743fa..383b905a2d1 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) @@ -10,7 +10,7 @@ # a gem to be used gem 'flickraw', '0.9.7' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile index 2e9f51485c1..11997acfaa1 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8', 'public.dir' => '${basedir}/public' ) @@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.18', # a gem to be used gem 'flickraw', '0.9.7' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/it/j2ee_tomcat/pom.rb b/maven/jruby/src/it/j2ee_tomcat/pom.rb index 6802c370784..401bc76949f 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) @@ -10,7 +10,7 @@ # a gem to be used gem 'flickraw', '0.9.7' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile index 6d8b0bd0ea0..056a4a14452 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8', 'public.dir' => '${basedir}/public' ) @@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.18', # a gem to be used gem 'flickraw', '0.9.7' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/it/j2ee_wildfly/pom.rb b/maven/jruby/src/it/j2ee_wildfly/pom.rb index 969c92207f1..e0a19156bc6 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'wildfly.version' => '9.0.2.Final', 'project.build.sourceEncoding' => 'utf-8' ) @@ -11,7 +11,7 @@ # a gem to be used gem 'virtus', '0.5.5' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/it/jetty/Mavenfile b/maven/jruby/src/it/jetty/Mavenfile index a4a82948481..5df0d7af6f4 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8', 'public.dir' => '${basedir}/public' ) @@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.14', # a gem to be used gem 'flickraw', '0.9.7' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do 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 2f879282c37..729234731cd 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 'de.saumya.mojo:maven-tools', '1.0.0.rc1' +jar 'org.jruby.maven:maven-tools', '3.0.0' 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 007d2e8abce..68ada8c30bd 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' => '1.0.10' ) +properties( 'jruby.plugins.version' => '3.0.0' ) packaging :pom 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 796a5150196..973174f821a 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 @@ -4,7 +4,7 @@ model.repositories.clear -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' id 'org.rubygems:zip', VERSION 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 57af51e4f57..32b96d35c40 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 @@ -4,7 +4,7 @@ model.repositories.clear -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' id 'org.rubygems:gem1', '1' 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 ef283f5d3e6..4c0cc0d8e26 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 @@ -4,7 +4,7 @@ model.repositories.clear -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' id 'org.rubygems:gem2', '2' 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 b68ec6bdf24..eeaeb7e682e 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' => '1.0.10' ) +properties( 'jruby.plugins.version' => '3.0.0' ) packaging :pom diff --git a/maven/jruby/src/it/terminate-container-and-extensions-GH-3300/pom.xml b/maven/jruby/src/it/terminate-container-and-extensions-GH-3300/pom.xml index db66f4db205..5b97c13ab02 100644 --- a/maven/jruby/src/it/terminate-container-and-extensions-GH-3300/pom.xml +++ b/maven/jruby/src/it/terminate-container-and-extensions-GH-3300/pom.xml @@ -33,21 +33,21 @@ - 1.0.10 + >3.0.0 UTF-8 - org.torquebox.mojo + org.jruby.maven mavengem-wagon - 1.0.3 + 2.0.0 - de.saumya.mojo + org.jruby.maven gem-maven-plugin ${jruby.plugins.version} @@ -55,9 +55,6 @@ initialize - - 1.7.22 - diff --git a/maven/jruby/src/it/tomcat/pom.rb b/maven/jruby/src/it/tomcat/pom.rb index 5d398139b09..45fd9b54052 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) @@ -12,7 +12,7 @@ # a gem to be used gem 'flickraw', '0.9.7' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/templates/hellowarld/Mavenfile b/maven/jruby/src/templates/hellowarld/Mavenfile index 71efe98243e..50010cf84f3 100644 --- a/maven/jruby/src/templates/hellowarld/Mavenfile +++ b/maven/jruby/src/templates/hellowarld/Mavenfile @@ -10,9 +10,9 @@ name '${cmd} ${framework} from ${package}' packaging 'pom' # TODO add extension to .mvn/extensions.xml -extension 'de.saumya.mojo', 'jruby9-extensions', '${jruby9.plugins.version}' +extension 'org.jruby.maven', 'jruby9-extensions', '${jruby9.plugins.version}' -properties( 'jruby.plugins.version' => '1.1.0', +properties( 'jruby.plugins.version' => '3.0.0', '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 f04fb272cde..0b562a62487 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'project.build.sourceEncoding' => 'utf-8' ) pom( 'org.jruby:jruby', '${jruby.version}' ) @@ -10,7 +10,7 @@ # a gem to be used gem 'virtus', '0.5.5' -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do diff --git a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb index a6109acf45c..ac4834c0af1 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' => '1.0.10', +properties( 'jruby.plugins.version' => '3.0.0', 'exam.version' => '3.0.3', 'url.version' => '1.5.2', 'logback.version' => '1.0.13', @@ -14,7 +14,7 @@ model.repositories.clear -extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' +extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' diff --git a/pom.rb b/pom.rb index dbd350b782d..0f5fcad4609 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' => '1.0.10', + 'jruby.plugins.version' => '3.0.0', # 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 1fbb7e2905b..ae2d90334f2 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ DO NOT MODIFY - GENERATED CODE 2.12.5 1.1.6 ${project.basedir} - 1.0.10 + 3.0.0 ${project.basedir} pom.xml true diff --git a/test/pom.rb b/test/pom.rb index 4f1d2b64d93..d619d240374 100644 --- a/test/pom.rb +++ b/test/pom.rb @@ -8,7 +8,7 @@ inherit 'org.jruby:jruby-parent', version id 'org.jruby:jruby-tests' - extension 'org.torquebox.mojo:mavengem-wagon:1.0.3' + extension 'org.jruby.maven:mavengem-wagon:2.0.0' repository :id => :mavengems, :url => 'mavengem:http://rubygems.org' plugin_repository :id => :mavengems, :url => 'mavengem:http://rubygems.org' @@ -41,7 +41,7 @@ plugin( 'org.eclipse.m2e:lifecycle-mapping:1.0.0', 'lifecycleMappingMetadata' => { 'pluginExecutions' => [ { 'pluginExecutionFilter' => { - 'groupId' => 'de.saumya.mojo', + 'groupId' => 'org.jruby.maven', 'artifactId' => 'gem-maven-plugin', 'versionRange' => '[1.0.0-rc3,)', 'goals' => [ 'initialize' ] @@ -58,7 +58,6 @@ 'gemHome' => '${gem.home}', 'binDirectory' => '${jruby.home}/bin', 'includeRubygemsInTestResources' => 'false', - 'jrubyVersion' => '9.2.9.0' } execute_goals( 'initialize', options )