diff --git a/lib/pom.rb b/lib/pom.rb
index 62de720f323a..b6a953c4a95a 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 6f4c7b43f4a9..834c54787a98 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -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>2.0.0-SNAPSHOT</version>
       </extension>
     </extensions>
     <resources>
diff --git a/maven/jruby-complete/pom.rb b/maven/jruby-complete/pom.rb
index 2dee3e28615c..2386b0cf8215 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 1f6fcfbc333f..11bd9b60a414 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 @@
   <build>
     <extensions>
       <extension>
-        <groupId>org.torquebox.mojo</groupId>
+        <groupId>org.jruby.maven</groupId>
         <artifactId>mavengem-wagon</artifactId>
         <version>1.0.3</version>
       </extension>
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 3c83cf2f79e0..a14c06e85d84 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 d53ad9743fa4..79884bd5c5e6 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 2e9f51485c16..e76c3f89cdae 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 6802c3707845..ee609c56c165 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 6d8b0bd0ea00..a65c9857bba7 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 969c92207f1f..20468ac976e6 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 a4a829484811..2e50a892b1e2 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 796a5150196d..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
@@ -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 57af51e4f579..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
@@ -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 ef283f5d3e62..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
@@ -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 db66f4db2055..3ee7d111ae0e 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 @@
   <build>
     <extensions>
       <extension>
-        <groupId>org.torquebox.mojo</groupId>
+        <groupId>org.jruby.maven</groupId>
         <artifactId>mavengem-wagon</artifactId>
         <version>1.0.3</version>
       </extension>
diff --git a/maven/jruby/src/it/tomcat/pom.rb b/maven/jruby/src/it/tomcat/pom.rb
index 5d398139b099..97904ad34bbc 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 f04fb272cde1..c7161924ad92 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 a6109acf45c4..808e747c7794 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 4f1d2b64d930..e98c560559e9 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'