From edbe7b681951db1772d28330585e6955d93597a2 Mon Sep 17 00:00:00 2001
From: Luis Eufrasio Teixeira Neto <luis.eufrasio@gmail.com>
Date: Thu, 5 Dec 2024 07:40:36 -0300
Subject: [PATCH] Merge pull request #7105 from
 luiseufrasio/FISH-10036-class-cast-ex-deserializing-validation-instance-p6

Fish 10036 class cast ex deserializing validation instance p6
---
 core/pom.xml                   | 2 ++
 nucleus/hk2/hk2-config/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index dd250d12c73..c63fb627825 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -78,6 +78,8 @@
         <jersey.version>4.0.0-M1.payara-p1-SNAPSHOT</jersey.version>
         <jakarta.validation.version>3.1.0</jakarta.validation.version>
         <hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
+        <hibernate.validator.version>8.0.1.Final.payara-p1</hibernate.validator.version>
+        <hibernate.validator.osgi.version>8.0.1.Final</hibernate.validator.osgi.version>
         <jaxb-impl.version>4.0.2</jaxb-impl.version>
         <jsonp-api.version>2.1.3</jsonp-api.version>
         <jakarta.authentication-api.version>3.1.0</jakarta.authentication-api.version>
diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml
index 63658a9e665..ac622aa781a 100644
--- a/nucleus/hk2/hk2-config/pom.xml
+++ b/nucleus/hk2/hk2-config/pom.xml
@@ -130,7 +130,7 @@
                     <instructions>
                         <Import-Package>
                             jakarta.validation.*;resolution:=optional;version="${range;[==,${jakarta.validation.version.upperbound});${jakarta.validation.version}}",
-                            org.hibernate.validator.*;resolution:=optional;version="${range;[==,${hibernate.validator.version.upperbound});${hibernate.validator.version}}",
+                            org.hibernate.validator.*;resolution:=optional;version="${range;[==,${hibernate.validator.version.upperbound});${hibernate.validator.osgi.version}}",
                             *
                         </Import-Package>
                     </instructions>