jruby · Mar 3, 2015 · Mar 3, 2015
diff --git a/core/pom.xml b/core/pom.xml
@@ -10,7 +10,7 @@
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>
   <properties>
-    <version.ruby>2.2.0</version.ruby>
+    <version.ruby>2.2.1</version.ruby>
     <prawn.dir>${test.dir}/prawn</prawn.dir>
     <spec.tags.dir>${spec.dir}/tags</spec.tags.dir>
     <pkg.dir>${build.dir}/pkg</pkg.dir>

diff --git a/core/src/main/java/org/jruby/util/cli/OutputStrings.java b/core/src/main/java/org/jruby/util/cli/OutputStrings.java
@@ -111,18 +111,10 @@ public static String getPropertyHelp() {
     }
 
     public static String getVersionString() {
-        String ver;
-        String patchDelimeter = "p";
-        int patchlevel;
-        String versionString = "";
-        ver = Constants.RUBY_VERSION;
-        patchlevel = Constants.RUBY_PATCHLEVEL;
-        versionString = String.format("%s%s%d", ver, patchDelimeter, patchlevel);
-
         String fullVersion = String.format(
                 "jruby %s (%s) %s %s %s %s on %s%s%s [%s-%s]",
                 Constants.VERSION,
-                versionString,
+                Constants.RUBY_VERSION,
                 Constants.COMPILE_DATE,
                 Constants.REVISION,
                 SafePropertyAccessor.getProperty("java.vm.name", "Unknown JVM"),

diff --git a/core/src/main/resources/org/jruby/runtime/Constants.java b/core/src/main/resources/org/jruby/runtime/Constants.java
@@ -38,7 +38,6 @@ public final class Constants {
 
     public static final String RUBY_MAJOR_VERSION = "@version.ruby.major@";
     public static final String RUBY_VERSION = "@version.ruby@";
-    public static final int    RUBY_PATCHLEVEL = Integer.parseInt("@version.ruby.patchlevel@");
     public static final int    RUBY_REVISION = Integer.parseInt("@version.ruby.revision@");
 
     public static final String COMPILE_DATE = "@build.date@";
@@ -90,4 +89,7 @@ public final class Constants {
     }
 
     private Constants() {}
+
+    @Deprecated
+    public static final int    RUBY_PATCHLEVEL = 0;
 }
diff --git a/default.build.properties b/default.build.properties
@@ -34,8 +34,7 @@ rake.args=
 install4j.executable=/Applications/install4j 4/bin/install4jc
 
 # Ruby versions
-version.ruby=2.2.0
+version.ruby=2.2.1
 version.ruby.major=2.2
 version.ruby.minor=0
-version.ruby.patchlevel=0
-version.ruby.revision=49005
+version.ruby.revision=49761
diff --git a/lib/ruby/stdlib/net/http.rb b/lib/ruby/stdlib/net/http.rb
@@ -1364,7 +1364,8 @@ def request_put(path, data, initheader = nil, &block)   #:nodoc:
     #    puts response.body
     #
     def send_request(name, path, data = nil, header = nil)
-      r = HTTPGenericRequest.new(name,(data ? true : false),true,path,header)
+      has_response_body = name != 'HEAD'
+      r = HTTPGenericRequest.new(name,(data ? true : false),has_response_body,path,header)
       request r, data
     end
 

diff --git a/lib/ruby/stdlib/resolv.rb b/lib/ruby/stdlib/resolv.rb
@@ -674,8 +674,8 @@ def request(sender, tout)
         timelimit = start + tout
         begin
           sender.send
-        rescue Errno::EHOSTUNREACH
-          # multi-homed IPv6 may generate this
+        rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this
+               Errno::ENETUNREACH
           raise ResolvTimeout
         end
         while true
@@ -1240,7 +1240,8 @@ def absolute?
 
       def ==(other) # :nodoc:
         return false unless Name === other
-        return @labels.join == other.to_a.join && @absolute == other.absolute?
+        return false unless @absolute == other.absolute?
+        return @labels == other.to_a
       end
 
       alias eql? == # :nodoc:
@@ -1669,10 +1670,10 @@ def ==(other) # :nodoc:
         return false unless self.class == other.class
         s_ivars = self.instance_variables
         s_ivars.sort!
-        s_ivars.delete "@ttl"
+        s_ivars.delete :@ttl
         o_ivars = other.instance_variables
         o_ivars.sort!
-        o_ivars.delete "@ttl"
+        o_ivars.delete :@ttl
         return s_ivars == o_ivars &&
           s_ivars.collect {|name| self.instance_variable_get name} ==
             o_ivars.collect {|name| other.instance_variable_get name}
@@ -1685,7 +1686,7 @@ def eql?(other) # :nodoc:
       def hash # :nodoc:
         h = 0
         vars = self.instance_variables
-        vars.delete "@ttl"
+        vars.delete :@ttl
         vars.each {|name|
           h ^= self.instance_variable_get(name).hash
         }

diff --git a/lib/ruby/stdlib/ripper/sexp.rb b/lib/ruby/stdlib/ripper/sexp.rb
@@ -28,7 +28,9 @@ class Ripper
   #           [:bodystmt, [[:var_ref, [:@kw, "nil", [1, 9]]]], nil, nil, nil]]]]
   #
   def Ripper.sexp(src, filename = '-', lineno = 1)
-    SexpBuilderPP.new(src, filename, lineno).parse
+    builder = SexpBuilderPP.new(src, filename, lineno)
+    sexp = builder.parse
+    sexp unless builder.error?
   end
 
   # [EXPERIMENTAL]
@@ -52,7 +54,9 @@ def Ripper.sexp(src, filename = '-', lineno = 1)
   #             nil]]]]
   #
   def Ripper.sexp_raw(src, filename = '-', lineno = 1)
-    SexpBuilder.new(src, filename, lineno).parse
+    builder = SexpBuilder.new(src, filename, lineno)
+    sexp = builder.parse
+    sexp unless builder.error?
   end
 
   class SexpBuilderPP < ::Ripper   #:nodoc:

diff --git a/lib/ruby/stdlib/unicode_normalize.rb b/lib/ruby/stdlib/unicode_normalize.rb
@@ -39,7 +39,7 @@ def unicode_normalize(form = :nfc)
   end
 
   # :call-seq:
-  #    str.unicode_normalize(form=:nfc)
+  #    str.unicode_normalize!(form=:nfc)
   #
   # Destructive version of String#unicode_normalize, doing Unicode
   # normalization in place.

diff --git a/tool/globals_2_2_0.rb → tool/globals_2_2_1.rb b/tool/globals_2_2_0.rb → tool/globals_2_2_1.rb