Switch from Jetty 6.1 to 8.1 to resolve servlet incompatibilities

The old Jetty 6.1 plugin used an outdated Servlet API, which caused compatibility issues with modern WAR files.
Jetty 8.1 includes a more recent API version and still allows background startup via the legacy Mortbay plugin.

Newer Jetty Maven plugins maintained by Eclipse (e.g. jetty-maven-plugin 9.x–11.x) no longer support background (daemon) mode,
which makes them unsuitable for integration tests in this setup.

Author: tillsc

Mavenfile

@@ -18,7 +18,7 @@ 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' )
 
 # dependencies needed for compilation
 scope :provided do

integration/pom.xml

@@ -79,16 +79,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 +102,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 +129,6 @@
               <goals>
                 <goal>run-war</goal>
               </goals>
-              <configuration>
-                <scanIntervalSeconds>0</scanIntervalSeconds>
-                <daemon>true</daemon>
-              </configuration>
             </execution>
             <execution>
               <id>stop-jetty</id>
@@ -146,7 +155,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>

integration/rails7_test/pom.xml

@@ -31,7 +31,7 @@
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
+        <artifactId>jetty-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>start-jetty</id>

integration/rails7_test/src/main/ruby/config/warble.rb

@@ -1,4 +1,4 @@
 Warbler::Config.new do |config|
   config.autodeploy_dir = "../../../target"
-  config.jar_name = "test"
+  config.jar_name = "rails7_test-1.0"
 end

integration/rails7_test/src/test/java/org/jruby/warbler/Rails7AppTestIT.java

@@ -12,7 +12,7 @@
  */
 public class Rails7AppTestIT
 {
-    private static String appName = "rails7_test";
+    private static String appName = "rails7_test-1.0";
 
     /**
      * Hit the web app and test the response

integration/simple_rack_test/pom.xml

@@ -27,7 +27,7 @@
       </plugin>
       <plugin>
         <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
+        <artifactId>jetty-maven-plugin</artifactId>
         <executions>
           <execution>
             <id>start-jetty</id>

integration/simple_rack_test/src/main/ruby/config/warble.rb

@@ -1,5 +1,5 @@
 Warbler::Config.new do |config|
   config.autodeploy_dir = "../../../target"
-  config.jar_name = "test"
+  config.jar_name = "simple_rack_test-1.0"
   config.bundler = false
 end

integration/simple_rack_test/src/test/java/org/jruby/warbler/AppTestIT.java

@@ -12,7 +12,7 @@
  */
 public class AppTestIT
 {
-    private static String appName = "simple_rack_test";
+    private static String appName = "simple_rack_test-1.0";
 
     /**
      * Hit the web app and test the response