Skip to content

Commit

Permalink
* remove misleading info
Browse files Browse the repository at this point in the history
* add project/build/final_name
* add comment when to remove the hacks ones gem-maven-plugin obeys the final_name

[skip ci]
  • Loading branch information
mkristian committed Sep 22, 2014
1 parent 4e15ab2 commit 0cf59f7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 17 deletions.
7 changes: 3 additions & 4 deletions maven/jruby-jars/DEV_INSTRUCTIONS
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions maven/jruby-jars/History.txt

This file was deleted.

10 changes: 8 additions & 2 deletions maven/jruby-jars/Mavenfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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"])
Expand Down
7 changes: 0 additions & 7 deletions maven/jruby-jars/Rakefile

This file was deleted.

1 change: 1 addition & 0 deletions maven/jruby-jars/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 0cf59f7

Please sign in to comment.