Merge pull request #42 from chadlwilson/patch-1

Correct usage of maven-tools under JRuby 10.0.3+ and Ruby 4.0

Author: headius

.github/workflows/ci.yml

@@ -9,24 +9,28 @@ on:
 
 jobs:
   ci:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
 
       matrix:
-        ruby: [jruby-9.4.9.0, 3.3]
-        java: [8]
+        ruby: ['jruby-10', 'jruby-9.4', '4.0', '3.4', '3.3']
+        java: [8, 25]
+        exclude:
+          - ruby: 'jruby-10' # JRuby 10 requires Java 21+
+            java: 8
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Set up java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
-          distribution: zulu
           java-version: ${{ matrix.java }}
+          distribution: 'temurin'
+          cache: maven
 
       - name: Set up ruby
         uses: ruby/setup-ruby@v1

.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 *.gem
 .ruby-version
 pom.maven-tools.gemspec.xml
+.idea

.mvn/wrapper/maven-wrapper.jar

@@ -1 +1,3 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperVersion=3.3.4
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -3,6 +3,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "copyright-header", "1.0.8", :platform => :mri, :group => :copyright
-
 # vim: syntax=Ruby

Gemfile

@@ -1,32 +1,23 @@
 #-*- mode: ruby -*-
-
 task :default => [ :specs ]
 
 desc 'generate licenses data from internet'
 task :licenses do
   require 'open-uri'
-  require 'ostruct'
-  
+  require 'json'
+
   File.open( 'lib/maven/tools/licenses.rb', 'w' ) do |f|
-    url = 'http://opensource.org'
-    f.puts "require 'ostruct'"
+    url = 'https://opensource.org'
     f.puts 'module Maven'
     f.puts '  module Tools'
+    f.puts '    SpdxLicenseMeta = Struct.new(:short, :name, :url, keyword_init: true)'
     f.puts '    LICENSES = {}'
 
-    open( url + '/licenses/alphabetical' ).each_line do |line|
-      
-      if line =~ /.*"\/licenses\// and line =~ /<li>/
-        l = OpenStruct.new
-        line.sub!( /.*"(\/licenses\/([^"]*))">/ ) do
-          l.url = "http://opensource.org#{$1}"
-          l.short = $1.sub( /\/licenses\//, '' )
-          ''
-        end
-        line.sub!( /\ \(.*$/, '' )
-        f.puts "    LICENSES[ #{l.short.downcase.inspect} ] = OpenStruct.new :short => #{l.short.inspect}, :name => #{line.strip.inspect}, :url => #{l.url.inspect}"
-      end
-    end
+    JSON.parse(URI.open( url + '/api/licenses' ).read)
+        .select  { |l| l["spdx_id"].size > 0 && l["name"].size > 0 }
+        .sort_by { |l| l["spdx_id"].downcase }
+        .each    { |l| f.puts("    LICENSES[ #{l["spdx_id"].downcase.inspect} ] = SpdxLicenseMeta.new( short: #{l["spdx_id"].inspect}, name: #{l["name"].inspect}, url: #{l["_links"]["html"]["href"].inspect} ).freeze") }
+
     f.puts '    LICENSES.freeze'
     f.puts '  end'
     f.puts 'end'
@@ -48,23 +39,4 @@ task :specs do
   Dir['spec/**/*_spec.rb'].each { |f| require f.sub(/spec\//, '') }
 end
 
-task :headers do
-  require 'copyright_header'
-
-  s = Gem::Specification.load( Dir["*gemspec"].first )
-
-  args = {
-    :license => s.license, 
-    :copyright_software => s.name,
-    :copyright_software_description => s.description,
-    :copyright_holders => s.authors,
-    :copyright_years => [Time.now.year],
-    :add_path => "lib:src",
-    :output_dir => './'
-  }
-
-  command_line = CopyrightHeader::CommandLine.new( args )
-  command_line.execute
-end
-
 # vim: syntax=Ruby

Rakefile

@@ -43,9 +43,6 @@ def model
         @model
       end
 
-      # TODO remove me
-      def needs_torquebox= t
-      end
       # TODO remove me
       def current
         @current

lib/maven/tools/dsl.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '1.2.3'.freeze
+    VERSION = '1.2.4'.freeze
   end
 end

lib/maven/tools/licenses.rb

@@ -22,14 +22,14 @@ module Maven
   module Tools
     unless defined? VERSIONS
       VERSIONS = { 
-        :jar_plugin => "2.4",
-        :clean_plugin => "2.4",
-        :jruby_plugins => "3.0.0",
+        :clean_plugin => "3.5.0",
+        :jar_plugin => "3.5.0",
+        :jruby_plugins => "3.0.6",
         :jruby9_plugins => "0.3.0",
         :bundler_version => "1.10.6",
-        :jruby_version => "9.1.2.0",
-        :polyglot_version => "0.1.18",
-        :mavengem_wagon => "2.0.0"
+        :jruby_version => "9.4.14.0",
+        :polyglot_version => "0.8.1",
+        :mavengem_wagon => "2.0.2"
       }.freeze
     end
   end