Merge pull request #559 from headius/renaissance

Fixes to update Warbler to modern libs and JRuby

Author: headius

.github/workflows/ci.yml

@@ -17,16 +17,20 @@ jobs:
 
     strategy:
       matrix:
-        java-version: [8, 11, 15]
-        ruby-version: [jruby-9.2.21.0, jruby-9.3.15.0, jruby-9.4.12.0, jruby-head]
-        bundler-version: [1.17.3, 2.3.26, 2.4.21]
+        java-version: [8, 21]
+        ruby-version: [jruby-9.4, jruby-10]
         task: ['', integration]
         exclude:
-          - ruby-version: jruby-9.2.21.0
-            bundler-version: 2.4.21
+          # JRuby 10 requires Java 21 minimum
+          - ruby-version: jruby-10
+            java-version: 8
 
       fail-fast: false
 
+    env:
+      # speed up all those subprocesses
+      JRUBY_OPTS: --dev
+
     steps:
       - name: checkout
         uses: actions/checkout@v3
@@ -42,21 +46,11 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
-      - name: Install bundler ${{ matrix.bundler-version }}
-        run: gem install bundler:${{ matrix.bundler-version }}
-        if: ${{ matrix.ruby-version == 'jruby-9.2.21.0' }}
-
-      - name: Install latest rubygems version with bundler ${{ matrix.bundler-version }}
-        run: gem update --system && gem install bundler:${{ matrix.bundler-version }}
-        if: ${{ matrix.ruby-version != 'jruby-9.2.21.0' }}
+      - name: Remove jruby-launcher # not sure where this is coming from but causes some specs to fail
+        run: gem uninstall -a jruby-launcher
 
       - name: Install dependencies
-        run: bundle _${{ matrix.bundler-version }}_ install --jobs=3 --retry=3
+        run: bundle install --jobs=3 --retry=3
 
       - name: Run tests
         run: bundle exec rake ${{ matrix.TASK }}
-        if: ${{ matrix.ruby-version != 'jruby-head' }}
-
-      - name: Run tests
-        run: bundle exec rake ${{ matrix.TASK }} || exit 0
-        if: ${{ matrix.ruby-version == 'jruby-head' }}

Gemfile

@@ -5,6 +5,13 @@ gemspec
 rubyzip_version = ENV['RUBYZIP_VERSION']
 gem 'rubyzip', rubyzip_version if rubyzip_version && !rubyzip_version.empty?
 
+# override default maven-tools used by bundler
+gem 'maven-tools', '1.2.3'
+
+
 group :development, :test do
   gem 'rdoc', ['>= 3.10', '< 4.3'], :require => nil
+
+  # force jruby-jars to use current JRuby version for testing
+  gem 'jruby-jars', '~> ' + JRUBY_VERSION.split('.')[0..1].join('.')
 end

Mavenfile

@@ -5,8 +5,19 @@
 gemspec( :jar => 'warbler_jar.jar',
          :source => 'ext' )
 
-properties( 'jruby.plugins.version' => '2.0.1',
-            'jruby.version' => '9.2.21.0',
+plugin_repository( :url => 'https://central.sonatype.com/repository/maven-snapshots/',
+                   :id => 'central-snapshots' ) do
+  releases 'false'
+  snapshots 'true'
+end
+repository( :url => 'https://central.sonatype.com/repository/maven-snapshots/',
+            :id => 'central-snapshots' ) do
+  releases 'false'
+  snapshots 'true'
+end
+
+properties( 'jruby.plugins.version' => '3.0.6',
+            'jruby.version' => '9.4.13.0',
             'jetty.version' => '9.4.31.v20200723' )
 
 # dependencies needed for compilation
@@ -15,15 +26,15 @@ scope :provided do
   jar 'org.eclipse.jetty:jetty-webapp', '${jetty.version}'
 end
 
-plugin :compiler, '3.1', :source => '1.6', :target => '1.6'
+plugin :compiler, '3.1', :source => '8', :target => '8'
 
 plugin :invoker, '1.8' do
   execute_goals( :install, :run,
                  :id => 'integration-test',
                  :properties => { 'warbler.version' => '${project.version}',
                                   'jruby.version' => '${jruby.version}',
                                   'jetty.version' => '${jetty.version}',
-                                  'bundler.version' => '1.12.5',
+                                  'bundler.version' => '2.6.3',
                                   'jruby.plugins.version' => '${jruby.plugins.version}' },
 
                  :goals => ['verify'],

Rakefile

@@ -28,6 +28,8 @@ task :default => :spec
 # use Mavenfile to define :jar task
 require 'maven/ruby/maven'
 mvn = Maven::Ruby::Maven.new
+mvn << '--no-transfer-progress'
+
 if defined?(JRUBY_VERSION) && !JRUBY_VERSION.start_with?('9.0')
   mvn.inherit_jruby_version
 end

integration/pom.xml

@@ -8,19 +8,19 @@
   <packaging>pom</packaging>
 
   <properties>
-    <jruby.plugins.version>1.1.5</jruby.plugins.version>
+    <jruby.plugins.version>3.0.6</jruby.plugins.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jruby.version>9.1.6.0</jruby.version>
+    <jruby.version>9.4.13.0</jruby.version>
     <warbler.version>2.0.4</warbler.version>
-    <bundler.version>1.12.5</bundler.version>
+    <bundler.version>2.6.3</bundler.version>
     <gem.home>${basedir}/../../pkg/rubygems</gem.home>
     <gem.path>${basedir}/../../pkg/rubygems</gem.path>
   </properties>
 
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>rubygems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
   </repositories>
 
@@ -52,6 +52,13 @@
   </dependencies>
 
   <build>
+    <extensions>
+      <extension>
+        <groupId>org.jruby.maven</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>2.0.2</version>
+      </extension>
+    </extensions>
     <defaultGoal>verify</defaultGoal>
     <resources>
       <resource>
@@ -73,7 +80,7 @@
         </executions>
       </plugin>
         <plugin>
-          <groupId>de.saumya.mojo</groupId>
+          <groupId>org.jruby.maven</groupId>
           <artifactId>gem-maven-plugin</artifactId>
           <version>${jruby.plugins.version}</version>
 	  <executions>
@@ -89,8 +96,8 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
+            <source>8</source>
+            <target>8</target>
           </configuration>
         </plugin>
         <plugin>
@@ -129,7 +136,7 @@
           <version>1.2.1</version>
         </plugin>
         <plugin>
-          <groupId>de.saumya.mojo</groupId>
+          <groupId>org.jruby.maven</groupId>
           <artifactId>jruby-maven-plugin</artifactId>
           <version>${jruby.plugins.version}</version>
           <configuration>

integration/rails4_test/pom.xml

@@ -16,7 +16,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>de.saumya.mojo</groupId>
+        <groupId>org.jruby.maven</groupId>
         <artifactId>jruby-maven-plugin</artifactId>
         <executions>
           <execution>

integration/runnable_test/pom.xml

@@ -44,7 +44,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>de.saumya.mojo</groupId>
+        <groupId>org.jruby.maven</groupId>
         <artifactId>jruby-maven-plugin</artifactId>
         <executions>
           <execution>

integration/runnable_w_bundler_test/pom.xml

@@ -44,7 +44,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>de.saumya.mojo</groupId>
+        <groupId>org.jruby.maven</groupId>
         <artifactId>jruby-maven-plugin</artifactId>
         <executions>
           <execution>

integration/simple_rack_test/pom.xml

@@ -16,7 +16,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>de.saumya.mojo</groupId>
+        <groupId>org.jruby.maven</groupId>
         <artifactId>jruby-maven-plugin</artifactId>
         <executions>
           <execution>

lib/warbler/jar.rb

@@ -88,7 +88,7 @@ def jrubyc_options(config)
     private :jrubyc_options
 
     def java_version(config)
-      config.bytecode_version ? "-Djava.specification.version=#{config.bytecode_version}" : ''
+      config.bytecode_version ? "-Djruby.bytecode.version=#{config.bytecode_version}" : ''
     end
 
     def replace_compiled_ruby_files(config, compiled_ruby_files)
@@ -285,7 +285,7 @@ def add_with_pathmaps(config, f, map_type)
 
     def expand_erb(file, config)
       require 'erb'
-      erb = ERB.new(File.read(file), nil, '-')
+      erb = ERB.new(File.read(file), trim_mode: '-')
       StringIO.new(erb.result(erb_binding(config)))
     end