fix

Author: trask

.github/unsafe/armeria-update-Caffeine.patch

@@ -1,21 +1,8 @@
-From d6276724f7f432af4693e9d786ecfcaddb73e505 Mon Sep 17 00:00:00 2001
-From: Trask Stalnaker <trask.stalnaker@gmail.com>
-Date: Sat, 20 Sep 2025 21:48:43 -0700
-Subject: [PATCH] Update Caffeine
-
----
- .../src/main/java/com/linecorp/armeria/common/Flags.java | 2 +-
- .../armeria/internal/common/util/CertificateUtil.java    | 9 ++++++---
- .../linecorp/armeria/server/file/FileServiceConfig.java  | 2 +-
- dependencies.toml                                        | 5 ++---
- gradle.properties                                        | 4 ++--
- 5 files changed, 12 insertions(+), 10 deletions(-)
-
 diff --git a/core/src/main/java/com/linecorp/armeria/common/Flags.java b/core/src/main/java/com/linecorp/armeria/common/Flags.java
-index 57671a686..e1dd6eb3b 100644
+index 3fc9c0a..8149daf 100644
 --- a/core/src/main/java/com/linecorp/armeria/common/Flags.java
 +++ b/core/src/main/java/com/linecorp/armeria/common/Flags.java
-@@ -1722,7 +1722,7 @@ public final class Flags {
+@@ -1680,7 +1680,7 @@ public final class Flags {
                  if ("off".equals(value)) {
                      return allowOff;
                  }
@@ -25,44 +12,39 @@ index 57671a686..e1dd6eb3b 100644
              } catch (Exception e) {
                  return false;
 diff --git a/core/src/main/java/com/linecorp/armeria/internal/common/util/CertificateUtil.java b/core/src/main/java/com/linecorp/armeria/internal/common/util/CertificateUtil.java
-index a343428a3..48698e3ea 100644
+index b90dce5..6e98ae9 100644
 --- a/core/src/main/java/com/linecorp/armeria/internal/common/util/CertificateUtil.java
 +++ b/core/src/main/java/com/linecorp/armeria/internal/common/util/CertificateUtil.java
-@@ -57,6 +57,8 @@ public final class CertificateUtil {
+@@ -53,6 +53,8 @@ public final class CertificateUtil {
 
      private static final Logger logger = LoggerFactory.getLogger(CertificateUtil.class);
 
-+    private static final String NO_HOSTNAME_FOUND = "<NO_HOSTNAME_FOUND>";
++    private static final String NO_COMMON_NAME_FOUND = "<NO_COMMON_NAME_FOUND>";
 +
-     private static final LoadingCache<X509Certificate, String> hostnameCache =
+     private static final LoadingCache<X509Certificate, String> commonNameCache =
              Caffeine.newBuilder()
                      .weakKeys()
-@@ -73,11 +75,11 @@ public final class CertificateUtil {
- 
-                             logger.warn("No common name or subject alternative name found " +
-                                         "in certificate: {}", cert);
--                            return null;
-+                            return NO_HOSTNAME_FOUND;
+@@ -63,7 +65,7 @@ public final class CertificateUtil {
+                             return IETFUtils.valueToString(cn.getFirst().getValue());
                          } catch (Exception e) {
-                             logger.warn("Failed to get the common name or subject alternative name name " +
-                                         "from a certificate: {}", cert, e);
+                             logger.warn("Failed to get the common name from a certificate: {}", cert, e);
 -                            return null;
-+                            return NO_HOSTNAME_FOUND;
++                            return NO_COMMON_NAME_FOUND;
                          }
                      });
 
-@@ -136,7 +138,8 @@ public final class CertificateUtil {
+@@ -81,7 +83,8 @@ public final class CertificateUtil {
          if (!(certificate instanceof X509Certificate)) {
              return null;
          }
--        return hostnameCache.get((X509Certificate) certificate);
-+        final String hostname = hostnameCache.get((X509Certificate) certificate);
-+        return NO_HOSTNAME_FOUND.equals(hostname) ? null : hostname;
+-        return commonNameCache.get((X509Certificate) certificate);
++        final String commonName = commonNameCache.get((X509Certificate) certificate);
++        return NO_COMMON_NAME_FOUND.equals(commonName) ? null : commonName;
      }
 
      public static List<X509Certificate> toX509Certificates(File file) throws CertificateException {
 diff --git a/core/src/main/java/com/linecorp/armeria/server/file/FileServiceConfig.java b/core/src/main/java/com/linecorp/armeria/server/file/FileServiceConfig.java
-index 8766acd95..b6b8a1b62 100644
+index 8766acd..b6b8a1b 100644
 --- a/core/src/main/java/com/linecorp/armeria/server/file/FileServiceConfig.java
 +++ b/core/src/main/java/com/linecorp/armeria/server/file/FileServiceConfig.java
 @@ -72,7 +72,7 @@ public final class FileServiceConfig {
@@ -75,20 +57,19 @@ index 8766acd95..b6b8a1b62 100644
              throw new IllegalArgumentException("invalid cache spec: " + entryCacheSpec, e);
          }
 diff --git a/dependencies.toml b/dependencies.toml
-index 22c366f47..bfd54bcce 100644
+index a0b8b74..0ca6134 100644
 --- a/dependencies.toml
 +++ b/dependencies.toml
-@@ -15,8 +15,7 @@ brave6 = "6.3.0"
- brotli4j = "1.18.0"
- # Don"t upgrade bucket4j to 7.6.1 or 8.x that requires Java 11. The module name also has been changed to "com.bucket4j"
+@@ -15,7 +15,7 @@ brotli4j = "1.17.0"
+ # Don"t upgrade bucket4j to 8.x that requires Java 11. The module name also has been changed to "com.bucket4j"
  bucket4j = "7.6.0"
--# Don"t upgrade Caffeine to 3.x that requires Java 11.
+ # Don"t upgrade Caffeine to 3.x that requires Java 11.
 -caffeine = "2.9.3"
 +caffeine = "3.2.2"
  cglib = "3.3.0"
  checkerframework = "2.5.6"
  checkstyle = "10.3.2"
-@@ -325,7 +324,7 @@ javadocs = "https://javadoc.io/doc/com.github.vladimir-bukhtoyarov/bucket4j-core
+@@ -307,7 +307,7 @@ javadocs = "https://javadoc.io/doc/com.github.vladimir-bukhtoyarov/bucket4j-core
  module = "com.github.ben-manes.caffeine:caffeine"
  version.ref = "caffeine"
  exclusions = "com.google.errorprone:error_prone_annotations"
@@ -98,7 +79,7 @@ index 22c366f47..bfd54bcce 100644
 
  [libraries.cglib]
 diff --git a/gradle.properties b/gradle.properties
-index de5b05013..5ab06b436 100644
+index 537f571..3d43848 100644
 --- a/gradle.properties
 +++ b/gradle.properties
 @@ -12,8 +12,8 @@ licenseUrl=https://www.apache.org/license/LICENSE-2.0.txt
@@ -109,9 +90,6 @@ index de5b05013..5ab06b436 100644
 -javaTargetCompatibility=1.8
 +javaSourceCompatibility=11
 +javaTargetCompatibility=11
- publishUrlForRelease=https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/
- publishUrlForSnapshot=https://central.sonatype.com/repository/maven-snapshots/
+ publishUrlForRelease=https://oss.sonatype.org/service/local/staging/deploy/maven2/
+ publishUrlForSnapshot=https://oss.sonatype.org/content/repositories/snapshots/
  publishUsernameProperty=ossrhUsername
--- 
-2.51.0.windows.1
-

.github/unsafe/build-custom-armeria.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.33.3"
+VERSION="1.31.2"
 CURR_DIR="$(pwd)"
 
 cd "$(mktemp -d)"

.github/unsafe/build-custom-protobuf.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="4.32.1"
+VERSION="4.29.1"
 
 cd "$(mktemp -d)"
 
@@ -15,7 +15,7 @@ jar -xf "../protobuf-java-${VERSION}.jar"
 cd ..
 
 # Clone protobuf repository
-git clone --depth 1 --branch "v32.1" https://github.com/protocolbuffers/protobuf.git
+git clone --depth 1 --branch "v29.1" https://github.com/protocolbuffers/protobuf.git
 
 # Apply patch to remove Unsafe usage
 sed -i 's/private static final sun\.misc\.Unsafe UNSAFE = getUnsafe();/private static final sun.misc.Unsafe UNSAFE = null;/' protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java