re-arrange release steps

Author: kares

Rakefile

@@ -24,27 +24,31 @@ end
 GENERATED = FileList.new
 
 namespace :clean do
-  desc "Remove generated files"
+  desc "Remove generated files (only)"
   task :generated do
     GENERATED.each { |fn| rm_r fn rescue nil }
   end
+  desc "Remove lib/*.jar (test) dependencies"
+  task :lib do
+    rm_r 'target/lib' rescue nil
+  end
 end
 
 directory 'target/classes'
 
 desc "Compile classes"
-task(:compile => 'target/classes') { sh 'mvn compile' }
+task(:compile => 'target/classes') { sh 'mvn compile -Dmdep.skip=true' }
 
 directory 'target/test-classes'
 
 desc "Compile test classes"
-task(:test_compile => 'target/test-classes') { sh 'mvn test-compile' }
+task(:test_compile => 'target/test-classes') { sh 'mvn test-compile -Dmdep.skip=true' }
 
 desc "Copy .jar dependencies for (local) testing"
-task(:test_jars) { sh 'mvn test-compile -P jars' }
+task(:test_jars) { sh 'mvn test-compile' }
 
 task(:test_prepare => ['target/classes', 'target/test-classes']) do
-  sh 'mvn compile test-compile -P jars'
+  sh 'mvn test-compile'
 end
 
 desc "Unpack the rack gem"
@@ -92,7 +96,7 @@ task :test_resources => ["target/test-classes"]
 namespace :resources do
   desc "Copy (and generate) resources"
   task :copy => :resources do
-    sh 'mvn process-resources'
+    sh 'mvn process-resources -Dmdep.skip=true'
   end
   desc "Generate test resources"
   task :test => :test_resources
@@ -215,17 +219,24 @@ task :release_checks do
       "Please run `mvn install' to bring the two files in sync."
   end
 
-  puts "Release looks ready to go!"
+  puts "release #{GEM_VERSION} looks ready to go ..."
 end
 
 desc "Release the gem to rubygems and jar to repository.codehaus.org"
 task :release => [:release_checks, :clean] do
+  args = ''
+  args << "-Dgpg.keyname=#{ENV['GPG_KEYNAME']} " if ENV['GPG_KEYNAME']
+
+  sh "mvn -Prelease #{args} -DupdateReleaseInfo=true clean deploy"
+
   sh "git tag #{GEM_VERSION}"
-  sh "mvn deploy -DupdateReleaseInfo=true"
-  sh "rake gem SKIP_SPECS=true" # already run specs with mvn
+
+  ENV['SKIP_SPECS'] = 'true'; Rake::Task['gem'].invoke
   sh "gem push target/jruby-rack-#{GEM_VERSION}.gem"
+
   git_branch = `git branch | sed -n '/\* /s///p'`.chomp
   sh "git push --tags #{ENV['GIT_REMOTE'] || 'origin'} #{git_branch}"
+
   puts "released JRuby-Rack #{GEM_VERSION} update next SNAPSHOT version using `rake update_version`"
 end
 

pom.xml

@@ -202,6 +202,24 @@
         <artifactId>maven-help-plugin</artifactId>
         <version>2.2</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.9</version>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <!-- .jars for tests to pick up, skipped with -Dmdep.skip=true -->
+            <configuration>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+              <excludeGroupIds>org.jruby,rubygems</excludeGroupIds>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
           <groupId>de.saumya.mojo</groupId>
           <artifactId>gem-maven-plugin</artifactId>
@@ -273,33 +291,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>jars</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>2.8</version>
-            <executions>
-              <execution>
-                <phase>process-sources</phase>
-                <goals>
-                  <goal>copy-dependencies</goal>
-                </goals>
-                <configuration>
-                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                  <excludeGroupIds>org.jruby</excludeGroupIds>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>release</id>
       <activation>