ruby-maven 3.3.13 → 3.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d3a1840b8fef43b4e76b82926297649974c1bae2f490d2a63fcef44f844a38
-  data.tar.gz: 16b5a979c554429d4bbaa76073bd67603ad5bae23ca0bd7ae527c2faa4ba7990
+  metadata.gz: 4127b3dc5999c5c6b0233e3f1f8e9c42bd09f7b7fa496f29738ab40bc29d0b7e
+  data.tar.gz: 3a69b741ece5d325f733d87538978b75b6c9792f37da3f848055a683a80d3e0d
 SHA512:
-  metadata.gz: 25e8c568c422c76e94396c87293c5111466e26f9a6d323dee6d0af2bb5cb661e86ce54110a64a3f17f17d3455f579d1fa52b934aa853866bd16b73907c665915
-  data.tar.gz: 30b95e0e2b5720e312d1a33e61f7d2aab6ee5e14fa7d5ce039f9d41c3b3ce5eeba7e9bb741826826223571cde285c3a6397547dbbfe9d92cf218aff8d0825b11
+  metadata.gz: cb6537c61ea4ee67b3de21248843b7cea00c88410f0d3f9cc89c6f874f0b5b45c6480300f7ea11d6e676d17f719bcd4aa132b70944d25222d124ce14a12d846e
+  data.tar.gz: 9021c85658a93e6eceae098144a4d706fd64b58c163d553af6bed686f7b17adf362839e0ef74c1c50aa5bc506085a622ac309e943d0bc42814f7a9573f1dd643

data/.mvn/extensions.xml

@@ -8,6 +8,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.8</version>
+    <version>0.7.1</version>
   </extension>
 </extensions>

data/Mavenfile

@@ -1,8 +1,25 @@
 # -*- mode:ruby -*-
 
 gemspec
+properties 'push.skip': true, 'jruby.version': '9.3.1.0'
 
-properties 'push.skip': true, 'jruby.version': '9.3.3.0'
+load File.join( basedir,'lib/maven/ruby/version.rb')
+
+jar "io.takari.polyglot:polyglot-ruby:#{Maven::Ruby::POLYGLOT_VERSION}", scope: :provided
+
+execute 'cleanup extensions', 'initialize' do |ctx|
+  FileUtils.rm_rf "#{ctx.project.build.directory}/../lib/extensions"
+end
+
+plugin :dependency do
+
+  execute_goal(:"copy-dependencies",
+               phase: 'prepare-package',
+               includeScope: :provided,
+               includeGroupIds: 'io.takari.polyglot',
+               outputDirectory: '${project.build.directory}/../lib/extensions')
+
+end
 
 profile :id => :release do
   properties 'maven.test.skip' => true, 'invoker.skip' => true

data/README.md

@@ -56,7 +56,19 @@ other is closer to maven in its naming.
 
 it is licensed under (EPL-1.0)[https://www.eclipse.org/legal/epl-v10.html]
 
-## contributing #
+## building ##
+
+Prepare and pack the gem under ./pkg
+```
+./mvnw install
+```
+
+Push the gem to rubygems.org
+```
+./mvnw deploy -Prelease
+```
+
+## contributing ##
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/lib/maven/ruby/version.rb

@@ -1,5 +1,6 @@
 module Maven
   module Ruby
-    VERSION = '3.3.13'.freeze
+    VERSION = '3.9.2'.freeze
+    POLYGLOT_VERSION = "0.7.1".freeze
   end
 end

data/lib/ruby_maven.rb

@@ -20,9 +20,9 @@
 #
 require 'maven'
 require 'maven/ruby/maven'
+require 'maven/ruby/version'
 
 module RubyMaven
-  POLYGLOT_VERSION = "0.1.15"
 
   def self.exec( *args )
     if File.exist?('settings.xml') and not args.member?('-s') and not args.member?('--settings')
@@ -30,7 +30,6 @@ module RubyMaven
       args << 'settings.xml'
     end
     if args.member?('-version') or args.member?('--version') or args.member?('-v')
-      warn "Polyglot Maven Extension #{version}"
       launch( '--version' )
     elsif defined? Bundler
       # it can be switching from ruby to jruby with invoking maven
@@ -58,40 +57,37 @@ module RubyMaven
                          xml = File.read( File.join( dir, '.mvn/extensions.xml' ) )
                          xml.sub( /.*<version>/m, '' ).sub(/<\/version>.*/m, '' )
                        rescue Errno::ENOENT => e
-                         nil
+                         Maven::Ruby::POLYGLOT_VERSION
                        end
-    POLYGLOT_VERSION.replace(polyglot_version) if polyglot_version
-    POLYGLOT_VERSION
   end
 
   def self.launch( *args )
+    if args.member?('--version') or args.member?('--show-version')
+      warn "Polyglot Maven Extension #{Maven::Ruby::POLYGLOT_VERSION} via ruby-maven #{Maven::Ruby::VERSION}"
+    end
     old_maven_home = ENV['M2_HOME']
     ENV['M2_HOME'] = Maven.home
-
-    extensions = File.join( '.mvn/extensions.xml' )
-    if has_extensions = File.exists?( extensions )
-      # tests need copy instead of move
-      FileUtils.cp( extensions, extensions + ".orig" )
-    else
-      FileUtils.mkdir_p( '.mvn' )
+    ext_dir = File.join(Maven.lib, 'ext')
+    FileUtils.mkdir_p(ext_dir)
+    local_dir = File.join(__dir__, 'extensions')
+    Dir.new(local_dir).select do |file|
+      file =~ /.*\.jar$/
+    end.each do |jar|
+      source = File.join(local_dir, jar)
+      if jar =~ /polyglot-.*-#{Maven::Ruby::POLYGLOT_VERSION}.jar/
+        # ruby maven defines the polyglot version and this jar sets up its classpath
+        # i.e. on upgrade or downgrade the right version will be picked
+        FileUtils.cp(source, File.join(ext_dir, jar.sub(/-[0-9.]*(-SNAPSHOT)?.jar$/, '.jar')))
+      elsif not File.exists?(File.join(ext_dir, jar)) and not jar =~ /jruby-(core|stdlib).*/
+        # jar files are immutable as they carry the version
+        warn jar
+        FileUtils.cp(source, File.join(ext_dir, jar.sub(/-9.4.5.0/, '')))
+      end
     end
-    FileUtils.cp( File.join( dir, extensions ), extensions ) rescue nil
-
-    # setup version
-    self.version
 
     Maven.exec( *args )
 
   ensure
     ENV['M2_HOME'] = old_maven_home
-    
-    FileUtils.rm_f( extensions )
-    if has_extensions
-      FileUtils.move( extensions + '.orig', extensions )
-    else
-      dir = File.dirname( extensions )
-      # delete empty .mvn directory
-      FileUtils.rm_rf( dir ) if Dir[File.join(dir, '*')].size == 0
-    end
   end
 end

data/ruby-maven.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options = ["--main", "README.md"]
 
-  s.add_dependency 'ruby-maven-libs', "~> 3.3.9"
+  s.add_dependency 'ruby-maven-libs', "~> 3.9.9"
   s.add_development_dependency 'minitest', '~> 5.3'
   s.add_development_dependency 'rake', '~> 12.3'
 end

data/spec/ruby_maven_spec.rb

@@ -10,7 +10,7 @@ describe RubyMaven do
       _, err = capture_io do
         RubyMaven.exec( '--version' )
       end
-      _(err).must_match /Polyglot Maven Extension 0.4.8/
+      _(err).must_match /Polyglot Maven Extension 0.7/
       xml = File.read('.mvn/extensions.xml')
       _(xml).must_equal "dummy\n"
     end
@@ -29,9 +29,7 @@ describe RubyMaven do
       RubyMaven.exec( '-Dverbose', 'package', '-Djruby.version=9.3.0.0' )
     end
     _(out).must_match /mvn -Dverbose package/
-    _(File.exists?( gem_name )).must_equal true
-    _(File.exists?( '.mvn/extensions.xml' )).must_equal true
-    _(File.exists?( '.mvn/extensions.xml.orig' )).wont_equal true
+    _(File.exist?( gem_name )).must_equal true
   end
   
 end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: ruby-maven
 version: !ruby/object:Gem::Version
-  version: 3.3.13
+  version: 3.9.2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.9.9
   name: ruby-maven-libs
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.9
+        version: 3.9.9
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -66,6 +66,8 @@ files:
 - README.md
 - Rakefile
 - bin/rmvn
+- lib/extensions/polyglot-common-0.7.1.jar
+- lib/extensions/polyglot-ruby-0.7.1.jar
 - lib/maven/ruby.rb
 - lib/maven/ruby/maven.rb
 - lib/maven/ruby/tasks.rb