Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

source 'https://gem.coop'
source 'https://rubygems.org'

gemspec

Expand Down
43 changes: 16 additions & 27 deletions Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,30 @@ plugin_repository id: :mavengems, url: 'mavengem:https://rubygems.org'

jruby_plugin(:minitest, minispecDirectory: 'specs/*_spec.rb') do
execute_goals(:spec)
gem 'ruby-maven', '${ruby-maven.version}'
end

# retrieve the ruby-maven version
gemfile_profile = @model.profiles.detect do |p|
p.id.to_sym == :gemfile
end || @model
ruby_maven = gemfile_profile.dependencies.detect do |d|
d.artifact_id == 'ruby-maven'
end

properties('jruby.versions' => ['${jruby.version}'].join(','),
# just lock the version
'bundler.version' => '2.5.11',
'ruby-maven.version' => ruby_maven.version,
'jruby.version' => '9.4.8.0',
'jruby.plugins.version' => '3.0.2',
'jruby.plugins.version' => '3.0.6',
'push.skip' => true)

plugin :invoker, '1.8' do
execute_goals(:install, :run,
id: 'integration-tests',
projectsDirectory: 'integration',
streamLogs: true,
goals: ['install'],
preBuildHookScript: 'setup.bsh',
postBuildHookScript: 'verify.bsh',
cloneProjectsTo: '${project.build.directory}',
properties: { 'jar-dependencies.version' => '${project.version}',
# use an old jruby with old ruby-maven here
'jruby.version' => '${jruby.version}',
'jruby.plugins.version' => '${jruby.plugins.version}',
'bundler.version' => '${bundler.version}',
'ruby-maven.version' => '${ruby-maven.version}' })
end
#plugin :invoker, '1.8' do
# execute_goals(:install, :run,
# id: 'integration-tests',
# projectsDirectory: 'integration',
# streamLogs: true,
# goals: ['install'],
# preBuildHookScript: 'setup.bsh',
# postBuildHookScript: 'verify.bsh',
# cloneProjectsTo: '${project.build.directory}',
# properties: { 'jar-dependencies.version' => '${project.version}',
# # use an old jruby with old ruby-maven here
# 'jruby.version' => '${jruby.version}',
# 'jruby.plugins.version' => '${jruby.plugins.version}',
# 'bundler.version' => '${bundler.version}', })
#end

distribution_management do
repository id: :ossrh, url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/'
Expand Down
2 changes: 0 additions & 2 deletions example/example.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,5 @@ Gem::Specification.new do |s|
# needed to compile src/main/java/** into lib/example.jar
s.add_development_dependency 'rake-compiler', '~> 0.9'

# avoids to install it on the fly when jar-dependencies needs it
s.add_development_dependency 'ruby-maven', '~> 3.9', '>= 3.9.3'
s.metadata['rubygems_mfa_required'] = 'true'
end
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# using ruby-maven gem build jar
# building a gem with jar dependencies

## setup

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ gem 'sinatra', '~> 1.4'

group :development do
gem 'jar-dependencies', '0.3.0'
gem 'ruby-maven', '~> 3.9', '>= 3.9.3'
end
1 change: 0 additions & 1 deletion integration/bundle_with_path/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jar 'org.jruby:jruby-complete', '${jruby.version}'

gem 'jar-dependencies', '${jar-dependencies.version}'
gem 'bundler', '${bundler.version}'
gem 'ruby-maven', '${ruby-maven.version}'

jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
Expand Down
2 changes: 0 additions & 2 deletions integration/depending_gems/biglib/Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ pom 'org.jruby:jruby', '${jruby.version}'

gem 'jar-dependencies', '${jar-dependencies.version}'
gem 'bundler', '${bundler.version}'
gem 'ruby-maven', '${ruby-maven.version}'
gem 'ruby-maven-libs', '3.9.3'

jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jar 'org.jruby:jruby-complete', '${jruby.version}'

gem 'jar-dependencies', '${jar-dependencies.version}'
gem 'bundler', '${bundler.version}'
gem 'ruby-maven', '${ruby-maven.version}'

jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
Expand Down
7 changes: 0 additions & 7 deletions integration/install_ruby_maven_when_needed/Mavenfile

This file was deleted.

16 changes: 0 additions & 16 deletions integration/install_ruby_maven_when_needed/gem/Mavenfile

This file was deleted.

3 changes: 0 additions & 3 deletions integration/install_ruby_maven_when_needed/gem/lib/my.rb

This file was deleted.

7 changes: 0 additions & 7 deletions integration/install_ruby_maven_when_needed/gem/lib/my_jars.rb

This file was deleted.

21 changes: 0 additions & 21 deletions integration/install_ruby_maven_when_needed/gem/my.gemspec

This file was deleted.

6 changes: 0 additions & 6 deletions integration/install_ruby_maven_when_needed/pom.xml

This file was deleted.

9 changes: 0 additions & 9 deletions integration/install_ruby_maven_when_needed/verify.bsh

This file was deleted.

5 changes: 0 additions & 5 deletions integration/install_ruby_maven_when_needed/verify/Gemfile

This file was deleted.

39 changes: 0 additions & 39 deletions integration/install_ruby_maven_when_needed/verify/Mavenfile

This file was deleted.

19 changes: 0 additions & 19 deletions integration/install_ruby_maven_when_needed/verify/test_bundler.rb

This file was deleted.

19 changes: 0 additions & 19 deletions integration/install_ruby_maven_when_needed/verify/test_gem.rb

This file was deleted.

Loading