Mavenfile in jruby-jars-1.7.13 vs Mavenfile in jruby-jars-1.7.14

@@ -1,12 +1,10 @@
 #-*- mode: ruby -*-
+gemspec
 
-gemspec :include_jars => true
+inherit "org.jruby:jruby-artifacts:#{model.version.sub( /.dev$/, '-SNAPSHOT' )}"
 
-model.version = model.version.sub(/\.SNAPSHOT/, '-SNAPSHOT').sub( /-SNAPSHOT-SNAPSHOT/, '-SNAPSHOT' )
-inherit "org.jruby:jruby-artifacts:#{model.version}"
-
 name "JRuby Jars Gem"
 
 jar 'org.jruby:jruby-core-complete', '${project.parent.version}'
 jar 'org.jruby:jruby-stdlib-complete', '${project.parent.version}'
 
@@ -18,24 +16,24 @@
                                   :includes => ['*.jar'] } ],
                  :failOnError => false )
 end
 
 properties( 'tesla.dump.pom' => 'pom.xml',
-            'tesla.dump.readonly' => true,
+            'tesla.dump.readOnly' => true,
             'jruby.home' => '${basedir}/../../' )
 
-jruby_plugin :gem do
+jruby_plugin!( :gem,
+               :gemspec => 'jruby-jars.gemspec',
+               :includeDependencies => true ) do
   execute_goals :id => 'default-push', :skip => true
 end
 
-execute 'rename gem file', :package do |ctx|
+plugin :install, :skip => true
 
+execute 'rename gem file', :package do |ctx|
   require 'fileutils'
-  gem = File.join( ctx.project.build.directory,
-                   ctx.project.build.final_name + ".gem" )
-  source = gem.sub( /-SNAPSHOT/, '.SNAPSHOT' )
-  FileUtils.mv( source, gem ) if gem.match( /-SNAPSHOT/ ) and File.exists?( source )
-
+  FileUtils.rm_rf(Dir["#{ctx.project.build.directory}/*.gem"])
+  FileUtils.mv(Dir["#{ctx.project.basedir}/*.gem"], ctx.project.build.directory)
 end
 
 plugin( :invoker,
         :projectsDirectory => 'src/it',
         :cloneProjectsTo => '${project.build.directory}/it',