diff --git a/Gemfile b/Gemfile
index 04be930..470ea63 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-source 'https://gem.coop'
+source 'https://rubygems.org'
gemspec
diff --git a/Mavenfile b/Mavenfile
index d43d8c4..5709355 100644
--- a/Mavenfile
+++ b/Mavenfile
@@ -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/'
diff --git a/example/example.gemspec b/example/example.gemspec
index e36b7a9..da41371 100644
--- a/example/example.gemspec
+++ b/example/example.gemspec
@@ -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
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-rake-compiler/README.md b/examples/gem-with-java-extension-and-jar-dependencies/using-rake-compiler/README.md
index 8af89f5..12a4d2a 100644
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-rake-compiler/README.md
+++ b/examples/gem-with-java-extension-and-jar-dependencies/using-rake-compiler/README.md
@@ -1,4 +1,4 @@
-# using ruby-maven gem build jar
+# building a gem with jar dependencies
## setup
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/Gemfile b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/Gemfile
deleted file mode 100644
index 7f4f5e9..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/README.md b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/README.md
deleted file mode 100644
index 8af89f5..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# using ruby-maven gem build jar
-
-## setup
-
-```
-bundle install
-```
-
-which is important since it will create a file lib/gem-name_jars.rb
-and installs the jar dependencies into a local cache (local maven repository)
-
-## lock down version of jar dependencies
-
-lock down may or may not be needed (best just lock them down). in case you want to lock down your versions for the jars execute:
-
-```
-lock_jars
-```
-
-## build compile and create jar
-
-```
-rake compile
-```
-
-## use it
-
-```
-jruby test.rb
-```
-
-## pack gem
-
-```
-rake package
-```
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/Rakefile b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/Rakefile
deleted file mode 100644
index 11f9371..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/Rakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-require 'ruby-maven'
-desc 'Pack jar after compiling classes'
-task :compile do
- RubyMaven.exec('prepare-package')
-end
-
-desc 'Clean build'
-task :clean do
- RubyMaven.exec('clean')
-end
-
-task default: [:compile]
-
-require 'rubygems/package_task'
-Gem::PackageTask.new(eval(File.read('mygem.gemspec'))) do # rubocop:disable Security/Eval
- desc 'Pack gem'
- task package: [:compile]
-end
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/lib/mygem.rb b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/lib/mygem.rb
deleted file mode 100644
index 9add045..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/lib/mygem.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-# can be hardcoded here but for copy the example around that is easier
-require Dir["#{File.dirname(__FILE__)}/*_jars.rb"].first
-require Dir["#{File.dirname(__FILE__)}/*jar"].first
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/mygem.gemspec b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/mygem.gemspec
deleted file mode 100644
index ff8a135..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/mygem.gemspec
+++ /dev/null
@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-# use the version from the main project
-require "#{File.dirname File.expand_path(__FILE__)}/../../lib/jars/version"
-
-Gem::Specification.new do |s|
- s.name = File.basename(File.dirname(File.expand_path(__FILE__)))
- s.version = '1.0.0'
- s.author = ['example person']
- s.email = ['mail@example.com']
- s.summary = "summary of #{s.name}"
- s.description = "description of #{s.name}"
-
- # important to get the jars installed
- s.platform = 'java'
-
- s.files = Dir['lib/**/*.rb']
- s.files += Dir['lib/*.jar']
- s.files += Dir['*.file']
- s.files += Dir['*.gemspec']
-
- s.required_ruby_version = '>= 2.6'
-
- s.requirements << 'jar org.slf4j, slf4j-api, 1.7.7'
- s.requirements << 'jar org.slf4j, slf4j-simple, 1.7.7, :scope => :test'
-
- s.add_runtime_dependency 'jar-dependencies', "~> #{Jars::VERSION}"
- s.metadata['rubygems_mfa_required'] = 'true'
-end
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/src/main/java/App.java b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/src/main/java/App.java
deleted file mode 100644
index 50c12eb..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/src/main/java/App.java
+++ /dev/null
@@ -1,7 +0,0 @@
-class App
-{
- public static String hello(String name)
- {
- return "hello " + name;
- }
-}
diff --git a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/test.rb b/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/test.rb
deleted file mode 100644
index 95c470d..0000000
--- a/examples/gem-with-java-extension-and-jar-dependencies/using-ruby-maven/test.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-# setup env
-$LOAD_PATH << 'lib'
-
-# load our gem and its jars
-require 'mygem'
-
-# load test jar
-require_jar 'org.slf4j', 'slf4j-simple', '1.7.7'
-
-# use it
-logger = org.slf4j.LoggerFactory.get_logger('root')
-logger.info(Java::App.hello('world'))
diff --git a/examples/sinatra-app/having-jarfile-and-gems-with-jar-dependencies/Gemfile b/examples/sinatra-app/having-jarfile-and-gems-with-jar-dependencies/Gemfile
index fb9eb31..9144b6d 100644
--- a/examples/sinatra-app/having-jarfile-and-gems-with-jar-dependencies/Gemfile
+++ b/examples/sinatra-app/having-jarfile-and-gems-with-jar-dependencies/Gemfile
@@ -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
diff --git a/integration/bundle_with_path/Mavenfile b/integration/bundle_with_path/Mavenfile
index 87a1408..6a21e5a 100644
--- a/integration/bundle_with_path/Mavenfile
+++ b/integration/bundle_with_path/Mavenfile
@@ -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
diff --git a/integration/depending_gems/biglib/Mavenfile b/integration/depending_gems/biglib/Mavenfile
index 8e57b2a..0f572ba 100644
--- a/integration/depending_gems/biglib/Mavenfile
+++ b/integration/depending_gems/biglib/Mavenfile
@@ -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
diff --git a/integration/gemspec_with_classifier_and_exclusions/Mavenfile b/integration/gemspec_with_classifier_and_exclusions/Mavenfile
index eab2925..280af25 100644
--- a/integration/gemspec_with_classifier_and_exclusions/Mavenfile
+++ b/integration/gemspec_with_classifier_and_exclusions/Mavenfile
@@ -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
diff --git a/integration/install_ruby_maven_when_needed/Mavenfile b/integration/install_ruby_maven_when_needed/Mavenfile
deleted file mode 100644
index 40dff07..0000000
--- a/integration/install_ruby_maven_when_needed/Mavenfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-id 'jar-dependencies:install-ruby-maven:0'
-
-packaging 'pom'
-
-modules %w[gem verify]
diff --git a/integration/install_ruby_maven_when_needed/gem/Mavenfile b/integration/install_ruby_maven_when_needed/gem/Mavenfile
deleted file mode 100644
index c7a60f9..0000000
--- a/integration/install_ruby_maven_when_needed/gem/Mavenfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-inherit 'jar-dependencies:install-ruby-maven:0' do
- # TODO: should not be needed with ruby-maven
- relative_path '../Mavenfile'
-end
-
-gemspec
-
-# use the current jar dependencies gem
-model.dependencies.each do |d|
- d.version = '${jar-dependencies.version}' if d.artifact_id == 'jar-dependencies'
-end
-
-properties('gem.home' => '${project.basedir}/../../rubygems',
- 'gem.path' => '${gem.home}')
diff --git a/integration/install_ruby_maven_when_needed/gem/lib/my.rb b/integration/install_ruby_maven_when_needed/gem/lib/my.rb
deleted file mode 100644
index 2481538..0000000
--- a/integration/install_ruby_maven_when_needed/gem/lib/my.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require 'my_jars'
diff --git a/integration/install_ruby_maven_when_needed/gem/lib/my_jars.rb b/integration/install_ruby_maven_when_needed/gem/lib/my_jars.rb
deleted file mode 100644
index af41c9f..0000000
--- a/integration/install_ruby_maven_when_needed/gem/lib/my_jars.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-# this is a generated file, to avoid over-writing it just delete this comment
-require 'jar_dependencies'
-
-require_jar('org.bouncycastle', 'bcpkix-jdk15on', '1.49')
-require_jar('org.bouncycastle', 'bcprov-jdk15on', '1.49')
diff --git a/integration/install_ruby_maven_when_needed/gem/my.gemspec b/integration/install_ruby_maven_when_needed/gem/my.gemspec
deleted file mode 100644
index 4dbd958..0000000
--- a/integration/install_ruby_maven_when_needed/gem/my.gemspec
+++ /dev/null
@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-Gem::Specification.new do |s|
- s.name = 'my'
- s.version = '1.1.1'
- s.author = 'example person'
- s.email = ['mail@example.com']
- s.summary = 'test gem'
-
- s.files << Dir['lib/**/*.rb']
- s.files << Dir['*file']
- s.files << 'my.gemspec'
-
- s.required_ruby_version = '>= 2.6'
-
- s.add_runtime_dependency 'jar-dependencies'
-
- s.platform = 'java'
- s.requirements << "jar 'com.fasterxml.jackson.core:jackson-core', '2.3.0'"
- s.metadata['rubygems_mfa_required'] = 'true'
-end
diff --git a/integration/install_ruby_maven_when_needed/pom.xml b/integration/install_ruby_maven_when_needed/pom.xml
deleted file mode 100644
index ab5dc4c..0000000
--- a/integration/install_ruby_maven_when_needed/pom.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- jar-dependencies.its
- install_ruby_maven_when_needed
- 0.0.0
-
diff --git a/integration/install_ruby_maven_when_needed/verify.bsh b/integration/install_ruby_maven_when_needed/verify.bsh
deleted file mode 100644
index e0e74c2..0000000
--- a/integration/install_ruby_maven_when_needed/verify.bsh
+++ /dev/null
@@ -1,9 +0,0 @@
-import java.io.*;
-import org.codehaus.plexus.util.FileUtils;
-
-String log = FileUtils.fileRead( new File( basedir, "build.log" ) );
-String expected = "my-1.1.1-java/deps.lst";
-if ( !log.contains( expected ) )
-{
- throw new RuntimeException( "log file does not contain '" + expected + "'" );
-}
diff --git a/integration/install_ruby_maven_when_needed/verify/Gemfile b/integration/install_ruby_maven_when_needed/verify/Gemfile
deleted file mode 100644
index aa7365f..0000000
--- a/integration/install_ruby_maven_when_needed/verify/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gemspec path: '../gem'
diff --git a/integration/install_ruby_maven_when_needed/verify/Mavenfile b/integration/install_ruby_maven_when_needed/verify/Mavenfile
deleted file mode 100644
index ca0b6a4..0000000
--- a/integration/install_ruby_maven_when_needed/verify/Mavenfile
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-inherit 'jar-dependencies:install-ruby-maven:0' do
- # TODO: should not be needed with ruby-maven
- relative_path '../Mavenfile'
-end
-
-packaging 'pom'
-
-jar 'org.jruby:jruby-complete', '${jruby.version}'
-
-plugin('org.codehaus.mojo:exec-maven-plugin', '3.5.0',
- executable: :java,
- environmentVariables: { 'GEM_HOME' => '${gem.home}',
- 'GEM_PATH' => '${gem.home}',
- 'JARS_VERBOSE' => true,
- 'BUNDLER_GEMFILE' => '${basedir}/Gemfile',
- 'PATH' => '${gem.home}/bin${path.separator}${env.PATH}' }) do
- execute_goal(:exec, id: 'gem install', phase: :test,
- arguments: ['-classpath',
- xml(''),
- 'org.jruby.Main', 'test_gem.rb', '${jar-dependencies.version}'])
- execute_goal(:exec, id: 'bundle install', phase: :test,
- arguments: ['-classpath',
- xml(''),
- 'org.jruby.Main', 'test_bundler.rb', '${jar-dependencies.version}'])
-end
-
-properties('gem.home' => '${project.basedir}/../../rubygems',
- 'gem.path' => '${gem.home}')
-
-repository id: 'mavengems', url: 'mavengem:https://rubygems.org'
-
-gem 'jar-dependencies', '${jar-dependencies.version}'
-gem 'bundler', '${bundler.version}'
-
-jruby_plugin :gem, '${jruby.plugins.version}' do
- execute_goal :initialize
-end
diff --git a/integration/install_ruby_maven_when_needed/verify/test_bundler.rb b/integration/install_ruby_maven_when_needed/verify/test_bundler.rb
deleted file mode 100644
index e99296a..0000000
--- a/integration/install_ruby_maven_when_needed/verify/test_bundler.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-gemspecs = File.join(Gem.dir, 'specifications', 'ruby-maven-*gemspec')
-Dir[gemspecs].each do |f|
- File.delete(f)
-rescue
- nil
-end
-
-version = ARGV[0]
-gem 'jar-dependencies', version.sub(/-SNAPSHOT/, '')
-
-Kernel.at_exit do
- raise "did not find two ruby-maven gems installed #{Dir[gemspecs]}" if Dir[gemspecs].size != 2
-end
-
-# this is like: gem install --ignore-dependencies, ../gem/pkg/my-1.1.1.gem
-ARGV.replace(['install'])
-load File.join(Gem.bindir, 'bundle')
diff --git a/integration/install_ruby_maven_when_needed/verify/test_gem.rb b/integration/install_ruby_maven_when_needed/verify/test_gem.rb
deleted file mode 100644
index 26781a7..0000000
--- a/integration/install_ruby_maven_when_needed/verify/test_gem.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-gemspecs = File.join(Gem.dir, 'specifications', 'ruby-maven-*gemspec')
-Dir[gemspecs].each do |f|
- File.delete(f)
-rescue
- nil
-end
-
-version = ARGV[0]
-gem 'jar-dependencies', version.sub(/-SNAPSHOT/, '')
-
-Kernel.at_exit do
- raise "did not find two ruby-maven gems installed #{Dir[gemspecs]}" if Dir[gemspecs].size != 2
-end
-
-# this is like: gem install --ignore-dependencies, ../gem/pkg/my-1.1.1.gem
-ARGV.replace(['install', '--ignore-dependencies', File.expand_path('../gem/pkg/my-1.1.1.gem', __dir__)])
-load File.join(JRuby.runtime.instance_config.jruby_home, 'bin/gem')
diff --git a/integration/jars_lock_gemfile/Mavenfile b/integration/jars_lock_gemfile/Mavenfile
index 73ae480..27450a2 100644
--- a/integration/jars_lock_gemfile/Mavenfile
+++ b/integration/jars_lock_gemfile/Mavenfile
@@ -41,7 +41,6 @@ properties('gem.home' => '${project.basedir}/../rubygems',
jar 'org.jruby:jruby-complete', '${jruby.version}'
gem 'jar-dependencies', '${jar-dependencies.version}'
-gem 'ruby-maven', '${ruby-maven.version}'
jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
diff --git a/integration/jars_lock_gemspec_with_jars/Mavenfile b/integration/jars_lock_gemspec_with_jars/Mavenfile
index 60b379f..4819e52 100644
--- a/integration/jars_lock_gemspec_with_jars/Mavenfile
+++ b/integration/jars_lock_gemspec_with_jars/Mavenfile
@@ -43,7 +43,6 @@ properties('gem.home' => '${project.basedir}/../rubygems',
jar 'org.jruby:jruby-complete', '${jruby.version}'
gem 'jar-dependencies', '${jar-dependencies.version}'
-gem 'ruby-maven', '${ruby-maven.version}'
jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
diff --git a/integration/lock_jars/Mavenfile b/integration/lock_jars/Mavenfile
index 3a5a1b9..95c57c8 100644
--- a/integration/lock_jars/Mavenfile
+++ b/integration/lock_jars/Mavenfile
@@ -26,7 +26,6 @@ properties('gem.home' => '${project.basedir}/../rubygems',
jar 'org.jruby:jruby-complete', '${jruby.version}'
gem 'jar-dependencies', '${jar-dependencies.version}'
-gem 'ruby-maven', '${ruby-maven.version}'
jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
diff --git a/integration/vendor_jars/Mavenfile b/integration/vendor_jars/Mavenfile
index d07b9cf..3e0fd12 100644
--- a/integration/vendor_jars/Mavenfile
+++ b/integration/vendor_jars/Mavenfile
@@ -25,7 +25,6 @@ properties('gem.home' => '${project.basedir}/../rubygems',
jar 'org.jruby:jruby-complete', '${jruby.version}'
gem 'jar-dependencies', '${jar-dependencies.version}'
-gem 'ruby-maven', '${ruby-maven.version}'
jruby_plugin :gem, '${jruby.plugins.version}' do
execute_goal :initialize
diff --git a/lib/jars/post_install_hook.rb b/lib/jars/post_install_hook.rb
index d979b71..ee06227 100644
--- a/lib/jars/post_install_hook.rb
+++ b/lib/jars/post_install_hook.rb
@@ -26,7 +26,6 @@
if ENV['JARS_SKIP'] != 'true' && ENV_JAVA['jars.skip'] != 'true'
require 'jars/installer'
jars = Jars::Installer.new(gem_installer.spec)
- jars.ruby_maven_install_options = gem_installer.options || {}
jars.vendor_jars
end
end