[build] no more torquebox proxy for gem-artifacts

jruby · Aug 10, 2015 · 9946fae · 9946fae
1 parent e5324c4
commit 9946fae
Showing 16 changed files with 31 additions and 13 deletions.
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
@@ -7,7 +7,7 @@
   <repositories>
     <repository>
       <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <url>https://otto.takari.io/content/repositories/rubygems/maven/releases</url>
     </repository>
   </repositories>
 

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
@@ -2,6 +2,10 @@
 
 gemfile
 
+repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
+            :id => 'takari-rubygems-releases' )
+
 id 'org.jruby.osgi:gems-bundle', '1.0'
 
 packaging 'bundle'

diff --git a/maven/jruby-dist/pom.rb b/maven/jruby-dist/pom.rb
@@ -24,7 +24,7 @@
       file( :exists => '../jruby' )
     end
 
-    repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+    repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
                 :id => 'rubygems-releases' )
   end
 

diff --git 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'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 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
@@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.18',
 # a gem to be used
 gem 'flickraw', '0.9.7'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 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
@@ -10,7 +10,7 @@
 # a gem to be used
 gem 'flickraw', '0.9.7'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 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
@@ -16,7 +16,7 @@ jar( 'org.jruby.rack:jruby-rack', '1.1.18',
 # a gem to be used
 gem 'flickraw', '0.9.7'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 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
@@ -10,7 +10,7 @@
 # a gem to be used
 gem 'virtus', '0.5.5'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 jruby_plugin :gem, :includeRubygemsInResources => 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
@@ -2,6 +2,10 @@
 
 gemfile
 
+repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
+              :id => 'rubygems-releases' )
+
 id 'org.rubygems:zip', VERSION
 
 jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
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
@@ -2,6 +2,10 @@
 
 gemfile
 
+repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
+              :id => 'rubygems-releases' )
+
 id 'org.rubygems:gem1', '1'
 
 jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
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
@@ -2,6 +2,10 @@
 
 gemfile
 
+repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
+              :id => 'rubygems-releases' )
+
 id 'org.rubygems:gem2', '2'
 
 jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'
diff --git a/maven/jruby/src/it/runnable/Mavenfile b/maven/jruby/src/it/runnable/Mavenfile
@@ -5,6 +5,10 @@ properties( 'jruby.plugins.version' => '1.0.10' )
 
 gemfile
 
+repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
+              :id => 'rubygems-releases' )
+
 gem 'bundler', '1.7.7'
 
 pom 'org.jruby:jruby', '${jruby.version}'

diff --git 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'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 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
@@ -10,7 +10,7 @@
 # a gem to be used
 gem 'virtus', '0.5.5'
 
-repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'rubygems-releases' )
 
 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
@@ -9,10 +9,10 @@
             'logback.version' => '1.0.13',
             # needed by felix-bundle-plugin
             'polyglot.dump.pom' => 'pom.xml' )
-            'jruby.version' => '9.0.0.0' )
 
-pom 'org.jruby:jruby', '@project.version@'
+pom 'org.jruby:jruby', '${jruby.version}'
 
+repositories.clear
 repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
             :id => 'takari-rubygems-releases' )
 

diff --git a/test/pom.rb b/test/pom.rb
@@ -37,8 +37,6 @@ def truffle_spec_config(spec_type, generate_report)
   inherit 'org.jruby:jruby-parent', version
   id 'org.jruby:jruby-tests'
 
-  #repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
-  #            :id => 'tb-rubygems-releases' )
   repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
               :id => 'rubygems-releases' )