From 3b432f56e4930ffe2ac4ba59a46cf7ccd7a9977d Mon Sep 17 00:00:00 2001
From: Charles Oliver Nutter <headius@headius.com>
Date: Wed, 7 May 2025 10:16:26 -0500
Subject: [PATCH 1/2] Update to jruby-openssl 0.15.4

This addresses CVE-2025-46551 and GHSA-72qj-48g4-5xgx
---
 lib/pom.rb  | 2 +-
 lib/pom.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/pom.rb b/lib/pom.rb
index 1b5808da70d..a348d02f04a 100644
--- a/lib/pom.rb
+++ b/lib/pom.rb
@@ -48,7 +48,7 @@ def log(message=nil)
     ['irb', '1.14.3'],
     ['jar-dependencies', '0.5.4'],
     ['jruby-readline', '1.3.7'],
-    ['jruby-openssl', '0.15.3'],
+    ['jruby-openssl', '0.15.4'],
     ['json', '2.9.1'],
     ['logger', '1.6.4'],
     ['net-http', '0.6.0'],
diff --git a/lib/pom.xml b/lib/pom.xml
index b7e5adcc71a..43d0c89957a 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -320,7 +320,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.15.3</version>
+      <version>0.15.4</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -1140,7 +1140,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>specifications/irb-1.14.3*</include>
           <include>specifications/jar-dependencies-0.5.4*</include>
           <include>specifications/jruby-readline-1.3.7*</include>
-          <include>specifications/jruby-openssl-0.15.3*</include>
+          <include>specifications/jruby-openssl-0.15.4*</include>
           <include>specifications/json-2.9.1*</include>
           <include>specifications/logger-1.6.4*</include>
           <include>specifications/net-http-0.6.0*</include>
@@ -1222,7 +1222,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>gems/irb-1.14.3*/**/*</include>
           <include>gems/jar-dependencies-0.5.4*/**/*</include>
           <include>gems/jruby-readline-1.3.7*/**/*</include>
-          <include>gems/jruby-openssl-0.15.3*/**/*</include>
+          <include>gems/jruby-openssl-0.15.4*/**/*</include>
           <include>gems/json-2.9.1*/**/*</include>
           <include>gems/logger-1.6.4*/**/*</include>
           <include>gems/net-http-0.6.0*/**/*</include>
@@ -1304,7 +1304,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>cache/irb-1.14.3*</include>
           <include>cache/jar-dependencies-0.5.4*</include>
           <include>cache/jruby-readline-1.3.7*</include>
-          <include>cache/jruby-openssl-0.15.3*</include>
+          <include>cache/jruby-openssl-0.15.4*</include>
           <include>cache/json-2.9.1*</include>
           <include>cache/logger-1.6.4*</include>
           <include>cache/net-http-0.6.0*</include>

From 79cf1e4aecca0bcc8276b08b37bcb2c926be6ae3 Mon Sep 17 00:00:00 2001
From: "Thomas E. Enebo" <tom.enebo@gmail.com>
Date: Wed, 7 May 2025 10:24:48 -0500
Subject: [PATCH 2/2] Version 10.0.0.1 updated for release

---
 VERSION        | 2 +-
 core/pom.xml   | 4 ++--
 lib/pom.xml    | 4 ++--
 pom.xml        | 2 +-
 shaded/pom.xml | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/VERSION b/VERSION
index d7f9f72230b..e16fbfee773 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.0.0.0
+10.0.0.1
diff --git a/core/pom.xml b/core/pom.xml
index fb8e491c6dc..e504ced51f4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>10.0.0.0</version>
+    <version>10.0.0.1</version>
   </parent>
   <artifactId>jruby-base</artifactId>
   <name>JRuby Base</name>
@@ -728,7 +728,7 @@ DO NOT MODIFY - GENERATED CODE
                     <path>
                       <groupId>org.jruby</groupId>
                       <artifactId>jruby-base</artifactId>
-                      <version>10.0.0.0</version>
+                      <version>10.0.0.1</version>
                     </path>
                   </annotationProcessorPaths>
                 </configuration>
diff --git a/lib/pom.xml b/lib/pom.xml
index 43d0c89957a..710a514db8f 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>10.0.0.0</version>
+    <version>10.0.0.1</version>
   </parent>
   <artifactId>jruby-stdlib</artifactId>
   <name>JRuby Lib Setup</name>
@@ -28,7 +28,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby-core</artifactId>
-      <version>10.0.0.0</version>
+      <version>10.0.0.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index d2716942a81..071f034615a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@ DO NOT MODIFY - GENERATED CODE
   </parent>
   <groupId>org.jruby</groupId>
   <artifactId>jruby-parent</artifactId>
-  <version>10.0.0.0</version>
+  <version>10.0.0.1</version>
   <packaging>pom</packaging>
   <name>JRuby</name>
   <description>JRuby is the effort to recreate the Ruby (https://www.ruby-lang.org) interpreter in Java.</description>
diff --git a/shaded/pom.xml b/shaded/pom.xml
index cc1b445d207..5db2fc4ef56 100644
--- a/shaded/pom.xml
+++ b/shaded/pom.xml
@@ -12,7 +12,7 @@ DO NOT MODIFY - GENERATED CODE
   <parent>
     <groupId>org.jruby</groupId>
     <artifactId>jruby-parent</artifactId>
-    <version>10.0.0.0</version>
+    <version>10.0.0.1</version>
   </parent>
   <artifactId>jruby-core</artifactId>
   <name>JRuby Core</name>