This is an automated email from the ASF dual-hosted git repository.

jungm 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 5320793509 Update validation TCK to 3.1.1
5320793509 is described below

commit 5320793509eb2e327c8f63552f1459692e147c5c
Author: Markus Jung <[email protected]>
AuthorDate: Sun Mar 22 22:07:34 2026 +0100

    Update validation TCK to 3.1.1
---
 tck/bval-embedded/pom.xml       | 16 +++++++---------
 tck/bval-signature-test/pom.xml |  8 ++++----
 tck/bval-tomee/pom.xml          | 16 +++++++---------
 tck/pom.xml                     |  2 +-
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 3b79f4f155..478e83f8a4 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -76,7 +76,7 @@
     </dependency>
     <dependency>
       <groupId>jakarta.validation</groupId>
-      <artifactId>beanvalidation-tck-tests</artifactId>
+      <artifactId>validation-tck-tests</artifactId>
       <version>${bval-tck.version}</version>
       <exclusions>
         <exclusion>
@@ -121,22 +121,20 @@
         <version>3.10.0</version>
         <executions>
           <execution>
-            <id>copy-tck-test-suite-file</id>
+            <id>unpack-tck-test-suite-file</id>
             <phase>generate-test-sources</phase>
             <goals>
-              <goal>copy</goal>
+              <goal>unpack</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>
+                  <artifactId>validation-tck-tests</artifactId>
+                  <version>${bval-tck.version}</version>
                 </artifactItem>
               </artifactItems>
+              <includes>tck-tests.xml</includes>
             </configuration>
           </execution>
         </executions>
@@ -148,7 +146,7 @@
         <configuration>
           <reuseForks>false</reuseForks>
           <suiteXmlFiles>
-            
<suiteXmlFile>${project.build.directory}/dependency/beanvalidation-tck-tests-suite.xml</suiteXmlFile>
+            
<suiteXmlFile>${project.build.directory}/dependency/tck-tests.xml</suiteXmlFile>
           </suiteXmlFiles>
           <systemPropertyVariables>
             <validation.provider>${validation.provider}</validation.provider>
diff --git a/tck/bval-signature-test/pom.xml b/tck/bval-signature-test/pom.xml
index 819a96218c..454c684079 100644
--- a/tck/bval-signature-test/pom.xml
+++ b/tck/bval-signature-test/pom.xml
@@ -56,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>jakarta.validation</groupId>
-      <artifactId>beanvalidation-tck-tests</artifactId>
+      <artifactId>validation-tck-tests</artifactId>
       <version>${bval-tck.version}</version>
       <scope>test</scope>
     </dependency>
@@ -96,14 +96,14 @@
               <artifactItems>
                 <artifactItem>
                   <groupId>jakarta.validation</groupId>
-                  <artifactId>beanvalidation-tck-tests</artifactId>
+                  <artifactId>validation-tck-tests</artifactId>
                   <version>${bval-tck.version}</version>
                   <type>jar</type>
                   <overWrite>false</overWrite>
                 </artifactItem>
               </artifactItems>
               <!-- We just need the signature file and nothing else -->
-              <includes>**/*.sig</includes>
+              <includes>*.sig</includes>
               
<outputDirectory>${project.build.directory}/api-signature</outputDirectory>
             </configuration>
           </execution>
@@ -125,7 +125,7 @@
             
jakarta.validation.constraintvalidation,jakarta.validation.executable,jakarta.validation.groups,
             
jakarta.validation.metadata,jakarta.validation.spi,jakarta.validation.valueextraction
           </packages>
-          
<sigfile>${project.build.directory}/api-signature/validation-api-java8.sig</sigfile>
+          
<sigfile>${project.build.directory}/api-signature/validation-api-jdk17.sig</sigfile>
         </configuration>
       </plugin>
     </plugins>
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index dfda2758df..9092c3c5f9 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -28,7 +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}/dependency/tck-tests.xml</suiteFile>
   </properties>
 
   <dependencies>
@@ -81,7 +81,7 @@
     </dependency>
     <dependency>
       <groupId>jakarta.validation</groupId>
-      <artifactId>beanvalidation-tck-tests</artifactId>
+      <artifactId>validation-tck-tests</artifactId>
       <version>${bval-tck.version}</version>
       <scope>test</scope>
       <exclusions>
@@ -133,22 +133,20 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy-tck-test-suite-file</id>
+            <id>unpack-tck-test-suite-file</id>
             <phase>generate-test-sources</phase>
             <goals>
-              <goal>copy</goal>
+              <goal>unpack</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>
+                  <artifactId>validation-tck-tests</artifactId>
+                  <version>${bval-tck.version}</version>
                 </artifactItem>
               </artifactItems>
+              <includes>tck-tests.xml</includes>
             </configuration>
           </execution>
         </executions>
diff --git a/tck/pom.xml b/tck/pom.xml
index 924cb84b5b..667934cef4 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <cdi-tck.version>4.0.13</cdi-tck.version>
     <jaxrs.tck.version>4.0.0</jaxrs.tck.version>
-    <bval-tck.version>3.0.1</bval-tck.version>
+    <bval-tck.version>3.1.1</bval-tck.version>
     <jsonb-tck.version>3.0.0</jsonb-tck.version>
     <jsonp-tck.version>2.1.1</jsonp-tck.version>
     
<validation.provider>org.apache.bval.jsr.ApacheValidationProvider</validation.provider>

Reply via email to