Fix integration tests for JRuby 9.4 and 10.0

.github/workflows/ci.yml

@@ -21,11 +21,15 @@ jobs:
       matrix:
         java-version: [8, 21]
         ruby-version: [jruby-9.4, jruby-10]
+        bundler-version: [2.6.3, 2.7.1]
         task: ['', integration]
         exclude:
           # JRuby 10 requires Java 21 minimum
           - ruby-version: jruby-10
             java-version: 8
+          # Bundler 2.7.1 requires Ruby 3.2
+          - ruby-version: jruby-9.4
+            bundler-version: 2.7.1
 
       fail-fast: false
 
@@ -51,8 +55,11 @@ jobs:
       - name: Remove jruby-launcher # not sure where this is coming from but causes some specs to fail
         run: gem uninstall -a jruby-launcher
 
+      - name: Remove jruby-launcher # not sure where this is coming from but causes some specs to fail
+        run: gem install bundler -v ${{ matrix.bundler-version }}
+
       - name: Install dependencies
-        run: bundle install --jobs=3 --retry=3
+        run: bundle _${{ matrix.bundler-version }}_ install --jobs=3 --retry=3
 
       - name: Run tests
-        run: bundle exec rake ${{ matrix.task }}
+        run: bundle _${{ matrix.bundler-version }}_ exec rake ${{ matrix.task }}

.gitignore

@@ -3,7 +3,8 @@ pkg
 doc
 .bundle
 nbproject
-target
+**/target/*
+!**/target/.keep
 Gemfile.lock
 .idea
 warbler.iml
@@ -15,3 +16,4 @@ integration/**/*.iml
 build.log
 .ruby-version
 .rspec_status
+/integration/rails7_test/src/main/ruby/db/*.sqlite3*

Mavenfile

@@ -18,7 +18,8 @@ end
 
 properties( 'jruby.plugins.version' => '3.0.6',
             'jruby.version' => '9.4.13.0',
-            'jetty.version' => '9.4.31.v20200723' )
+            'jetty.version' => '8.1.16.v20140903',
+            'bundler.version' => '2.6.3')
 
 # dependencies needed for compilation
 scope :provided do
@@ -28,13 +29,16 @@ end
 
 plugin :compiler, '3.1', :source => '8', :target => '8'
 
+gem 'bundler', '${bundler.version}'
+gem 'jruby-jars', '${jruby.version}'
+
 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' => '2.6.3',
+                                  'bundler.version' => '${bundler.version}',
                                   '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 << "-Djruby.version=#{JRUBY_VERSION}"
+mvn << "-Dbundler.version=#{Bundler::VERSION}"
 mvn << '--no-transfer-progress'
 
 if defined?(JRUBY_VERSION) && !JRUBY_VERSION.start_with?('9.0')

integration/pom.xml

@@ -10,9 +10,9 @@
   <properties>
     <jruby.plugins.version>3.0.6</jruby.plugins.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jruby.version>9.4.13.0</jruby.version>
+    <jruby.version>${jruby.version}</jruby.version>
     <warbler.version>2.0.4</warbler.version>
-    <bundler.version>2.6.3</bundler.version>
+    <bundler.version>${bundler.version}</bundler.version>
     <gem.home>${basedir}/../../pkg/rubygems</gem.home>
     <gem.path>${basedir}/../../pkg/rubygems</gem.path>
   </properties>
@@ -37,6 +37,12 @@
       <version>${warbler.version}</version>
       <type>gem</type>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>jruby-jars</artifactId>
+      <version>${jruby.version}</version>
+      <type>gem</type>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -79,16 +85,16 @@
           </execution>
         </executions>
       </plugin>
-        <plugin>
-          <groupId>org.jruby.maven</groupId>
-          <artifactId>gem-maven-plugin</artifactId>
-          <version>${jruby.plugins.version}</version>
-	  <executions>
-            <execution>
-	      <goals><goal>initialize</goal></goals>
-	    </execution>
-	  </executions>
-	</plugin>
+      <plugin>
+        <groupId>org.jruby.maven</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <executions>
+          <execution>
+            <goals><goal>initialize</goal></goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -102,12 +108,25 @@
         </plugin>
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
-          <version>6.1.26</version>
+          <artifactId>jetty-maven-plugin</artifactId>
+          <version>${jetty.version}</version>
           <configuration>
-            <webApp>${project.build.directory}/test.war</webApp>
+            <webAppConfig>
+              <contextPath>/</contextPath>
+              <configurationClasses>
+                <configurationClass>org.eclipse.jetty.webapp.WebXmlConfiguration</configurationClass>
+                <configurationClass>org.eclipse.jetty.webapp.WebInfConfiguration</configurationClass>
+                <configurationClass>org.eclipse.jetty.webapp.TagLibConfiguration</configurationClass>
+                <configurationClass>org.eclipse.jetty.webapp.MetaInfConfiguration</configurationClass>
+                <configurationClass>org.eclipse.jetty.webapp.FragmentConfiguration</configurationClass>
+                <configurationClass>org.eclipse.jetty.webapp.JettyWebXmlConfiguration</configurationClass>
+                <!-- intentionally no AnnotationConfiguration -->
+              </configurationClasses>
+            </webAppConfig>
             <stopPort>9966</stopPort>
             <stopKey>warbler_stop</stopKey>
+            <scanIntervalSeconds>0</scanIntervalSeconds>
+            <daemon>true</daemon>
           </configuration>
           <executions>
             <execution>
@@ -116,10 +135,6 @@
               <goals>
                 <goal>run-war</goal>
               </goals>
-              <configuration>
-                <scanIntervalSeconds>0</scanIntervalSeconds>
-                <daemon>true</daemon>
-              </configuration>
             </execution>
             <execution>
               <id>stop-jetty</id>
@@ -146,7 +161,7 @@
           <executions>
             <execution>
               <id>bundle-install</id>
-	      <goals><goal>jruby</goal></goals>
+              <goals><goal>jruby</goal></goals>
               <configuration>
                 <args>-C ${basedir}/src/main/ruby -S ${gem.home}/bin/bundle install</args>
               </configuration>