From 8206bba343fab1e461586db9d8395e828f1bd7c1 Mon Sep 17 00:00:00 2001
From: Markus Jung <jungm@apache.org>
Date: Wed, 17 Jul 2024 09:32:30 +0200
Subject: [PATCH] [TOMEE-4327] BVal-3.0.1

---
 boms/tomee-microprofile/pom.xml               |  2 +-
 boms/tomee-plume/pom.xml                      |  2 +-
 boms/tomee-plus/pom.xml                       |  2 +-
 boms/tomee-webprofile/pom.xml                 |  2 +-
 pom.xml                                       |  2 +-
 tck/bval-embedded/pom.xml                     |  3 +-
 .../beanvalidation-tck-tests-suite.xml        | 47 -------------------
 tck/bval-tomee/pom.xml                        |  3 +-
 .../beanvalidation-tck-tests-suite.xml        | 47 -------------------
 9 files changed, 7 insertions(+), 103 deletions(-)
 delete mode 100644 tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml
 delete mode 100644 tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml

diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 765499a948c..6141a457280 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -785,7 +785,7 @@
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 9a287fe241a..a2a04edaa3b 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -873,7 +873,7 @@
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 96d88e29210..8c2d5b21a53 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -873,7 +873,7 @@
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index fffcccb7f8f..c0f5223f325 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -356,7 +356,7 @@
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr</artifactId>
-      <version>3.0.0</version>
+      <version>3.0.1</version>
       <exclusions>
         <exclusion>
           <artifactId>*</artifactId>
diff --git a/pom.xml b/pom.xml
index d08d68cd99f..c39cf46fb95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,7 +213,7 @@
     <!-- org.apache -->
     <version.activemq>6.1.2</version.activemq>
     <version.batchee>2.0.0</version.batchee>
-    <version.bval>3.0.0</version.bval>
+    <version.bval>3.0.1</version.bval>
     <version.cxf>4.1.0-tomee-M1</version.cxf>
     <version.geronimo.components>4.0.0</version.geronimo.components>
     <!-- we currently rely on Mail Impl. from Geronimo, this might change in the future -->
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 8bf6257b4be..430fe76c84a 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -148,8 +148,7 @@
         <configuration>
           <reuseForks>false</reuseForks>
           <suiteXmlFiles>
-            <suiteXmlFile>${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
-<!--            <suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>-->
+            <suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
           </suiteXmlFiles>
           <systemPropertyVariables>
             <validation.provider>${validation.provider}</validation.provider>
diff --git a/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml b/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml
deleted file mode 100644
index 2b99e451989..00000000000
--- a/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<!--
-
-    Jakarta Bean Validation TCK
-
-    License: Apache License, Version 2.0
-    See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
-
--->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Jakarta-Bean-Validation-TCK" verbose="1">
-    <test name="Jakarta-Bean-Validation-TCK">
-
-        <method-selectors>
-            <method-selector>
-                <selector-class name="org.hibernate.beanvalidation.tck.util.IntegrationTestsMethodSelector"/>
-            </method-selector>
-            <method-selector>
-                <selector-class name="org.hibernate.beanvalidation.tck.util.JavaFXTestsMethodSelector"/>
-            </method-selector>
-        </method-selectors>
-
-        <packages>
-            <package name="org.hibernate.beanvalidation.tck.tests.*">
-                <!-- FIXME: TOMEE-4327 This tests seem to be broken on Java 17+ (also in BVAL itself) - exclude for now -->
-                <exclude name="org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*"/>
-            </package>
-        </packages>
-    </test>
-</suite>
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 7a154adbc54..3f4817b838f 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -28,8 +28,7 @@
 
   <properties>
     <openejb.home>${project.build.directory}${file.separator}apache-tomee-webprofile-${project.version}</openejb.home>
-<!--    <suiteFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteFile>-->
-    <suiteFile>${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml</suiteFile>
+    <suiteFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteFile>
   </properties>
 
   <dependencies>
diff --git a/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml b/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml
deleted file mode 100644
index 2b99e451989..00000000000
--- a/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<!--
-
-    Jakarta Bean Validation TCK
-
-    License: Apache License, Version 2.0
-    See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
-
--->
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
-<suite name="Jakarta-Bean-Validation-TCK" verbose="1">
-    <test name="Jakarta-Bean-Validation-TCK">
-
-        <method-selectors>
-            <method-selector>
-                <selector-class name="org.hibernate.beanvalidation.tck.util.IntegrationTestsMethodSelector"/>
-            </method-selector>
-            <method-selector>
-                <selector-class name="org.hibernate.beanvalidation.tck.util.JavaFXTestsMethodSelector"/>
-            </method-selector>
-        </method-selectors>
-
-        <packages>
-            <package name="org.hibernate.beanvalidation.tck.tests.*">
-                <!-- FIXME: TOMEE-4327 This tests seem to be broken on Java 17+ (also in BVAL itself) - exclude for now -->
-                <exclude name="org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*"/>
-            </package>
-        </packages>
-    </test>
-</suite>