This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch amq6
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/amq6 by this push:
new ab9f5055ec Exclude bean validaiton tck tests from
"org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*"
as they seem to be broken in BVAL itself with Java 17
ab9f5055ec is described below
commit ab9f5055ec2ba246db48e798ba6e4738164003db
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Fri Apr 12 20:46:51 2024 +0200
Exclude bean validaiton tck tests from
"org.hibernate.beanvalidation.tck.tests.constraints.groups.groupconversion.*"
as they seem to be broken in BVAL itself with Java 17
---
pom.xml | 6 +-
tck/bval-embedded/pom.xml | 3 +-
.../resources/beanvalidation-tck-tests-suite.xml | 47 +++++++++++++++
tck/bval-tomee/pom.xml | 66 +++++++++-------------
.../tomee/bval/tck/BValTCKArchiveProcessor.java | 2 +-
.../resources/beanvalidation-tck-tests-suite.xml | 47 +++++++++++++++
6 files changed, 126 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2f5d98fd67..7f9f5c30ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@
<version.plugin.bundle>3.3.0</version.plugin.bundle>
<version.plugin.javadoc>3.3.2</version.plugin.javadoc>
<asciidoclet.version>1.5.0</asciidoclet.version>
- <surefire.version>3.0.0-M7</surefire.version>
+ <surefire.version>3.2.5</surefire.version>
<!-- OSGi bundles properties -->
<openejb.bundle.activator />
@@ -324,7 +324,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>3.2.5</version>
</plugin>
<plugin> <!-- maven-dependency-plugin:properties doesn't work as well
as this one for us -->
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -1922,7 +1922,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>7.5</version>
+ <version>7.10.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 430fe76c84..8bf6257b4b 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -148,7 +148,8 @@
<configuration>
<reuseForks>false</reuseForks>
<suiteXmlFiles>
-
<suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
+
<suiteXmlFile>${project.build.directory}/test-classes/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
new file mode 100644
index 0000000000..23b3ce6818
--- /dev/null
+++ b/tck/bval-embedded/src/test/resources/beanvalidation-tck-tests-suite.xml
@@ -0,0 +1,47 @@
+<?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: 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 5c78b9d422..7a154adbc5 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -28,7 +28,8 @@
<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}/dependency/beanvalidation-tck-tests-suite.xml</suiteFile>-->
+
<suiteFile>${project.build.directory}/test-classes/beanvalidation-tck-tests-suite.xml</suiteFile>
</properties>
<dependencies>
@@ -128,16 +129,6 @@
</resources>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <useFile>false</useFile>
- <disableXmlReport>false</disableXmlReport>
- <skip>true</skip>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -165,43 +156,38 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <argLine>-Duser.language=en
--add-opens=java.base/java.lang=ALL-UNNAMED</argLine>
+ <reuseForks>false</reuseForks>
+ <suiteXmlFiles>
+ <suiteXmlFile>${suiteFile}</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemPropertyVariables>
+ <validation.provider>${validation.provider}</validation.provider>
+ </systemPropertyVariables>
+ <parallel>none</parallel>
+ <threadCount>4</threadCount>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>${surefire.version}</version>
<executions>
<execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
+ <id>generate-test-report</id>
+ <phase>test</phase>
<goals>
- <goal>verify</goal>
+ <goal>report-only</goal>
</goals>
</execution>
</executions>
<configuration>
- <trimStackTrace>false</trimStackTrace>
- <systemPropertyVariables>
- <validation.provider>${validation.provider}</validation.provider>
- </systemPropertyVariables>
- <suiteXmlFiles>
- <suiteXmlFile>${suiteFile}</suiteXmlFile>
- </suiteXmlFiles>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+
<outputDirectory>${project.build.directory}/surefire-reports</outputDirectory>
+ <outputName>test-report</outputName>
</configuration>
- <dependencies>
- <!-- failsafe has dependencies on javax -->
- <dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>8.0.10</version>
- <type>pom</type>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
diff --git
a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
index f632b0a3a2..2e6fc3c2e3 100644
---
a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
+++
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
@@ -30,6 +30,6 @@ public class BValTCKArchiveProcessor implements
ApplicationArchiveProcessor {
WebArchive.class.cast(archive).addAsLibrary(jarLocation(PlatformUtil.class));
}
*/
- System.out.println(archive.toString(true));
+ //System.out.println(archive.toString(true));
}
}
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
new file mode 100644
index 0000000000..23b3ce6818
--- /dev/null
+++ b/tck/bval-tomee/src/test/resources/beanvalidation-tck-tests-suite.xml
@@ -0,0 +1,47 @@
+<?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: 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>
