Merge remote-tracking branch 'upstream/master' into gocd-master

# Conflicts:
#	README.md

Author: chadlwilson

.github/workflows/maven.yml

@@ -38,7 +38,7 @@ jobs:
         cache: maven
 
     - name: Build with Maven
-      run: mvn -B install -Djruby.version=${{ matrix.jruby_version }}
+      run: ./mvnw -B install -Djruby.version=${{ matrix.jruby_version }}
 
     # Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
@@ -79,7 +79,7 @@ jobs:
           cache: maven
 
       - name: Setup JRuby
-        uses: ruby/setup-ruby@a9bfc2ecf3dd40734a9418f89a7e9d484c32b990 # v1.248.0
+        uses: ruby/setup-ruby@2a7b30092b0caf9c046252510f9273b4875f3db9 # v1.254.0
         with:
           ruby-version: jruby-${{ matrix.jruby_version }}
           bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip

README.md

@@ -1,18 +1,14 @@
 # JRuby-Rack
 
+[![Gem Version](https://badge.fury.io/rb/jruby-rack.png)][8]
+[![Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)][9]
+
 JRuby-Rack is a lightweight adapter for the Java Servlet environment that allows
 any (Ruby) Rack-based application to run unmodified in a Java Servlet container.
 JRuby-Rack supports Rails as well as any Rack-compatible Ruby web framework.
 
 For more information on Rack, visit http://rack.github.io/.
 
-**This README (master) targets JRuby-Rack 1.3. Please use the [1.2-stable](https://github.com/jruby/jruby-rack/tree/1.2-stable) or 
-[1.1-stable](https://github.com/jruby/jruby-rack/tree/1.1-stable) branches for
-current stable releases.**
-
-[![Gem Version](https://badge.fury.io/rb/jruby-rack.png)][8]
-[![Build Status](https://github.com/jruby/jruby-rack/actions/workflows/maven.yml/badge.svg)][9]
-
 ## gocd-contrib Fork
 
 This fork is intended as temporary to validate jruby-rack changes for use in GoCD with quicker turnaround time. The goal is to
@@ -30,22 +26,14 @@ dependencies {
 }
 ```
 
-
-
 ## Compatibility
 
-JRuby-Rack 1.3.x
-- aims to be compatible with JRuby 9.4 -> 10.0 and Java 11+
-- supports any container compatible with Java Servlet 4.0 API
-
-JRuby-Rack 1.2.x
-- compatible with JRuby 9.3 -> 9.4 and their supported JDK versions
-- supports any container compatible with Java Servlet 3.0 API
-
-JRuby-Rack 1.1.x
-- aims to be compatible with JRuby >= 1.6.4 (used successfully through JRuby 9.4)
-- supports any container compatible with Java Servlet 2.5 API (JEE 5)
-
+| JRuby-Rack Version                                           | Status     | JRuby Compat | Java Compat | Target Servlet API | Target Java EE | Notes                                             |
+|--------------------------------------------------------------|------------|--------------|-------------|--------------------|----------------|---------------------------------------------------|
+| 1.4.x (_planned_)                                            | Dev        | 9.4 → 10.0   | Java 17+    | 5.0                | Jakarta EE 9   |                                                   |
+| 1.3.x (master, _unreleased_)                                 | Dev        | 9.4 → 10.0   | Java 11+    | 4.0                | Java EE 8      |                                                   |
+| [1.2.x](https://github.com/jruby/jruby-rack/tree/1.2-stable) | Maintained | 9.3 → 9.4    | Java 8+     | 3.0                | Java EE 6      | Servlet 3.1 → 4.0 tested OK with some containers. |
+| [1.1.x](https://github.com/jruby/jruby-rack/tree/1.1-stable) | EOL        | 1.6 → 9.4    | Java 8+     | 2.5                | Java EE 5      | Servlet 3.0 → 4.0 tested OK with some containers. |
 
 ## Getting Started
 
@@ -356,7 +344,7 @@ package and push the .jar every time a commit changes a source file).
 
 ## Releasing
 
-* Make sure auth is configured for "ossrh" repository ID in your .m2/settings.xml
+* Make sure auth is configured for "central" repository ID in your .m2/settings.xml
 * Update the version in src/main/ruby/jruby/rack/version.rb to the release version
 * mvn release:prepare
 * mvn release:perform (possibly with -DuseReleaseProfile=false due to Javadoc doclint failures for now)

Rakefile

@@ -38,14 +38,14 @@ directory 'target/classes'
 
 desc "Compile classes"
 task(:compile => 'target/classes') do
-  sh "mvn compile #{ENV['JRUBY_VERSION'] ? "-Djruby.version=#{ENV['JRUBY_VERSION']}" : ""}"
+  sh "./mvnw compile #{ENV['JRUBY_VERSION'] ? "-Djruby.version=#{ENV['JRUBY_VERSION']}" : ""}"
 end
 
 directory 'target/test-classes'
 
 desc "Compile test classes"
 task(:test_prepare => ['target/classes', 'target/test-classes']) do
-  sh "mvn test-compile #{ENV['JRUBY_VERSION'] ? "-Djruby.version=#{ENV['JRUBY_VERSION']}" : ""}"
+  sh "./mvnw test-compile #{ENV['JRUBY_VERSION'] ? "-Djruby.version=#{ENV['JRUBY_VERSION']}" : ""}"
 end
 
 desc "Unpack the rack gem"
@@ -98,7 +98,7 @@ task :test_resources => ["target/test-classes"]
 namespace :resources do
   desc "Copy (and generate) resources"
   task :copy => :resources do
-    sh 'mvn process-resources -Dmdep.skip=true'
+    sh './mvnw process-resources -Dmdep.skip=true'
   end
   desc "Generate test resources"
   task :test => :test_resources
@@ -208,7 +208,7 @@ task :release_checks do
       "  git push origin :#{GEM_VERSION}" if ok
   end
 
-  pom_version = `mvn help:evaluate -Dexpression=project.version`.
+  pom_version = `./mvnw help:evaluate -Dexpression=project.version`.
     split("\n").reject { |line| line =~ /[INFO]/ }.first.chomp
   if pom_version =~ /dev|SNAPSHOT/
     fail "Can't release a dev/snapshot version.\n" +
@@ -218,7 +218,7 @@ task :release_checks do
   unless pom_version.sub(/\-(\D+\w*)/, '.\1') == GEM_VERSION
     fail "Can't release because pom.xml version (#{pom_version}) is different than " +
       "jruby/rack/version.rb (#{GEM_VERSION}).\n" +
-      "Please run `mvn install' to bring the two files in sync."
+      "Please run `./mvnw install' to bring the two files in sync."
   end
 
   puts "release #{GEM_VERSION} looks ready to go ..."
@@ -229,7 +229,7 @@ task :release => [:release_checks, :clean] do
   args = ''
   args << "-Dgpg.keyname=#{ENV['GPG_KEYNAME']} " if ENV['GPG_KEYNAME']
 
-  sh "mvn -Prelease #{args} -DupdateReleaseInfo=true clean deploy"
+  sh "./mvnw -Prelease #{args} -DupdateReleaseInfo=true clean deploy"
 
   sh "git tag #{GEM_VERSION}"