From e7eacf9dd51c7f8453cb553c889459de67c28f57 Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Tue, 7 May 2024 09:54:44 -0500
Subject: [PATCH] Bump `org.jboss.logging:jboss-logging` to 3.6.0.Final

---
 .../src/main/java/io/smallrye/common/constraint/Messages.java | 4 +++-
 .../src/main/java/io/smallrye/common/expression/Messages.java | 4 +++-
 net/src/main/java/io/smallrye/common/net/Messages.java        | 4 +++-
 pom.xml                                                       | 2 +-
 .../src/main/java/io/smallrye/common/version/Messages.java    | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/constraint/src/main/java/io/smallrye/common/constraint/Messages.java b/constraint/src/main/java/io/smallrye/common/constraint/Messages.java
index c57f039a..29433e32 100644
--- a/constraint/src/main/java/io/smallrye/common/constraint/Messages.java
+++ b/constraint/src/main/java/io/smallrye/common/constraint/Messages.java
@@ -1,11 +1,13 @@
 package io.smallrye.common.constraint;
 
+import static java.lang.invoke.MethodHandles.lookup;
+
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
 
 @MessageBundle(projectCode = "SRCOM", length = 5)
 interface Messages {
-    Messages log = org.jboss.logging.Messages.getBundle(Messages.class);
+    Messages log = org.jboss.logging.Messages.getBundle(lookup(), Messages.class);
 
     @Message(id = 0, value = "Parameter '%s' may not be null")
     IllegalArgumentException nullParam(String paramName);
diff --git a/expression/src/main/java/io/smallrye/common/expression/Messages.java b/expression/src/main/java/io/smallrye/common/expression/Messages.java
index e4ea8e28..6097377c 100644
--- a/expression/src/main/java/io/smallrye/common/expression/Messages.java
+++ b/expression/src/main/java/io/smallrye/common/expression/Messages.java
@@ -1,11 +1,13 @@
 package io.smallrye.common.expression;
 
+import static java.lang.invoke.MethodHandles.lookup;
+
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
 
 @MessageBundle(projectCode = "SRCOM", length = 5)
 interface Messages {
-    Messages msg = org.jboss.logging.Messages.getBundle(Messages.class);
+    Messages msg = org.jboss.logging.Messages.getBundle(lookup(), Messages.class);
 
     @Message(id = 1000, value = "Invalid expression syntax at position %d")
     String invalidExpressionSyntax(int index);
diff --git a/net/src/main/java/io/smallrye/common/net/Messages.java b/net/src/main/java/io/smallrye/common/net/Messages.java
index e1474a7d..bed12680 100644
--- a/net/src/main/java/io/smallrye/common/net/Messages.java
+++ b/net/src/main/java/io/smallrye/common/net/Messages.java
@@ -1,11 +1,13 @@
 package io.smallrye.common.net;
 
+import static java.lang.invoke.MethodHandles.lookup;
+
 import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
 
 @MessageBundle(projectCode = "SRCOM", length = 5)
 interface Messages {
-    Messages msg = org.jboss.logging.Messages.getBundle(Messages.class);
+    Messages msg = org.jboss.logging.Messages.getBundle(lookup(), Messages.class);
 
     @Message(id = 2000, value = "Invalid address string \"%s\"")
     IllegalArgumentException invalidAddress(String address);
diff --git a/pom.xml b/pom.xml
index ba024898..b453b736 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <version.vertx>4.5.7</version.vertx>
         <version.maven-resolver>1.9.20</version.maven-resolver>
         <version.shrinkwrap>1.2.6</version.shrinkwrap>
-        <version.org.jboss.logging>3.5.0.Final</version.org.jboss.logging>
+        <version.org.jboss.logging>3.6.0.Final</version.org.jboss.logging>
 
         <!-- Sonar settings -->
         <sonar.projectName>SmallRye Common</sonar.projectName>
diff --git a/version/src/main/java/io/smallrye/common/version/Messages.java b/version/src/main/java/io/smallrye/common/version/Messages.java
index a47e97d6..893c2e82 100644
--- a/version/src/main/java/io/smallrye/common/version/Messages.java
+++ b/version/src/main/java/io/smallrye/common/version/Messages.java
@@ -1,5 +1,7 @@
 package io.smallrye.common.version;
 
+import static java.lang.invoke.MethodHandles.lookup;
+
 import java.util.NoSuchElementException;
 
 import org.jboss.logging.annotations.Message;
@@ -8,7 +10,7 @@
 // base 3000
 @MessageBundle(projectCode = "SRCOM", length = 5)
 interface Messages {
-    Messages msg = org.jboss.logging.Messages.getBundle(Messages.class);
+    Messages msg = org.jboss.logging.Messages.getBundle(lookup(), Messages.class);
 
     @Message(id = 3000, value = "Expected alpha part")
     IllegalStateException expectedAlpha();