Remove processing of jruby.compat.version which is no longer needed for supported JRubies

This has been set to 2.1 for all supported JRubies for a long time, and the setting did nothing
within JRuby. This cherry-pick avoids changing the API by bringing the class over from JRuby,
allowing compatibility with JRuby 10.

(cherry picked from commit abc7e0b)

# Conflicts:
#	README.md
#	src/main/java/org/jruby/rack/DefaultRackConfig.java
#	src/main/java/org/jruby/rack/embed/Config.java
#	src/spec/ruby/jruby/rack/integration_spec.rb
#	src/spec/ruby/rack/application_spec.rb
#	src/spec/ruby/rack/config_spec.rb

Author: chadlwilson

README.md

@@ -209,8 +209,6 @@ as context init parameters in web.xml or as VM-wide system properties.
   sub-path of the main servlet context root.
 - `gem.path`: Relative path to the bundled gem repository. Defaults to
   `/WEB-INF/gems`.
-- `jruby.compat.version`: Set to "1.8" or "1.9" to make JRuby run a specific
-  version of Ruby (same as the --1.8 / --1.9 command line flags).
 - `jruby.min.runtimes`: For non-threadsafe Rails applications using a runtime
   pool, specify an integer minimum number of runtimes to hold in the pool.
 - `jruby.max.runtimes`: For non-threadsafe Rails applications, an integer

src/main/java/org/jruby/CompatVersion.java

@@ -0,0 +1,62 @@
+package org.jruby;
+
+/**
+ * Removed from JRuby Core as of 10.0; but deprecated and unused for a long time.
+ * <p/>
+ * Added back to jruby-rack 1.2.x to allow JRuby 10 support without an API changed, but
+ * will be removed in jruby-rack 1.3.0
+ * <p/>
+ * @link https://github.com/jruby/jruby/blob/jruby-9.3/core/src/main/java/org/jruby/CompatVersion.java
+ * @deprecated since JRuby 9.2 with no replacement; for removal with jruby-rack 1.3.0
+ */
+@Deprecated
+public enum CompatVersion {
+
+    @Deprecated RUBY1_8,
+    @Deprecated RUBY1_9,
+    @Deprecated RUBY2_0,
+    @Deprecated RUBY2_1,
+    @Deprecated BOTH;
+
+    @Deprecated
+    public boolean is1_9() {
+        return this == RUBY1_9 || this == RUBY2_0 || this == RUBY2_1;
+    }
+
+    @Deprecated
+    public boolean is2_0() {
+        return this == RUBY2_0 || this == RUBY2_1;
+    }
+
+    @Deprecated
+    public static CompatVersion getVersionFromString(String compatString) {
+        if (compatString.equalsIgnoreCase("RUBY1_8")) {
+            return CompatVersion.RUBY1_8;
+        } else if (compatString.equalsIgnoreCase("1.8")) {
+            return CompatVersion.RUBY1_8;
+        } else if (compatString.equalsIgnoreCase("RUBY1_9")) {
+            return CompatVersion.RUBY1_9;
+        } else if (compatString.equalsIgnoreCase("1.9")) {
+            return CompatVersion.RUBY1_9;
+        } else if (compatString.equalsIgnoreCase("RUBY2_0")) {
+            return CompatVersion.RUBY2_0;
+        } else if (compatString.equalsIgnoreCase("2.0")) {
+            return CompatVersion.RUBY2_0;
+        } else if (compatString.equalsIgnoreCase("RUBY2_1")) {
+            return CompatVersion.RUBY2_1;
+        } else if (compatString.equalsIgnoreCase("2.1")) {
+            return CompatVersion.RUBY2_1;
+        } else {
+            return null;
+        }
+    }
+
+    @Deprecated
+    public static boolean shouldBindMethod(CompatVersion runtimeVersion, CompatVersion methodVersion) {
+        if (runtimeVersion == RUBY1_8) return methodVersion == RUBY1_8 || methodVersion == BOTH;
+        if (runtimeVersion == RUBY1_9) return methodVersion == RUBY1_9 || methodVersion == BOTH;
+        if (runtimeVersion == RUBY2_0) return methodVersion == RUBY1_9 || methodVersion == RUBY2_0 || methodVersion == BOTH;
+        if (runtimeVersion == RUBY2_1) return methodVersion == RUBY1_9 || methodVersion == RUBY2_0 || methodVersion == RUBY2_1 || methodVersion == BOTH;
+        return false;
+    }
+}

src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java

@@ -302,10 +302,6 @@ protected RubyInstanceConfig initRuntimeConfig(final RubyInstanceConfig config)
         // Process arguments, namely any that might be in RUBYOPT
         config.processArguments(rackConfig.getRuntimeArguments());
 
-        if ( rackConfig.getCompatVersion() != null ) {
-            config.setCompatVersion(rackConfig.getCompatVersion());
-        }
-
         try { // try to set jruby home to jar file path
             final URL resource = Ruby.class.getResource("/META-INF/jruby.home");
             if ( resource != null && "jar".equals( resource.getProtocol() ) ) {

src/main/java/org/jruby/rack/DefaultRackConfig.java

@@ -17,8 +17,6 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.jruby.CompatVersion;
 import org.jruby.rack.logging.OutputStreamLogger;
@@ -81,23 +79,6 @@ public void setQuiet(boolean quiet) {
 
     @Override
     public CompatVersion getCompatVersion() {
-        final String version = getProperty("jruby.compat.version");
-        if ( version != null ) {
-            // we handle 1.8, RUBY1_9, --2.0 1_9 2.1.0.dev etc :
-            final Pattern pattern = Pattern.compile("([123])[._]([8901234567])");
-            final Matcher matcher = pattern.matcher(version);
-            if ( matcher.find() ) {
-                final String name = "RUBY" +
-                    matcher.group(1) + '_' + matcher.group(2);
-                try {
-                    return Enum.valueOf(CompatVersion.class, name);
-                }
-                catch (IllegalArgumentException e) {
-                    getLogger().log(WARN,
-                        "could not resolve compat version from '"+ version +"' will use default", e);
-                }
-            }
-        }
         return null;
     }
 

src/main/java/org/jruby/rack/RackConfig.java

@@ -36,7 +36,10 @@ public interface RackConfig {
     /** 
      * Return the Ruby version that JRuby should run.
      * @return <code>RUBY_VERSION</code> (e.g. 1.8, 1.9)
+     *
+     * @deprecated Since jruby-rack 1.2 (and JRuby 9.2), for removal in 1.3.0
      */
+    @Deprecated
     CompatVersion getCompatVersion();
 
     /** 

src/main/java/org/jruby/rack/embed/Config.java

@@ -44,7 +44,6 @@ public class Config implements RackConfig {
 
     private RackLogger logger;
     private Map<String, String> rubyENV;
-    private CompatVersion compatVersion;
 
     public Config() {
         delegate = new DefaultRackConfig() {
@@ -66,7 +65,6 @@ public void doInitialize(final Ruby runtime) {
         setOut( runtime.getOut() );
         setErr( runtime.getErr() );
         rubyENV = runtime.getENV();
-        compatVersion = runtime.getInstanceConfig().getCompatVersion();
     }
 
 
@@ -106,9 +104,15 @@ public final Number getNumberProperty(String key, Number defaultValue) {
         return delegate.getNumberProperty(key, defaultValue);
     }
 
+    /**
+     * @return Always CompatVersion.RUBY2_1, consistent with JRuby 9.3+
+     *
+     * @deprecated Since jruby-rack 1.2 (and JRuby 9.2), for removal in 1.3.0
+     */
+    @Deprecated
     @Override
     public CompatVersion getCompatVersion() {
-        return compatVersion;
+        return CompatVersion.RUBY2_1;
     }
 
     @Override

src/spec/ruby/jruby/rack/error_app_spec.rb

@@ -165,7 +165,7 @@ def in_tmpdir_with_files(files = {})
     end
     yield path
   ensure
-    FileUtils.rm_rf(path) if path && File.exists?(path)
+    FileUtils.rm_rf(path) if path && File.exist?(path)
   end
 
 end

src/spec/ruby/jruby/rack/integration_spec.rb

@@ -19,8 +19,6 @@
     before do
       @servlet_context = org.jruby.rack.mock.RackLoggingMockServletContext.new "file://#{STUB_DIR}/rack"
       @servlet_context.logger = raise_logger
-      # make sure we always boot runtimes in the same mode as specs :
-      set_compat_version @servlet_context
     end
 
     it "initializes" do
@@ -260,16 +258,10 @@ def new_servlet_context(base_path = nil)
   end
 
   def prepare_servlet_context(servlet_context, base_path)
-    set_compat_version servlet_context
     servlet_context.addInitParameter('rails.root', base_path)
     servlet_context.addInitParameter('jruby.rack.layout_class', 'FileSystemLayout')
   end
 
-  def set_compat_version(servlet_context = @servlet_context); require 'jruby'
-    compat_version = JRuby.runtime.getInstanceConfig.getCompatVersion # RUBY1_9
-    servlet_context.addInitParameter("jruby.compat.version", compat_version.to_s)
-  end
-
   GEMFILES_DIR = File.expand_path('../../../gemfiles', STUB_DIR)
 
   def copy_gemfile

src/spec/ruby/rack/application_spec.rb

@@ -393,13 +393,6 @@ def newRuntime()
         should_eval_as_eql_to "require 'yaml'", true # -ryaml not processed
       end
 
-      it "handles jruby.compat.version == '1.9' and starts in 1.9 mode" do
-        set_config 'jruby.compat.version', '1.9'
-        #@rack_config.stub(:getCompatVersion).and_return org.jruby.CompatVersion::RUBY1_9
-        @runtime = app_factory.new_runtime
-        expect(@runtime.is1_9).to be_truthy
-      end
-
       it "handles jruby.runtime.arguments == '-X+O -Ke' and start with object space enabled and KCode EUC" do
         set_config 'jruby.runtime.arguments', '-X+O -Ke'
         # allow(@rack_config).to receive(:getRuntimeArguments).and_return ['-X+O', '-Ke'].to_java(:String)

src/spec/ruby/rack/config_spec.rb

@@ -184,56 +184,10 @@ def expect_empty_env(env)
 
   end
 
-  it "sets compat version from init parameter" do
-    expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-      and_return "RUBY1_9"
-    expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY1_9
-  end
-
-  it "sets compat version from init parameter (dot syntax)" do
-    expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-      and_return "1.8"
-    expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY1_8
-  end
-
-  it "leaves compat version nil if not specified" do
-    expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-      and_return nil
+  it "always returns nil compat version (backwards compat)" do
     expect( config.getCompatVersion ).to be nil
   end
 
-  it "leaves compat version nil if invalid value specified" do
-    expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-      and_return "4.2"
-    expect( config.getCompatVersion ).to be nil
-  end
-
-    it "sets compat version from init parameter (head-syntax)" do
-      expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-        and_return "1.9.3-SNAPSHOT"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY1_9
-    end
-
-  if JRUBY_VERSION >= '1.7.0'
-    it "sets compat version 2.0 from init parameter" do
-      expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-        and_return "RUBY2_0"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY2_0
-    end
-
-    it "sets compat version 2.0 from init parameter (dot syntax)" do
-      expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-        and_return "2_0"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY2_0
-    end
-
-    it "sets compat version 2.0 from init parameter (head-syntax)" do
-      expect(@servlet_context).to receive(:getInitParameter).with("jruby.compat.version").
-        and_return "2.0.0.dev"
-      expect( config.getCompatVersion ).to be org.jruby.CompatVersion::RUBY2_0
-    end
-  end
-
   describe "custom-properties" do
 
     it "parser an int property" do