You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2022/04/07 08:58:44 UTC
[tomee] branch master updated: Fix BVal XML parsing and namespace resolution. Publish snapshots, remove our shade
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
The following commit(s) were added to refs/heads/master by this push:
new eb799d5e9d Fix BVal XML parsing and namespace resolution. Publish snapshots, remove our shade
eb799d5e9d is described below
commit eb799d5e9d88794bc20443440ac730ebf238b043
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Apr 7 10:58:30 2022 +0200
Fix BVal XML parsing and namespace resolution. Publish snapshots, remove our shade
---
boms/tomee-microprofile/pom.xml | 23 ++--
boms/tomee-plume/pom.xml | 23 ++--
boms/tomee-plus/pom.xml | 23 ++--
boms/tomee-webprofile/pom.xml | 23 ++--
container/openejb-core/pom.xml | 5 +-
deps/bval-jsr-shade/pom.xml | 110 -----------------
.../apache/bval/jsr/DefaultConstraints.properties | 131 ---------------------
.../apache/bval/jsr/ValidationMessages.properties | 46 --------
.../bval/jsr/ValidationMessages_de.properties | 37 ------
.../bval/jsr/ValidationMessages_en.properties | 20 ----
.../bval/jsr/ValidationMessages_es.properties | 37 ------
.../bval/jsr/ValidationMessages_it.properties | 37 ------
.../valueextraction/DefaultExtractors.properties | 25 ----
deps/pom.xml | 1 -
pom.xml | 13 +-
tck/bval-embedded/pom.xml | 8 +-
tck/bval-embedded/src/test/resources/dev.xml | 2 +-
tck/bval-tomee/pom.xml | 6 +
tck/bval-tomee/src/test/resources/arquillian.xml | 4 +
tck/bval-tomee/src/test/resources/dev.xml | 3 -
tomee/tomee-security/pom.xml | 5 +-
21 files changed, 76 insertions(+), 506 deletions(-)
diff --git a/boms/tomee-microprofile/pom.xml b/boms/tomee-microprofile/pom.xml
index 3bceea3353..060c53e4e2 100644
--- a/boms/tomee-microprofile/pom.xml
+++ b/boms/tomee-microprofile/pom.xml
@@ -529,6 +529,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <version>2.0.6-SNAPSHOT</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -1040,17 +1052,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>bval-jsr-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 4ab2fd19c7..12f87ef87f 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -574,6 +574,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <version>2.0.6-SNAPSHOT</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-core</artifactId>
@@ -1140,17 +1152,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>bval-jsr-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index 20b367c243..6966f8f259 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -563,6 +563,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <version>2.0.6-SNAPSHOT</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jcs-core</artifactId>
@@ -1140,17 +1152,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>bval-jsr-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
diff --git a/boms/tomee-webprofile/pom.xml b/boms/tomee-webprofile/pom.xml
index a31e6d64ce..cfee679a7b 100644
--- a/boms/tomee-webprofile/pom.xml
+++ b/boms/tomee-webprofile/pom.xml
@@ -188,6 +188,18 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <version>2.0.6-SNAPSHOT</version>
+ <classifier>jakarta</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -699,17 +711,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>bval-jsr-shade</artifactId>
- <version>9.0.0-M8-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index d5ace05ddc..dfbd28b517 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -717,8 +717,9 @@
</dependency>
-->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>bval-jsr-shade</artifactId>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<dependency> <!-- licence apache, only 110ko -->
diff --git a/deps/bval-jsr-shade/pom.xml b/deps/bval-jsr-shade/pom.xml
deleted file mode 100644
index f121b4b4dd..0000000000
--- a/deps/bval-jsr-shade/pom.xml
+++ /dev/null
@@ -1,110 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M8-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>bval-jsr-shade</artifactId>
- <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>
- <version>${bval.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.bval:*</include> <!-- only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.el</pattern>
- <shadedPattern>jakarta.el</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.enterprise</pattern>
- <shadedPattern>jakarta.enterprise</shadedPattern>
- <excludes>
- <exclude>javax.enterprise.deploy.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.inject</pattern>
- <shadedPattern>jakarta.inject</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.interceptor</pattern>
- <shadedPattern>jakarta.interceptor</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.validation</pattern>
- <shadedPattern>jakarta.validation</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.xml.bind</pattern>
- <shadedPattern>jakarta.xml.bind</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties
deleted file mode 100644
index 526ccbd808..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/DefaultConstraints.properties
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.
-
-# configuration for mapping of jakarta.validation.constraints to ConstraintValidator implementations
-# the annotations from the JSR303 validation-api are mentioned here, but you could
-# also extend the configuration to get a default implementation for other constraint-annotations.
-# format: key=constraint-annotation-class value=constraint-validator-class (multiple classes: comma-separated)
-
-jakarta.validation.constraints.AssertFalse=org.apache.bval.constraints.AssertFalseValidator
-jakarta.validation.constraints.AssertTrue=org.apache.bval.constraints.AssertTrueValidator
-
-jakarta.validation.constraints.DecimalMax=\
- org.apache.bval.constraints.DecimalMaxValidator$ForNumber,\
- org.apache.bval.constraints.DecimalMaxValidator$ForString
-
-jakarta.validation.constraints.DecimalMin=\
- org.apache.bval.constraints.DecimalMinValidator$ForNumber,\
- org.apache.bval.constraints.DecimalMinValidator$ForString
-
-jakarta.validation.constraints.Digits=org.apache.bval.constraints.DigitsValidatorForNumber,\
- org.apache.bval.constraints.DigitsValidatorForString
-
-jakarta.validation.constraints.Email=org.apache.bval.constraints.EmailValidator
-
-jakarta.validation.constraints.Future=\
- org.apache.bval.constraints.FutureValidator$ForCalendar,\
- org.apache.bval.constraints.FutureValidator$ForDate,\
- org.apache.bval.constraints.FutureValidator$ForChronoLocalDate,\
- org.apache.bval.constraints.FutureValidator$ForChronoLocalDateTime,\
- org.apache.bval.constraints.FutureValidator$ForChronoZonedDateTime,\
- org.apache.bval.constraints.FutureValidator$ForInstant,\
- org.apache.bval.constraints.FutureValidator$ForLocalTime,\
- org.apache.bval.constraints.FutureValidator$ForMonthDay,\
- org.apache.bval.constraints.FutureValidator$ForOffsetDateTime,\
- org.apache.bval.constraints.FutureValidator$ForOffsetTime,\
- org.apache.bval.constraints.FutureValidator$ForYear,\
- org.apache.bval.constraints.FutureValidator$ForYearMonth
-
-jakarta.validation.constraints.FutureOrPresent=\
- org.apache.bval.constraints.FutureOrPresentValidator$ForCalendar,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForDate,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForChronoLocalDate,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForChronoLocalDateTime,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForChronoZonedDateTime,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForInstant,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForLocalTime,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForMonthDay,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForOffsetDateTime,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForOffsetTime,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForYear,\
- org.apache.bval.constraints.FutureOrPresentValidator$ForYearMonth
-
-jakarta.validation.constraints.Max=org.apache.bval.constraints.MaxValidatorForNumber,\
- org.apache.bval.constraints.MaxValidatorForString
-
-jakarta.validation.constraints.Min=org.apache.bval.constraints.MinValidatorForNumber,\
- org.apache.bval.constraints.MinValidatorForString
-
-jakarta.validation.constraints.Negative=org.apache.bval.constraints.NumberSignValidator$ForNegative
-jakarta.validation.constraints.NegativeOrZero=org.apache.bval.constraints.NumberSignValidator$ForNegative$OrZero
-
-jakarta.validation.constraints.NotBlank=org.apache.bval.constraints.NotBlankValidator
-
-jakarta.validation.constraints.NotEmpty=org.apache.bval.constraints.NotEmptyValidator,\
- org.apache.bval.constraints.NotEmptyValidatorForCharSequence,\
- org.apache.bval.constraints.NotEmptyValidatorForCollection,\
- org.apache.bval.constraints.NotEmptyValidatorForMap
-
-jakarta.validation.constraints.NotNull=org.apache.bval.constraints.NotNullValidator
-jakarta.validation.constraints.Null=org.apache.bval.constraints.NullValidator
-
-jakarta.validation.constraints.Past=\
- org.apache.bval.constraints.PastValidator$ForCalendar,\
- org.apache.bval.constraints.PastValidator$ForDate,\
- org.apache.bval.constraints.PastValidator$ForChronoLocalDate,\
- org.apache.bval.constraints.PastValidator$ForChronoLocalDateTime,\
- org.apache.bval.constraints.PastValidator$ForChronoZonedDateTime,\
- org.apache.bval.constraints.PastValidator$ForInstant,\
- org.apache.bval.constraints.PastValidator$ForLocalTime,\
- org.apache.bval.constraints.PastValidator$ForMonthDay,\
- org.apache.bval.constraints.PastValidator$ForOffsetDateTime,\
- org.apache.bval.constraints.PastValidator$ForOffsetTime,\
- org.apache.bval.constraints.PastValidator$ForYear,\
- org.apache.bval.constraints.PastValidator$ForYearMonth
-
-jakarta.validation.constraints.PastOrPresent=\
- org.apache.bval.constraints.PastOrPresentValidator$ForCalendar,\
- org.apache.bval.constraints.PastOrPresentValidator$ForDate,\
- org.apache.bval.constraints.PastOrPresentValidator$ForChronoLocalDate,\
- org.apache.bval.constraints.PastOrPresentValidator$ForChronoLocalDateTime,\
- org.apache.bval.constraints.PastOrPresentValidator$ForChronoZonedDateTime,\
- org.apache.bval.constraints.PastOrPresentValidator$ForInstant,\
- org.apache.bval.constraints.PastOrPresentValidator$ForLocalTime,\
- org.apache.bval.constraints.PastOrPresentValidator$ForMonthDay,\
- org.apache.bval.constraints.PastOrPresentValidator$ForOffsetDateTime,\
- org.apache.bval.constraints.PastOrPresentValidator$ForOffsetTime,\
- org.apache.bval.constraints.PastOrPresentValidator$ForYear,\
- org.apache.bval.constraints.PastOrPresentValidator$ForYearMonth
-
-jakarta.validation.constraints.Positive=org.apache.bval.constraints.NumberSignValidator$ForPositive
-jakarta.validation.constraints.PositiveOrZero=org.apache.bval.constraints.NumberSignValidator$ForPositive$OrZero
-
-jakarta.validation.constraints.Size=\
- org.apache.bval.constraints.SizeValidator$ForArray$OfObject,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfByte,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfShort,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfInt,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfChar,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfLong,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfFloat,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfDouble,\
- org.apache.bval.constraints.SizeValidator$ForArray$OfBoolean,\
- org.apache.bval.constraints.SizeValidator$ForCharSequence,\
- org.apache.bval.constraints.SizeValidator$ForCollection,\
- org.apache.bval.constraints.SizeValidator$ForMap
-
-jakarta.validation.constraints.Pattern=org.apache.bval.constraints.PatternValidator
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties
deleted file mode 100644
index 06cca0c27d..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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.
-
-# The properties listed below are resolved by the default message resolver.
-
-# standard
-jakarta.validation.constraints.AssertTrue.message=must be true
-jakarta.validation.constraints.AssertFalse.message=must be false
-jakarta.validation.constraints.DecimalMax.message=must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
-jakarta.validation.constraints.DecimalMin.message=must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
-jakarta.validation.constraints.Digits.message=numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-jakarta.validation.constraints.Email.message=must be a well-formed email address
-jakarta.validation.constraints.Future.message=must be a future date
-jakarta.validation.constraints.FutureOrPresent.message=must be a date in the present or in the future
-jakarta.validation.constraints.Max.message=must be less than or equal to {value}
-jakarta.validation.constraints.Min.message=must be greater than or equal to {value}
-jakarta.validation.constraints.Negative.message=must be less than 0
-jakarta.validation.constraints.NegativeOrZero.message=must be less than or equal to 0
-jakarta.validation.constraints.NotBlank.message=must not be blank
-jakarta.validation.constraints.NotEmpty.message=must not be empty
-jakarta.validation.constraints.NotNull.message=may not be null
-jakarta.validation.constraints.Null.message=must be null
-jakarta.validation.constraints.Past.message=must be a past date
-jakarta.validation.constraints.PastOrPresent.message=must be a date in the past or in the present
-jakarta.validation.constraints.Positive.message=must be greater than 0
-jakarta.validation.constraints.PositiveOrZero.message=must be greater than or equal to 0
-jakarta.validation.constraints.Pattern.message=must match the following regular expression: {regexp}
-jakarta.validation.constraints.Size.message=size must be between {min} and {max}
-
-# additional built-ins
-org.apache.bval.constraints.NotEmpty.message=may not be empty
-org.apache.bval.constraints.Email.message=not a well-formed email address
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties
deleted file mode 100644
index d7d38b2910..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_de.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-# The properties listed below are resolved by the default message resolver.
-
-# standard
-jakarta.validation.constraints.Null.message=muss "null" sein
-jakarta.validation.constraints.NotNull.message=darf nicht "null" sein
-jakarta.validation.constraints.AssertTrue.message=muss "true" sein
-jakarta.validation.constraints.AssertFalse.message=muss "false" sein
-jakarta.validation.constraints.Min.message=muss gr\u00F6\u00DFer oder gleich {value} sein
-jakarta.validation.constraints.Max.message=muss kleiner oder gleich {value} sein
-jakarta.validation.constraints.Size.message=Gr\u00F6\u00DFe muss zwischen {min} und {max} liegen
-jakarta.validation.constraints.Digits.message=numerischer Wert au\u00DFerhalb des G\u00FCltigkeitsbereiches (erwarte: <{integer} digits>.<{fraction} digits>)
-jakarta.validation.constraints.Past.message=muss Datum in der Vergangenheit sein
-jakarta.validation.constraints.Future.message=muss Datum in der Zukunft sein
-jakarta.validation.constraints.Pattern.message=Muss mit regul\u00E4rem Ausdruck \u00FCbereinstimmen: {regexp}
-jakarta.validation.constraints.DecimalMax.message=muss kleiner oder gleich {value} sein
-jakarta.validation.constraints.DecimalMin.message=muss gr\u00F6\u00DFer oder gleich {value} sein
-
-# additional built-ins
-org.apache.bval.constraints.NotEmpty.message=darf nicht leer sein
-org.apache.bval.constraints.Email.message=muss g\u00FCltiges Format einer EMail-Adresse sein
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_en.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_en.properties
deleted file mode 100644
index 4ecfad312a..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_en.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-# intentionally empty, because english messages are located in the default bundle.
-# this file ensures, that a lookup with an english locale uses the default bundle and not the
-# bundle of the default locale, which is platform specific
\ No newline at end of file
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties
deleted file mode 100644
index 0cd6a08452..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_es.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-# The properties listed below are resolved by the default message resolver.
-
-# standard
-jakarta.validation.constraints.Null.message=tiene que ser null
-jakarta.validation.constraints.NotNull.message=no puede ser null
-jakarta.validation.constraints.AssertTrue.message=tiene que ser true
-jakarta.validation.constraints.AssertFalse.message=tiene que ser false
-jakarta.validation.constraints.Min.message=tiene que ser menor o igual que {value}
-jakarta.validation.constraints.Max.message=tiene que ser mayor o igual que {value}
-jakarta.validation.constraints.Size.message=el tama\u00F1o tiene que estar comprendido entre {min} y {max}
-jakarta.validation.constraints.Digits.message=valor num\u00E9rico fuera de los l\u00EDmites (se espera <{integer} cifras>.<{fraction} cifras>)
-jakarta.validation.constraints.Past.message=tiene que ser una fecha en el pasado
-jakarta.validation.constraints.Future.message=tiene que ser una fecha en el futuro
-jakarta.validation.constraints.Pattern.message=tiene que corresponder a la expresi\u00F3n regular "{regexp}"
-jakarta.validation.constraints.DecimalMax.message=tiene que ser mayor o igual que {value}
-jakarta.validation.constraints.DecimalMin.message=tiene que ser menor o igual que {value}
-
-# additional built-ins
-org.apache.bval.constraints.NotEmpty.message=no puede ser vac\u00EDo
-org.apache.bval.constraints.Email.message=tiene que ser un correo email bien formado
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties
deleted file mode 100644
index d757900f91..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/ValidationMessages_it.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-# The properties listed below are resolved by the default message resolver.
-
-# standard
-jakarta.validation.constraints.Null.message=deve essere null
-jakarta.validation.constraints.NotNull.message=non pu\u00F2 essere null
-jakarta.validation.constraints.AssertTrue.message=deve essere true
-jakarta.validation.constraints.AssertFalse.message=deve essere false
-jakarta.validation.constraints.Min.message=deve essere minore o uguale di {value}
-jakarta.validation.constraints.Max.message=deve essere maggiore o uguale di {value}
-jakarta.validation.constraints.Size.message=le dimensioni devono essere tra {min} e {max}
-jakarta.validation.constraints.Digits.message=valore numerico fuori dai limiti (atteso <{integer} cifre>.<{fraction} cifre>)
-jakarta.validation.constraints.Past.message=deve essere una data nel passato
-jakarta.validation.constraints.Future.message=deve essere una data futura
-jakarta.validation.constraints.Pattern.message=deve corrispondere all'espressione regolare "{regexp}"
-jakarta.validation.constraints.DecimalMax.message=deve essere maggiore o uguale di {value}
-jakarta.validation.constraints.DecimalMin.message=deve essere minore o uguale di {value}
-
-# additional built-ins
-org.apache.bval.constraints.NotEmpty.message=non pu\u00F2 essere vuoto
-org.apache.bval.constraints.Email.message=non \u00E8 un indirizzo email ben formato
diff --git a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties b/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties
deleted file mode 100644
index 2ea0afd132..0000000000
--- a/deps/bval-jsr-shade/src/main/resources/org/apache/bval/jsr/valueextraction/DefaultExtractors.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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.validation.valueextraction.ValueExtractor=\
- org.apache.bval.jsr.valueextraction.IterableElementExtractor,\
- org.apache.bval.jsr.valueextraction.ListElementExtractor
-
-jakarta.validation.valueextraction.ValueExtractor.container=\
- org.apache.bval.jsr.valueextraction.MapExtractor,\
- org.apache.bval.jsr.valueextraction.OptionalExtractor,\
- org.apache.bval.jsr.valueextraction.FxExtractor
diff --git a/deps/pom.xml b/deps/pom.xml
index 7245a9ca38..641629d185 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -36,7 +36,6 @@
<module>activemq-client-shade</module>
<module>activemq-kahadb-store-shade</module>
<module>activemq-ra-shade</module>
- <module>bval-jsr-shade</module>
<module>commons-dbcp2-shade</module>
<module>commons-fileupload-shade</module>
</modules>
diff --git a/pom.xml b/pom.xml
index d8fd154b19..c8f17ed422 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1131,15 +1131,10 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>bval-jsr-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <classifier>jakarta</classifier>
+ <version>${bval.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 843e78f20a..c2190de1d7 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -105,6 +105,12 @@
<version>${version.arquillian-protocol-servlet-jakarta}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-base</artifactId>
+ <version>11</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -147,7 +153,7 @@
<systemPropertyVariables>
<validation.provider>${validation.provider}</validation.provider>
</systemPropertyVariables>
- <parallel>methods</parallel>
+ <parallel>none</parallel>
<threadCount>4</threadCount>
</configuration>
</plugin>
diff --git a/tck/bval-embedded/src/test/resources/dev.xml b/tck/bval-embedded/src/test/resources/dev.xml
index 74d40bba0e..406b887cdc 100644
--- a/tck/bval-embedded/src/test/resources/dev.xml
+++ b/tck/bval-embedded/src/test/resources/dev.xml
@@ -19,7 +19,7 @@
<suite name="BVAL-TCK" verbose="1">
<test name="BVAL-TCK">
<classes>
- <class name="org.hibernate.beanvalidation.tck.tests.xmlconfiguration.versioning.Version30InMappingXmlTest" />
+ <class name="org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider.BootstrapNonAvailableValidationProviderTest" />
</classes>
</test>
</suite>
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 2b8b64e9b2..1d518f7d75 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -111,6 +111,12 @@
<version>${version.arquillian-protocol-servlet-jakarta}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-base</artifactId>
+ <version>11</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tck/bval-tomee/src/test/resources/arquillian.xml b/tck/bval-tomee/src/test/resources/arquillian.xml
index 1f4c4633fd..d5e75cae31 100644
--- a/tck/bval-tomee/src/test/resources/arquillian.xml
+++ b/tck/bval-tomee/src/test/resources/arquillian.xml
@@ -28,6 +28,7 @@
<property name="httpPort">-1</property>
<property name="stopPort">-1</property>
<property name="ajpPort">-1</property>
+ <property name="debug">false</property>
<property name="dir">target/tomee-tck</property>
<property name="appWorkingDir">target/tck-workdir</property>
<property name="simpleLog">true</property>
@@ -47,6 +48,9 @@
META-INF/javamail.charset.map,META-INF/mailcap,\
org/slf4j/impl/StaticLoggerBinder.class
</property>
+ <property name="additionalLibs">
+ mvn:org.openjfx:javafx-base:11
+ </property>
</configuration>
</container>
</arquillian>
diff --git a/tck/bval-tomee/src/test/resources/dev.xml b/tck/bval-tomee/src/test/resources/dev.xml
index 779eefb96e..a1ee993cf5 100644
--- a/tck/bval-tomee/src/test/resources/dev.xml
+++ b/tck/bval-tomee/src/test/resources/dev.xml
@@ -18,9 +18,6 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="BVal-TCK" verbose="1">
<test name="BVal-TCK">
- <packages>
- <package name="org.hibernate.beanvalidation.tck.tests.xmlconfiguration"/>
- </packages>
<classes>
<class name="org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider.BootstrapNonAvailableValidationProviderTest" />
</classes>
diff --git a/tomee/tomee-security/pom.xml b/tomee/tomee-security/pom.xml
index 69dde3885a..eadd2a1e3d 100644
--- a/tomee/tomee-security/pom.xml
+++ b/tomee/tomee-security/pom.xml
@@ -95,8 +95,9 @@
<classifier>jakarta</classifier>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>bval-jsr-shade</artifactId>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr</artifactId>
+ <classifier>jakarta</classifier>
</dependency>
<!-- Test -->