lib/maven/tools/dsl/gem_support.rb in maven-tools-1.0.13 vs lib/maven/tools/dsl/gem_support.rb in maven-tools-1.1.0
- old
+ new
@@ -25,10 +25,11 @@
def setup_jruby_plugins_version( project )
if not @parent.properties.key?( 'jruby.plugins.version' ) and
not project.properties.key?( 'jruby.plugins.version' )
@parent.properties( 'jruby.plugins.version' => VERSIONS[ :jruby_plugins ] )
+ @parent.properties( 'mavengem.wagon.version' => VERSIONS[ :mavengem_wagon ] )
end
end
def setup_gem_support( project, options, spec = nil )
unless project.properties.member?( 'project.build.sourceEncoding' )
@@ -40,13 +41,12 @@
else
require_path = spec.require_path
name = spec.name
end
- if ( nil == project.current.repositories.detect { |r| r.id == 'rubygems-releases' } && options[ :no_rubygems_repo ] != true )
-
- @parent.repository( 'rubygems-releases',
- 'http://rubygems-proxy.torquebox.org/releases' )
+ if ( nil == project.current.repositories.detect { |r| r.id == 'rubygems-releases' || r.id == 'mavengems' } && options[ :no_rubygems_repo ] != true && ! @parent.instance_variable_get(:@inside_gemfile))
+ @parent.repository( 'mavengems',
+ 'mavengem:https://rubygems.org' )
end
@parent.needs_torquebox = true
setup_jruby_plugins_version( project )