Skip to content

Commit

Permalink
do not preinstall ruby-maven on jruby-dist archives
Browse files Browse the repository at this point in the history 
fixes #3676 and jruby/jar-dependencies#39

[skip ci]
@mkristian
mkristian committed Mar 7, 2016
1 parent febf590 commit 102a088
Showing 1 changed file with 0 additions and 23 deletions.
23 changes: 0 additions & 23 deletions maven/jruby-dist/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -9,29 +9,6 @@
inherit "org.jruby:jruby-artifacts:#{version}"
packaging 'pom'

properties( 'main.basedir' => '${project.parent.parent.basedir}',
'ruby.maven.version' => '3.3.3',
'ruby.maven.libs.version' => '3.3.3' )

# pre-installed gems - not default gems !
gem 'ruby-maven', '${ruby.maven.version}', :scope => 'provided'

# HACK: add torquebox repo only when building from filesystem
# not when using the pom as "dependency" in some other projects
profile 'gem proxy' do

activation do
file( :exists => '../jruby' )
end

repository( :url => 'https://otto.takari.io/content/repositories/rubygems/maven/releases',
:id => 'rubygems-releases' )
end

jruby_plugin :gem do
execute_goal :initialize
end

phase 'prepare-package' do

plugin :dependency do

0 comments on commit 102a088

Please sign in to comment.