lib/maven/tools/dsl.rb in maven-tools-1.1.7 vs lib/maven/tools/dsl.rb in maven-tools-1.2.0.pre1
- old
+ new
@@ -96,11 +96,11 @@
current = @current
@current = @model
end
repository :id => id || 'mavengems', :url => "mavengem:#{url}"
- extension! 'org.torquebox.mojo:mavengem-wagon', '${mavengem.wagon.version}'
+ extension! 'org.jruby.maven:mavengem-wagon', '${mavengem.wagon.version}'
@current = current if current
block.call if block
end
@@ -140,11 +140,11 @@
name = 'Gemfile'
end
name = ::File.join( basedir, name ) unless ::File.exists?( name )
if @context == :project
build do
- extension! 'org.torquebox.mojo:mavengem-wagon', '${mavengem.wagon.version}'
+ extension! 'org.jruby.maven:mavengem-wagon', '${mavengem.wagon.version}'
directory '${basedir}/pkg'
end
end
@inside_gemfile = true
# the eval might need those options for gemspec declaration
@@ -704,11 +704,11 @@
if val =~ /jruby[WJ]ar/
if not @current.properties.key?( 'jruby9.plugins.version' ) and
not (@context == :profile and model.properties.key?( 'jruby9.plugins.version' ) )
properties( 'jruby9.plugins.version' => VERSIONS[ :jruby9_plugins ] )
end
- extension 'org.torquebox.mojo', 'jruby9-extensions', '${jruby9.plugins.version}'
+ extension 'org.jruby.maven', 'jruby9-extensions', '${jruby9.plugins.version}'
build do
directory '${basedir}/pkg'
end
end
end
@@ -899,10 +899,10 @@
properties( 'mavengem.wagon.version' => VERSIONS[ :mavengem_wagon ] )
end
end
def do_jruby_plugin( method, *gav, &block )
- gav[ 0 ] = "de.saumya.mojo:#{gav[ 0 ]}-maven-plugin"
+ gav[ 0 ] = "org.jruby.maven:#{gav[ 0 ]}-maven-plugin"
if gav.size == 1 || gav[ 1 ].is_a?( Hash )
setup_jruby_plugins_version
gav.insert( 1, '${jruby.plugins.version}' )
end
send( method, *gav, &block )