chore: update default java version to 25.0.0.36.2

Author: brianheineman

ristretto_classloader/src/runtime/bootstrap.rs

@@ -11,7 +11,7 @@ use tracing::{debug, warn};
 
 /// The default Java version used by the class loader. This is the version that will be used if no
 /// version is specified when creating a class loader.
-pub const DEFAULT_JAVA_VERSION: &str = "21.0.8.9.1";
+pub const DEFAULT_JAVA_VERSION: &str = "25.0.0.36.2";
 
 /// The access flags for primitive classes in the Java runtime. These classes are public, final, and
 /// abstract, meaning they cannot be instantiated and do not have any methods or fields.

ristretto_jimage/src/image.rs

@@ -249,7 +249,7 @@ mod tests {
 
     #[tokio::test]
     async fn test_image_for_all_java_lts_versions() -> Result<()> {
-        let versions = ["11.0.28.6.1", "17.0.16.8.1", "21.0.8.9.1", "25.0.0.36.1"];
+        let versions = ["11.0.28.6.1", "17.0.16.8.1", "21.0.8.9.1", "25.0.0.36.2"];
         for version in &versions {
             let (java_home, _java_version, _class_loader) =
                 version_class_loader(version).await.expect("java home");

ristretto_jimage/src/index.rs

@@ -210,7 +210,8 @@ mod tests {
     #[tokio::test]
     async fn test_get_resource_offset_invalid() -> Result<()> {
         let image = get_test_image().await?;
-        let result = Index::get_resource_offset::<byteorder::LittleEndian>(&image, "foo/42");
+        let result =
+            Index::get_resource_offset::<byteorder::LittleEndian>(&image, "not/a/valid/path.42");
         assert!(matches!(result, Err(InvalidIndex(_))));
         Ok(())
     }

ristretto_vm/src/intrinsic_methods/java/lang/class.rs

@@ -1150,7 +1150,7 @@ mod tests {
         let parameters = Parameters::new(vec![class_object]);
         let result = get_class_file_version_0(thread, parameters).await?;
         let version = result.expect("version").as_i32()?;
-        assert_eq!(version, i32::from(Version::Java21 { minor: 0 }.major()));
+        assert_eq!(version, i32::from(Version::Java25 { minor: 0 }.major()));
         Ok(())
     }
 
@@ -1312,9 +1312,7 @@ mod tests {
                 "public static final int java.lang.Integer.MIN_VALUE",
                 "public static final int java.lang.Integer.SIZE",
                 "public static final java.lang.Class java.lang.Integer.TYPE",
-                "static final byte[] java.lang.Integer.DigitOnes",
-                "static final byte[] java.lang.Integer.DigitTens",
-                "static final char[] java.lang.Integer.digits",
+                "static final byte[] java.lang.Integer.digits",
             ]
         );
         Ok(())

ristretto_vm/src/intrinsic_methods/java/lang/invoke/methodhandlenatives.rs

@@ -750,7 +750,7 @@ mod tests {
         member_name.set_value("name", value_string)?;
         parameters.push(Value::from(member_name));
         let result = object_field_offset(thread, parameters).await?;
-        assert_eq!(Some(Value::Long(7)), result);
+        assert_eq!(Some(Value::Long(5)), result);
         Ok(())
     }