This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/main by this push: new c5707d7eb9 [TOMEE-4327] BVal-3.0.1 c5707d7eb9 is described below commit c5707d7eb94b6165458802b8cf2fecbb599f6fef Author: Markus Jung <ju...@apache.org> AuthorDate: Wed Jul 17 09:32:30 2024 +0200 [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 +- .../resources/beanvalidation-tck-tests-suite.xml | 47 ---------------------- tck/bval-tomee/pom.xml | 3 +- .../resources/beanvalidation-tck-tests-suite.xml | 47 ---------------------- 9 files changed, 7 insertions(+), 103 deletions(-) diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml index e0f90229ff..078e4a5050 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 694233134b..ec832b3ebf 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 76e4c83831..a427153347 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 a0f200996a..0057c71ea5 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 4c0d32885e..412dbf30c5 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 0b04995faa..d4b06221f8 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 2b99e45198..0000000000 --- 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 0535ca7fa3..e253cd97f0 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 2b99e45198..0000000000 --- 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>