You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/01/12 18:33:22 UTC
[camel] 01/02: Jakarta Migration: Fixed Camel-Bean-Validator and Camel-CM-SMS tests
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit da9ca6ac2fc0a87e7a9ac0aea5fa197bb8df3152
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Jan 12 18:58:58 2023 +0100
Jakarta Migration: Fixed Camel-Bean-Validator and Camel-CM-SMS tests
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
components/camel-bean-validator/pom.xml | 12 +++++------
.../src/main/docs/bean-validator-component.adoc | 24 +++++++++++++---------
.../src/test/resources/META-INF/validation.xml | 10 +++++----
.../src/test/resources/constraints-car.xml | 17 ++++++++-------
components/camel-cm-sms/pom.xml | 22 ++++++--------------
parent/pom.xml | 8 ++++----
6 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 4c426949750..d2e226b9ade 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -57,14 +57,14 @@
<version>${jboss-logging-version}</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${javax-el-api-hibernate-validator-version}</version>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>${jakarta-el-api-hibernate-validator-version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>${javax-el-hibernate-validator-version}</version>
+ <groupId>org.glassfish.expressly</groupId>
+ <artifactId>expressly</artifactId>
+ <version>${jakarta-el-expressly-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc b/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
index bb710241c32..ef61388a801 100644
--- a/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
+++ b/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
@@ -116,7 +116,7 @@ public interface OptionalChecks {
with the following Camel route, only the *@NotNull* constraints on the
attributes manufacturer and licensePlate will be validated (Camel uses
-the default group `javax.validation.groups.Default`).
+the default group `jakarta.validation.groups.Default`).
[source,java]
-------------------------
@@ -184,9 +184,10 @@ annotations. In this case, you have to provide the file
[source,xml]
------------------------------------------------------------------------------------------------------------------------------
<validation-config
- xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration">
+ xmlns="https://jakarta.ee/xml/ns/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/configuration https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+ version="3.0">
<default-provider>org.hibernate.validator.HibernateValidator</default-provider>
<message-interpolator>org.hibernate.validator.engine.ResourceBundleMessageInterpolator</message-interpolator>
@@ -203,21 +204,24 @@ and the `constraints-car.xml` file
[source,xml]
----------------------------------------------------------------------------------------------------
-<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
- xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
+<constraint-mappings
+ xmlns="https://jakarta.ee/xml/ns/validation/mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/mapping
+ https://jakarta.ee/xml/ns/validation/validation-mapping-3.0.xsd"
+ version="3.0">
<default-package>org.apache.camel.component.bean.validator</default-package>
<bean class="CarWithoutAnnotations" ignore-annotations="true">
<field name="manufacturer">
- <constraint annotation="javax.validation.constraints.NotNull" />
+ <constraint annotation="jakarta.validation.constraints.NotNull" />
</field>
<field name="licensePlate">
- <constraint annotation="javax.validation.constraints.NotNull" />
+ <constraint annotation="jakarta.validation.constraints.NotNull" />
- <constraint annotation="javax.validation.constraints.Size">
+ <constraint annotation="jakarta.validation.constraints.Size">
<groups>
<value>org.apache.camel.component.bean.validator.OptionalChecks</value>
</groups>
diff --git a/components/camel-bean-validator/src/test/resources/META-INF/validation.xml b/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
index fb7baceb6e4..3fea25b78ad 100644
--- a/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
+++ b/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
@@ -17,12 +17,14 @@
limitations under the License.
-->
-<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration">
+<validation-config
+ xmlns="https://jakarta.ee/xml/ns/validation/configuration"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/configuration https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd"
+ version="3.0">
<default-provider>org.hibernate.validator.HibernateValidator</default-provider>
<message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
<constraint-mapping>/constraints-car.xml</constraint-mapping>
-</validation-config>
\ No newline at end of file
+</validation-config>
diff --git a/components/camel-bean-validator/src/test/resources/constraints-car.xml b/components/camel-bean-validator/src/test/resources/constraints-car.xml
index 5f34a3dfa1f..5ff9d077e30 100644
--- a/components/camel-bean-validator/src/test/resources/constraints-car.xml
+++ b/components/camel-bean-validator/src/test/resources/constraints-car.xml
@@ -17,20 +17,23 @@
limitations under the License.
-->
-<constraint-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
- xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
+<constraint-mappings
+ xmlns="https://jakarta.ee/xml/ns/validation/mapping"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/validation/mapping
+ https://jakarta.ee/xml/ns/validation/validation-mapping-3.0.xsd"
+ version="3.0">
<default-package>org.apache.camel.component.bean.validator</default-package>
<bean class="CarWithoutAnnotations" ignore-annotations="true">
<field name="manufacturer">
- <constraint annotation="javax.validation.constraints.NotNull" />
+ <constraint annotation="jakarta.validation.constraints.NotNull" />
</field>
<field name="licensePlate">
- <constraint annotation="javax.validation.constraints.NotNull" />
+ <constraint annotation="jakarta.validation.constraints.NotNull" />
- <constraint annotation="javax.validation.constraints.Size">
+ <constraint annotation="jakarta.validation.constraints.Size">
<groups>
<value>org.apache.camel.component.bean.validator.OptionalChecks</value>
</groups>
@@ -39,4 +42,4 @@
</constraint>
</field>
</bean>
-</constraint-mappings>
\ No newline at end of file
+</constraint-mappings>
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index c936bfc00fd..e5acfcd0ca1 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -50,21 +50,17 @@
<artifactId>httpclient</artifactId>
</dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${validation-api-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${javax-el-api-hibernate-validator-version}</version>
- </dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator-version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.glassfish.expressly</groupId>
+ <artifactId>expressly</artifactId>
+ <version>${jakarta-el-expressly-version}</version>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -77,12 +73,6 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>${javax-el-hibernate-validator-version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index e1068e20747..2abca6314b3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -134,7 +134,7 @@
<!-- cxf-xjc is not released as often -->
<cxf-xjc-plugin-version>4.0.0</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>4.0.0</cxf-xjc-utils-version>
- <datasonnet-mapper-version>2.2.0</datasonnet-mapper-version>
+ <datasonnet-mapper-version>2.1.4</datasonnet-mapper-version>
<deltaspike-version>1.9.5</deltaspike-version>
<depends-maven-plugin-version>1.4.0</depends-maven-plugin-version>
<derby-version>10.14.2.0</derby-version>
@@ -263,8 +263,8 @@
<javapoet-version>1.11.1</javapoet-version>
<javassist-version>3.28.0-GA</javassist-version>
<javax-el3-version>3.0.0</javax-el3-version>
- <javax-el-api-hibernate-validator-version>3.0.1-b04</javax-el-api-hibernate-validator-version>
- <javax-el-hibernate-validator-version>3.0.1-b10</javax-el-hibernate-validator-version>
+ <jakarta-el-api-hibernate-validator-version>5.0.1</jakarta-el-api-hibernate-validator-version>
+ <jakarta-el-expressly-version>5.0.0</jakarta-el-expressly-version>
<jakarta-activation-version>2.0.1</jakarta-activation-version>
<jakarta-annotation-api-version>2.1.1</jakarta-annotation-api-version>
<jakarta-mail-version>2.0.1</jakarta-mail-version>
@@ -455,7 +455,7 @@
<rxjava2-version>2.2.21</rxjava2-version>
<saxon-version>11.4</saxon-version>
<scala-version>2.11.12</scala-version>
- <scala-datasonnet-version>2.13.10</scala-datasonnet-version>
+ <scala-datasonnet-version>2.13.9</scala-datasonnet-version>
<servicemix-specs-version>2.9.0</servicemix-specs-version>
<shiro-version>1.10.1</shiro-version>
<shrinkwrap-descriptors-version>2.0.0</shrinkwrap-descriptors-version>