This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/bval.git
The following commit(s) were added to refs/heads/master by this push: new 3965a9b Some more fixes so we can run the TCK 3965a9b is described below commit 3965a9b6887d6a3e9f74ea9a6ae627ad240af7e0 Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com> AuthorDate: Wed Feb 8 15:37:18 2023 +0100 Some more fixes so we can run the TCK --- .../bval/jsr/DefaultMessageInterpolatorTest.java | 2 +- bval-tck/pom.xml | 36 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java index 20ecb37..fa471a8 100644 --- a/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java +++ b/bval-jsr/src/test/java/org/apache/bval/jsr/DefaultMessageInterpolatorTest.java @@ -264,7 +264,7 @@ public class DefaultMessageInterpolatorTest { @Test public void testELEscapingRI() { assumeTrue(elAvailable); - assumeThat(elImpl, equalTo("ri")); + assumeThat(elImpl, equalTo("ri")); ApacheMessageContext context = context("12345678", () -> validator.getConstraintsForClass(Person.class).getConstraintsForProperty("idNumber") diff --git a/bval-tck/pom.xml b/bval-tck/pom.xml index 4d8bee0..f246271 100644 --- a/bval-tck/pom.xml +++ b/bval-tck/pom.xml @@ -180,14 +180,39 @@ under the License. <skip>true</skip> </configuration> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.10</version> + <executions> + <execution> + <id>copy-tck-test-suite-file</id> + <phase>generate-test-sources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>jakarta.validation</groupId> + <artifactId>beanvalidation-tck-tests</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>false</overWrite> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>-Duser.language=en</argLine> <suiteXmlFiles> - <suiteXmlFile>${basedir}/src/test/beanvalidation-tck-tests-suite.xml</suiteXmlFile> + <suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile> </suiteXmlFiles> <systemProperties> <property> @@ -203,8 +228,9 @@ under the License. <value>${project.basedir}/src/test/resources/logging.properties</value> </property> </systemProperties> - <parallel>methods</parallel> - <threadCount>4</threadCount> + <parallel>classes</parallel> + <threadCount>1</threadCount> + <reuseForks>false</reuseForks> </configuration> </plugin> @@ -251,7 +277,7 @@ under the License. <artifactItem> <groupId>jakarta.validation</groupId> <artifactId>beanvalidation-tck-tests</artifactId> - <version>${bval-tck.version}</version> + <version>${tck.version}</version> <type>jar</type> <overWrite>false</overWrite> </artifactItem>