From dbb0e9685f547fbd8e428b78471e066a9a1c72fd Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Mon, 9 Dec 2024 13:46:25 +0000
Subject: [PATCH] Revert "Merge pull request #7105 from
 luiseufrasio/FISH-10036-class-cast-ex-deserializing-validation-instance-p6"

This reverts commit 0156e77b77a69498a0cf7f0fae9c6d3e91844085, reversing
changes made to 26188ec1f7ea8bb3db9c6af4bb59be9e344d1ef3.
---
 core/pom.xml                   | 3 +--
 nucleus/hk2/hk2-config/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 12b7cc81e69..d27ca91a880 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -77,8 +77,7 @@
         <jackson.version>2.18.2</jackson.version>
         <jersey.version>3.1.7.payara-p1</jersey.version>
         <jakarta.validation.version>3.0.2</jakarta.validation.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>
+        <hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
         <jaxb-impl.version>4.0.2</jaxb-impl.version>
         <jsonp-api.version>2.1.0</jsonp-api.version>
         <jakarta.security.auth.message-api.version>3.0.0</jakarta.security.auth.message-api.version>
diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml
index fb4104b7a29..1b5fd7834d9 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.osgi.version}}",
+                            org.hibernate.validator.*;resolution:=optional;version="${range;[==,${hibernate.validator.version.upperbound});${hibernate.validator.version}}",
                             *
                         </Import-Package>
                     </instructions>