* remove misleading info

* add project/build/final_name * add comment when to remove the hacks ones gem-maven-plugin obeys the final_name [skip ci]
jruby · Sep 22, 2014 · 0cf59f7 · 0cf59f7
1 parent 4e15ab2
commit 0cf59f7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/maven/jruby-jars/DEV_INSTRUCTIONS b/maven/jruby-jars/DEV_INSTRUCTIONS
@@ -1,7 +1,6 @@
 In order to build a new jruby-jars gem, here is the process:
 
-* Run 'rake gem'
+* cd ../../
+* mvn -Pjruby-jars
 
-The 'update' task will update version.rb and create the jar files.
-You may commit the contents of the version.rb file, but it is not a requirement.
-However update should always be run before building the gem to ensure the latest code is pulled in.
+the gem will be in ./pkg directory
diff --git a/maven/jruby-jars/History.txt b/maven/jruby-jars/History.txt
diff --git a/maven/jruby-jars/Mavenfile b/maven/jruby-jars/Mavenfile
@@ -1,7 +1,9 @@
 #-*- mode: ruby -*-
 gemspec
 
-inherit "org.jruby:jruby-artifacts:#{model.version.sub( /.dev$/, '-SNAPSHOT' )}"
+ruby_version = model.version
+
+inherit "org.jruby:jruby-artifacts:#{ruby_version.sub( /.dev$/, '-SNAPSHOT' )}"
 
 model.version = nil
 
@@ -29,8 +31,12 @@ jruby_plugin!( :gem,
   execute_goals :id => 'default-push', :skip => true
 end
 
-plugin :install, :skip => true
+build do
+  final_name "${project.artifactId}-#{ruby_version}"
+end
 
+# TODO remove once gem-maven-plugin honors the final_name
+plugin :install, :skip => true
 execute 'rename gem file', :verify do |ctx|
   require 'fileutils'
   FileUtils.rm_rf(Dir["#{ctx.project.build.directory}/*.gem"])

diff --git a/maven/jruby-jars/Rakefile b/maven/jruby-jars/Rakefile
diff --git a/maven/jruby-jars/pom.xml b/maven/jruby-jars/pom.xml
@@ -71,6 +71,7 @@ freezing to) a specific jruby-complete jar version.</description>
       </extension>
     </extensions>
     <directory>${basedir}/pkg</directory>
+    <finalName>${project.artifactId}-1.7.16.dev</finalName>
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>