use mavengem protocol handler instead of torquebox proxy

jruby · Jan 21, 2016 · b3c2213 · b3c2213
1 parent 66107f3
commit b3c2213
Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -43,13 +43,9 @@ def initialize( name, version, default_spec = true )
   # just depends on jruby-core so we are sure the jruby.jar is in place
   jar "org.jruby:jruby-core:#{version}", :scope => 'test'
 
-  #repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
-  #            :id => 'rubygems-releases' )
-  #repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
-  #            :id => 'tb-rubygems-releases' )
-  # for testing out jruby-ossl before final release :
-  #repository( :url => 'http://oss.sonatype.org/content/repositories/staging',
-  #            :id => 'gem-staging' )
+  extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'
+
+  repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
 
   plugin( :clean,
           :filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -175,7 +175,20 @@ DO NOT MODIFIY - GENERATED CODE
       </exclusions>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>mavengems</id>
+      <url>mavengem:http://rubygems.org</url>
+    </repository>
+  </repositories>
   <build>
+    <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>0.2.0</version>
+      </extension>
+    </extensions>
     <resources>
       <resource>
         <targetPath>${jruby.complete.gems}</targetPath>

diff --git a/test/pom.rb b/test/pom.rb
@@ -7,16 +7,16 @@
   inherit 'org.jruby:jruby-parent', version
   id 'org.jruby:jruby-tests'
 
-  repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
-              :id => 'rubygems-releases' )
+  extension 'org.torquebox.mojo:mavengem-wagon:0.2.0'
+
+  repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
+  plugin_repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
 
   plugin_repository( :url => 'https://oss.sonatype.org/content/repositories/snapshots/',
                      :id => 'sonatype' ) do
     releases 'false'
     snapshots 'true'
   end
-  plugin_repository( :id => 'rubygems-releases',
-                     :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases' )
 
   properties( 'polyglot.dump.pom' => 'pom.xml',
               'jruby.home' => '${basedir}/..',