From ec81902e3000b90e8451fab6322c61f8f782b8a2 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 --- lib/pom.rb | 2 +- lib/pom.xml | 4 ++-- maven/jruby-complete/pom.rb | 2 +- .../src/it/GH-3095-gem-install-with-forked-jruby/pom.xml | 2 +- .../osgi_many_bundles_with_embedded_gems/gems-bundle/pom.rb | 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 +- .../src/it/terminate-container-and-extensions-GH-3300/pom.xml | 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 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/pom.rb b/lib/pom.rb index e55418afbec..616fe2f127b 100644 --- a/lib/pom.rb +++ b/lib/pom.rb @@ -164,7 +164,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-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' diff --git a/lib/pom.xml b/lib/pom.xml index 82f31b47717..179d0498632 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -1042,9 +1042,9 @@ DO NOT MODIFY - GENERATED CODE - org.torquebox.mojo + org.jruby.maven mavengem-wagon - 1.0.3 + 2.0.0-SNAPSHOT diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb index 2dee3e28615..2386b0cf821 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-SNAPSHOT' 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..11bd9b60a41 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,7 +29,7 @@ - org.torquebox.mojo + org.jruby.maven mavengem-wagon 1.0.3 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..a14c06e85d8 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-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' id 'org.jruby.osgi:gems-bundle', '1.0' diff --git a/maven/jruby/src/it/j2ee_jetty/pom.rb b/maven/jruby/src/it/j2ee_jetty/pom.rb index d53ad9743fa..79884bd5c5e 100644 --- a/maven/jruby/src/it/j2ee_jetty/pom.rb +++ b/maven/jruby/src/it/j2ee_jetty/pom.rb @@ -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-SNAPSHOT' 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..e76c3f89cda 100644 --- a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile +++ b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile @@ -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-SNAPSHOT' 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..ee609c56c16 100644 --- a/maven/jruby/src/it/j2ee_tomcat/pom.rb +++ b/maven/jruby/src/it/j2ee_tomcat/pom.rb @@ -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-SNAPSHOT' 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..a65c9857bba 100644 --- a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile +++ b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile @@ -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-SNAPSHOT' 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..20468ac976e 100644 --- a/maven/jruby/src/it/j2ee_wildfly/pom.rb +++ b/maven/jruby/src/it/j2ee_wildfly/pom.rb @@ -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-SNAPSHOT' 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..2e50a892b1e 100644 --- a/maven/jruby/src/it/jetty/Mavenfile +++ b/maven/jruby/src/it/jetty/Mavenfile @@ -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-SNAPSHOT' 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/zip_gem/pom.rb b/maven/jruby/src/it/many_jars_with_embedded_gems/zip_gem/pom.rb index 796a5150196..e46e3b0ae1d 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-SNAPSHOT' 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..80b12f97a25 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-SNAPSHOT' 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..25ba4f2f515 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-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' id 'org.rubygems:gem2', '2' 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..3ee7d111ae0 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 @@ -40,7 +40,7 @@ - org.torquebox.mojo + org.jruby.maven mavengem-wagon 1.0.3 diff --git a/maven/jruby/src/it/tomcat/pom.rb b/maven/jruby/src/it/tomcat/pom.rb index 5d398139b09..97904ad34bb 100644 --- a/maven/jruby/src/it/tomcat/pom.rb +++ b/maven/jruby/src/it/tomcat/pom.rb @@ -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-SNAPSHOT' 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/j2ee_wlp/pom.rb b/maven/jruby/src/templates/j2ee_wlp/pom.rb index f04fb272cde..c7161924ad9 100644 --- a/maven/jruby/src/templates/j2ee_wlp/pom.rb +++ b/maven/jruby/src/templates/j2ee_wlp/pom.rb @@ -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-SNAPSHOT' 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..808e747c779 100644 --- a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb +++ b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb @@ -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-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:https://rubygems.org' jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' diff --git a/test/pom.rb b/test/pom.rb index 4f1d2b64d93..e98c560559e 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-SNAPSHOT' repository :id => :mavengems, :url => 'mavengem:http://rubygems.org' plugin_repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'