Skip to content

Commit

Permalink
Migrate to new mavengem
Browse files Browse the repository at this point in the history
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
  • Loading branch information
headius committed Aug 1, 2023
1 parent 4cd8ee1 commit ef56157
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lib/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'

repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

Expand Down
4 changes: 2 additions & 2 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1042,9 +1042,9 @@ DO NOT MODIFY - GENERATED CODE
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>1.0.3</version>
<version>1.0.4-SNAPSHOT</version>
</extension>
</extensions>
<resources>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby-complete/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
packaging 'bundle'


extension 'org.torquebox.mojo:mavengem-wagon:1.0.3'
extension 'org.jruby.maven:mavengem-wagon:1.0.4-SNAPSHOT'

plugin_repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>1.0.3</version>
</extension>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.torquebox.mojo:mavengem-wagon:1.0.3'
extension 'org.jruby.maven:mavengem-wagon:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.jruby.osgi:gems-bundle', '1.0'
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/j2ee_jetty/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/j2ee_jetty_rack/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/j2ee_tomcat/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/j2ee_wildfly/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/jetty/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.torquebox.mojo:mavengem-wagon:1.0.3'
extension 'org.jruby.maven:mavengem-wagon:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.rubygems:zip', VERSION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.torquebox.mojo:mavengem-wagon:1.0.3'
extension 'org.jruby.maven:mavengem-wagon:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.rubygems:gem1', '1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

model.repositories.clear

extension 'org.torquebox.mojo:mavengem-wagon:1.0.3'
extension 'org.jruby.maven:mavengem-wagon:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

id 'org.rubygems:gem2', '2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<groupId>org.jruby.maven</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>1.0.3</version>
</extension>
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/it/tomcat/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInTestResources => false, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/templates/j2ee_wlp/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0' do
Expand Down
2 changes: 1 addition & 1 deletion maven/jruby/src/templates/osgi_all_inclusive/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

model.repositories.clear

extension 'org.torquebox.mojo:mavengem-wagon:1.0.3'
extension 'org.jruby.maven:mavengem-wagon:1.0.4-SNAPSHOT'
repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
Expand Down
2 changes: 1 addition & 1 deletion test/pom.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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:1.0.4-SNAPSHOT'

repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
plugin_repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
Expand Down

0 comments on commit ef56157

Please sign in to comment.