Merge branch '2.x' into 3.1

Author: cowtowncoder

release-notes/CREDITS

@@ -339,6 +339,8 @@ Joshua Arnold (@josharnold52)
 Omkhar Arasaratnam (@omkhar)
  * Reported, suggested fix for #5950: Improve `UUIDeserializer` error handling
   [3.1.4]
+ * Reported, suggested fix for #5951: Improve `InetSocketAddress` deserialization
+  [3.1.4]
  * Reported, suggested fix for #5956: Fix problem with float-to-byte range check
   [3.1.4]
  * Contributed fix for #5957: Improve `java.time.Month` deserialization validation

release-notes/CREDITS-2.x

@@ -1920,6 +1920,8 @@ Fawzi Essam (@iifawzi)
 Omkhar Arasaratnam (@omkhar)
  * Reported #5950: Improve `UUIDeserializer` error handling
   (2.18.8)
+ * Reported #5951: Improve `InetSocketAddress` deserialization
+  (2.18.8)
 
 Liam Feid (@fxshlein)
  * Contributed #1467: Support `@JsonUnwrapped` with `@JsonCreator`

release-notes/VERSION

@@ -13,6 +13,8 @@ No changes since 3.1
 
 #5950: Improve `UUIDeserializer` error handling
  (reported, fix suggested by Omkhar A)
+#5951: Improve `InetSocketAddress` deserialization
+ (reported by Omkhar A)
 #5956: Fix problem with float-to-byte range check
  (reported, fix suggested by Omkhar A)
 #5957: Improve `java.time.Month` deserialization validation

release-notes/VERSION-2.x

@@ -24,7 +24,9 @@ Project: jackson-databind
 
 #5931: Fix `AtomicLongDeserializer` value truncation on coerced values
  (fixed by Lee Jiwon)
-#5950: Improve `UUIDeserializer` error handling
+#5950: Improve `UUIDeserializer` error handling#
+ (reported by Omkhar A)
+#5951: Improve `InetSocketAddress` deserialization
  (reported by Omkhar A)
 
 2.21.3 (28-Apr-2026)
@@ -292,6 +294,8 @@ No changes since 2.19.2
 
 #5950: Improve `UUIDeserializer` error handling
  (reported by Omkhar A)
+#5951: Improve `InetSocketAddress` deserialization
+ (reported by Omkhar A)
 
 2.18.7 (24-Apr-2026)
 2.18.6 (22-Feb-2026)

src/main/java/tools/jackson/databind/deser/jdk/JDKFromStringDeserializer.java

@@ -291,7 +291,8 @@ private Locale _deserializeLocale(String fullValue, DeserializationContext ctxt)
     }
 
     protected InetSocketAddress _inetSocketAddress(String host, int port) {
-        return new InetSocketAddress(host, port);
+        // 05-May-2026, tatu: [databind#5951] Prevent DNS lookup:
+        return InetSocketAddress.createUnresolved(host, port);
     }
 
     static class StringBuilderDeserializer extends JDKFromStringDeserializer

src/test/java/tools/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java

@@ -139,14 +139,14 @@ public void testInetSocketAddress() throws Exception
     {
         ObjectReader r = MAPPER.readerFor(InetSocketAddress.class);
         InetSocketAddress address = r.readValue(q("127.0.0.1"));
-        assertEquals("127.0.0.1", address.getAddress().getHostAddress());
+        assertEquals("127.0.0.1", address.getHostName());
 
         InetSocketAddress ip6 = r.readValue(q("2001:db8:85a3:8d3:1319:8a2e:370:7348"));
-        assertEquals("2001:db8:85a3:8d3:1319:8a2e:370:7348", ip6.getAddress().getHostAddress());
+        assertEquals("2001:db8:85a3:8d3:1319:8a2e:370:7348", ip6.getHostName());
 
         InetSocketAddress ip6port = r.readValue(
                 q("[2001:db8:85a3:8d3:1319:8a2e:370:7348]:443"));
-        assertEquals("2001:db8:85a3:8d3:1319:8a2e:370:7348", ip6port.getAddress().getHostAddress());
+        assertEquals("[2001:db8:85a3:8d3:1319:8a2e:370:7348]", ip6port.getHostName());
         assertEquals(443, ip6port.getPort());
 
         // should we try resolving host names? That requires connectivity...

src/test/java/tools/jackson/databind/ser/jdk/JDKTypeSerializationTest.java

@@ -271,13 +271,16 @@ public void testInetSocketAddress() throws IOException
     {
         assertEquals(q("127.0.0.1:8080"),
                 MAPPER.writeValueAsString(new InetSocketAddress("127.0.0.1", 8080)));
+        assertEquals(q("127.0.0.1:8080"),
+                MAPPER.writeValueAsString(InetSocketAddress.createUnresolved("127.0.0.1", 8080)));
         assertEquals(q("google.com:6667"),
                 MAPPER.writeValueAsString(new InetSocketAddress("google.com", 6667)));
+        assertEquals(q("google.com:6667"),
+                MAPPER.writeValueAsString(InetSocketAddress.createUnresolved("google.com", 6667)));
         assertEquals(q("[2001:db8:85a3:8d3:1319:8a2e:370:7348]:443"),
                 MAPPER.writeValueAsString(new InetSocketAddress("2001:db8:85a3:8d3:1319:8a2e:370:7348", 443)));
     }
 
-    // [JACKSON-597]
     @Test
     public void testClass() throws IOException
     {