This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit c2225289c7e631d37962508725e060151ec61e1d Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Mar 19 12:11:48 2018 +0100 CAMEL-11650 - Use Hibernate Validator 6.x where possible This reverts commit eed918215d6d5506bb768c1829a35f289fdd306e. --- components/camel-bean-validator/pom.xml | 6 +++--- .../component/bean/validator/BeanValidatorRouteTest.java | 6 +++--- components/camel-cm-sms/pom.xml | 8 ++++---- .../camel-cm-sms/src/main/docs/cm-sms-component.adoc | 14 +++++++------- parent/pom.xml | 2 ++ platforms/karaf/features/src/main/resources/features.xml | 16 +++------------- 6 files changed, 22 insertions(+), 30 deletions(-) diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml index d0c4e57..e039e10 100644 --- a/components/camel-bean-validator/pom.xml +++ b/components/camel-bean-validator/pom.xml @@ -63,12 +63,12 @@ <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId> - <version>${javax.el-api-version}</version> + <version>${javax.el-api-hibernate-validator-version}</version> </dependency> <dependency> - <groupId>org.glassfish.web</groupId> + <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> - <version>${javax.el-version}</version> + <version>${javax.el-hibernate-validator-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java index 261df77..93cfe11 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorRouteTest.java @@ -101,7 +101,7 @@ public class BeanValidatorRouteTest extends CamelTestSupport { ConstraintViolation<Object> constraintViolation = constraintViolations.iterator().next(); assertEquals("licensePlate", constraintViolation.getPropertyPath().toString()); assertEquals(null, constraintViolation.getInvalidValue()); - assertEquals("may not be null", constraintViolation.getMessage()); + assertEquals("must not be null", constraintViolation.getMessage()); } car.setLicensePlate("D-A"); @@ -138,7 +138,7 @@ public class BeanValidatorRouteTest extends CamelTestSupport { ConstraintViolation<Object> constraintViolation = constraintViolations.iterator().next(); assertEquals("licensePlate", constraintViolation.getPropertyPath().toString()); assertEquals(null, constraintViolation.getInvalidValue()); - assertEquals("may not be null", constraintViolation.getMessage()); + assertEquals("must not be null", constraintViolation.getMessage()); } car.setLicensePlate("D-A"); @@ -212,7 +212,7 @@ public class BeanValidatorRouteTest extends CamelTestSupport { ConstraintViolation<Object> constraintViolation = constraintViolations.iterator().next(); assertEquals("manufacturer", constraintViolation.getPropertyPath().toString()); assertEquals(null, constraintViolation.getInvalidValue()); - assertEquals("may not be null", constraintViolation.getMessage()); + assertEquals("must not be null", constraintViolation.getMessage()); } car.setManufacturer("BMW"); diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml index df14b38..1caa1ec 100644 --- a/components/camel-cm-sms/pom.xml +++ b/components/camel-cm-sms/pom.xml @@ -69,10 +69,10 @@ <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId> - <version>${javax.el-api-version}</version> + <version>${javax.el-api-hibernate-validator-version}</version> </dependency> <dependency> - <groupId>org.hibernate</groupId> + <groupId>org.hibernate.validator</groupId> <artifactId>hibernate-validator</artifactId> <version>${hibernate-validator-version}</version> </dependency> @@ -104,9 +104,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.glassfish.web</groupId> + <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> - <version>${javax.el-version}</version> + <version>${javax.el-hibernate-validator-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc index 6dc2253..9e485e1 100644 --- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc +++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc @@ -10,25 +10,25 @@ It allows to integrate https://dashboard.onlinesmsgateway.com/docs[CM SMS API]in You must have a valid account. More information are available at https://www.cmtelecom.com/support[CM Telecom]. -[source,java] -------------------------------- +[source,text] +---- cm-sms://sgw01.cm.nl/gateway.ashx?defaultFrom=DefaultSender&defaultMaxNumberOfParts=8&productToken=xxxxx -------------------------------- +---- Maven users will need to add the following dependency to their pom.xml for this component: [source,xml] ---------------------------------------------------------- +--- <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cm-sms</artifactId> <version>x.x.x</version> <!-- use the same version as your Camel core version --> </dependency> ---------------------------------------------------------- +--- -### Options +=== Options // component options: START @@ -71,6 +71,6 @@ with the following path and query parameters: // endpoint options: END -### Sample +=== Sample You can try https://github.com/oalles/camel-cm-sample[this project] to see how camel-cm-sms can be integrated in a camel route. diff --git a/parent/pom.xml b/parent/pom.xml index 7826924..4ce5b55 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -356,6 +356,8 @@ <javassist-version>3.20.0-GA</javassist-version> <javax.el-api-version>2.2.5</javax.el-api-version> <javax.el-version>2.2.5</javax.el-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> <javax-inject-bundle-version>1_2</javax-inject-bundle-version> <javax-mail-version>1.6.1</javax-mail-version> <javax.servlet-api-version>3.1.0</javax.servlet-api-version> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index 4211863..4c4f74b 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -21,6 +21,7 @@ <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf-version}/xml/features</repository> <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features</repository> <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-version}/xml/features</repository> + <repository>mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features</repository> <feature name='xml-specs-api' version='${servicemix-specs-version}' resolver='(obr)' start-level='10'> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}</bundle> @@ -223,12 +224,7 @@ </feature> <feature name='camel-bean-validator' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> - <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle> - <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax.el-api-version}</bundle> - <bundle dependency='true'>mvn:org.glassfish.web/javax.el/${javax.el-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml/classmate/${classmate-version}</bundle> - <bundle dependency='true'>mvn:org.hibernate/hibernate-validator/${hibernate-validator-version}</bundle> - <bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle> + <feature version='${hibernate-validator-version}'>hibernate-validator</feature> <bundle>mvn:org.apache.camel/camel-bean-validator/${project.version}</bundle> </feature> <feature name='camel-beanio' version='${project.version}' resolver='(obr)' start-level='50'> @@ -379,17 +375,11 @@ <feature name='camel-cm-sms' version='${project.version}' resolver='(obr)' start-level='50'> <feature version='${project.version}'>camel-core</feature> <feature version='${cxf-version-range}'>cxf-specs</feature> + <feature version='${hibernate-validator-version}'>hibernate-validator</feature> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.libphonenumber/${libphonenumber-bundle-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle> <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle> <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle> - <bundle dependency='true'>mvn:org.jsoup/jsoup/${jsoup-version}</bundle> - <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle> - <bundle dependency='true'>mvn:javax.el/javax.el-api/${javax.el-api-version}</bundle> - <bundle dependency='true'>mvn:org.glassfish.web/javax.el/${javax.el-version}</bundle> - <bundle dependency='true'>mvn:com.fasterxml/classmate/${classmate-version}</bundle> - <bundle dependency='true'>mvn:org.hibernate/hibernate-validator/${hibernate-validator-version}</bundle> - <bundle dependency='true'>mvn:org.jboss.logging/jboss-logging/${jboss-logging-version}</bundle> <bundle>mvn:org.apache.camel/camel-cm-sms/${project.version}</bundle> </feature> <feature name='camel-cmis' version='${project.version}' resolver='(obr)' start-level='50'> -- To stop receiving notification emails like this one, please contact davscl...@apache.org.