[build] no torquebox repo the second

jruby · Aug 10, 2015 · aff8cc3 · aff8cc3
1 parent 9946fae
commit aff8cc3
Showing 6 changed files with 10 additions and 14 deletions.
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,9 +2,8 @@
 
 gemfile
 
-repositories.clear
-repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
-            :id => 'takari-rubygems-releases' )
+model.repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases', :id => 'rubygems-releases' )
 
 id 'org.jruby.osgi:gems-bundle', '1.0'
 

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,9 +2,8 @@
 
 gemfile
 
-repositories.clear
-repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
-              :id => 'rubygems-releases' )
+model.repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases', :id => 'rubygems-releases' )
 
 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
@@ -2,7 +2,7 @@
 
 gemfile
 
-repositories.clear
+model.repositories.clear
 repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
               :id => 'rubygems-releases' )
 

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,7 +2,7 @@
 
 gemfile
 
-repositories.clear
+model.repositories.clear
 repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
               :id => 'rubygems-releases' )
 

diff --git a/maven/jruby/src/it/runnable/Mavenfile b/maven/jruby/src/it/runnable/Mavenfile
@@ -5,9 +5,8 @@ properties( 'jruby.plugins.version' => '1.0.10' )
 
 gemfile
 
-repositories.clear
-repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
-              :id => 'rubygems-releases' )
+model.repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases', :id => 'rubygems-releases' )
 
 gem 'bundler', '1.7.7'
 

diff --git a/maven/jruby/src/templates/osgi_all_inclusive/pom.rb b/maven/jruby/src/templates/osgi_all_inclusive/pom.rb
@@ -12,9 +12,8 @@
 
 pom 'org.jruby:jruby', '${jruby.version}'
 
-repositories.clear
-repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
-            :id => 'takari-rubygems-releases' )
+model.repositories.clear
+repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases', :id => 'rubygems-releases' )
 
 jruby_plugin! :gem, :includeRubygemsInResources => true, :jrubyVersion => '9.0.0.0'