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/tomee.git
commit c09383bcd23ce90e197313737c3a347d8d31de99 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Wed Mar 23 22:05:12 2022 +0100 The new validation 3 schema is only available in 2.0.6-SNAPSHOT but the shading is broken because of the defaultConstraints.properties, so we still need our shade dep. --- deps/bval-jsr-shade/pom.xml | 8 ++++++++ pom.xml | 2 +- tck/bval-embedded/pom.xml | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/deps/bval-jsr-shade/pom.xml b/deps/bval-jsr-shade/pom.xml index fca9103..f121b4b 100644 --- a/deps/bval-jsr-shade/pom.xml +++ b/deps/bval-jsr-shade/pom.xml @@ -29,6 +29,10 @@ <name>TomEE :: Deps :: Apache BVal JSR shade</name> <dependencies> + <!-- + We need to use the latest 2.0.6-SNAPSHOT to perform the relocate even though the work has been done already. + But the defaultConstraints.properties isn't done and therefor we still need our shade dependency + --> <dependency> <groupId>org.apache.bval</groupId> <artifactId>bval-jsr</artifactId> @@ -91,6 +95,10 @@ <pattern>javax.validation</pattern> <shadedPattern>jakarta.validation</shadedPattern> </relocation> + <relocation> + <pattern>javax.xml.bind</pattern> + <shadedPattern>jakarta.xml.bind</shadedPattern> + </relocation> </relocations> </configuration> </execution> diff --git a/pom.xml b/pom.xml index ac13af3..7a57a0b 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ <commons-io.version>2.11.0</commons-io.version> <commons-net.version>3.8.0</commons-net.version> - <bval.version>2.0.5</bval.version> + <bval.version>2.0.6-SNAPSHOT</bval.version> <org.apache.activemq.version>5.16.4</org.apache.activemq.version> <org.springframework.version>3.1.4.RELEASE</org.springframework.version> <junit.version>4.13.2</junit.version> diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml index 1b22ae2..63d607f 100644 --- a/tck/bval-embedded/pom.xml +++ b/tck/bval-embedded/pom.xml @@ -78,6 +78,20 @@ <groupId>jakarta.validation</groupId> <artifactId>beanvalidation-tck-tests</artifactId> <version>${bval-tck.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.validation</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.interceptor</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.arquillian.testng</groupId>
