You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/03/19 11:44:38 UTC
[camel] branch boot2ga updated (d7dbe49 -> 791c164)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git.
from d7dbe49 CAMEL-11430: Migrate to Spring Boot 2 - work in progress
new 4647361 Upgrade consul to 1.0.6
new 86eafa9 CAMEL-11430: Migrate to Spring Boot 2 - work in progress
new 791c164 CAMEL-11650 - Use Hibernate Validator 6.x where possible
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-bean-validator/pom.xml | 166 +++++++++++----------
.../bean/validator/BeanValidatorRouteTest.java | 6 +-
components/camel-cm-sms/pom.xml | 8 +-
.../src/main/docs/cm-sms-component.adoc | 20 +--
.../service/src/main/bash/consul-run-linux.sh | 2 +-
.../service/src/main/bash/consul-run-osx.sh | 2 +-
.../camel-example-spring-boot-rest-jpa/pom.xml | 6 +
.../services/src/main/bash/consul-run-osx.sh | 2 +-
.../service/src/main/bash/consul-run-linux.sh | 2 +-
.../service/src/main/bash/consul-run-osx.sh | 2 +-
parent/pom.xml | 6 +-
.../karaf/features/src/main/resources/features.xml | 16 +-
12 files changed, 119 insertions(+), 119 deletions(-)
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 03/03: CAMEL-11650 - Use Hibernate Validator 6.x where
possible
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 791c164b6d2fbb6738c1f6fe822a3553c124a0f3
Author: Claus Ibsen <cl...@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 | 6 ++++--
platforms/karaf/features/src/main/resources/features.xml | 16 +++-------------
6 files changed, 24 insertions(+), 32 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 12ad67f..8b8836c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,8 +297,8 @@
<hazelcast-version>3.9.3</hazelcast-version>
<hbase-version>1.2.6</hbase-version>
<hessian-version>4.0.51</hessian-version>
- <hibernate-validator-version>6.0.8.Final</hibernate-validator-version>
- <hibernate-version>5.2.14.Final</hibernate-version>
+ <hibernate-validator-version>6.0.2.Final</hibernate-validator-version>
+ <hibernate-version>5.0.12.Final</hibernate-version>
<hikaricp-version>2.3.13</hikaricp-version>
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
@@ -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 074c9fe..cf03f3c 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
davsclaus@apache.org.
[camel] 01/03: Upgrade consul to 1.0.6
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 46473610ed0556990e34951bfdc46ded0bb4eb28
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 19 09:46:16 2018 +0100
Upgrade consul to 1.0.6
---
.../service/src/main/bash/consul-run-linux.sh | 2 +-
.../service/src/main/bash/consul-run-osx.sh | 2 +-
.../services/src/main/bash/consul-run-osx.sh | 2 +-
.../service/src/main/bash/consul-run-linux.sh | 2 +-
.../service/src/main/bash/consul-run-osx.sh | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-linux.sh b/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-linux.sh
index 30a5074..f2235c9 100755
--- a/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-linux.sh
+++ b/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-linux.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-CONSUL_VER="1.0.3"
+CONSUL_VER="1.0.6"
CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-osx.sh b/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-osx.sh
index 94eea48..776234b 100755
--- a/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-osx.sh
+++ b/examples/camel-example-spring-boot-health-checks/service/src/main/bash/consul-run-osx.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-CONSUL_VER="1.0.3"
+CONSUL_VER="1.0.6"
CONSUL_ZIP="consul_${CONSUL_VER}_darwin_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh b/examples/camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh
index 75c2c70..57074b8 100755
--- a/examples/camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh
+++ b/examples/camel-example-spring-boot-servicecall/services/src/main/bash/consul-run-osx.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-CONSUL_VER="1.0.3"
+CONSUL_VER="1.0.6"
CONSUL_ZIP="consul_${CONSUL_VER}_darwin_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
index 5c97ea4..2fc864a 100755
--- a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
+++ b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-linux.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-CONSUL_VER="1.0.3"
+CONSUL_VER="1.0.6"
CONSUL_ZIP="consul_${CONSUL_VER}_linux_amd64.zip"
# cleanup
diff --git a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
index 78fa2ab..4d52fb5 100755
--- a/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
+++ b/examples/camel-example-spring-cloud-servicecall/service/src/main/bash/consul-run-osx.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-CONSUL_VER="1.0.3"
+CONSUL_VER="1.0.6"
CONSUL_ZIP="consul_${CONSUL_VER}_darwin_amd64.zip"
# cleanup
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.
[camel] 02/03: CAMEL-11430: Migrate to Spring Boot 2 - work in
progress
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 86eafa9ad833f6c95d13402de323fbf8a12fdc79
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 19 11:11:37 2018 +0100
CAMEL-11430: Migrate to Spring Boot 2 - work in progress
---
components/camel-bean-validator/pom.xml | 166 +++++++++++----------
.../src/main/docs/cm-sms-component.adoc | 6 +-
.../camel-example-spring-boot-rest-jpa/pom.xml | 6 +
parent/pom.xml | 6 +-
4 files changed, 96 insertions(+), 88 deletions(-)
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 828d868..d0c4e57 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -17,94 +17,96 @@
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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components</artifactId>
- <version>2.22.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.22.0-SNAPSHOT</version>
+ </parent>
- <artifactId>camel-bean-validator</artifactId>
- <name>Camel :: Bean validator</name>
- <description>Camel bean validation support (JSR 303)</description>
- <packaging>jar</packaging>
+ <artifactId>camel-bean-validator</artifactId>
+ <name>Camel :: Bean validator</name>
+ <description>Camel bean validation support (JSR 303)</description>
+ <packaging>jar</packaging>
- <properties>
- <camel.osgi.export.pkg>org.apache.camel.component.bean.validator.*</camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=bean-validator</camel.osgi.export.service>
- </properties>
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.component.bean.validator.*</camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=bean-validator
+ </camel.osgi.export.service>
+ </properties>
- <dependencies>
+ <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>${hibernate-validator-version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss.logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <version>${jboss-logging-version}</version>
- </dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${javax.el-api-version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.el</artifactId>
- <version>${javax.el-version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>${hibernate-validator-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss.logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>${jboss-logging-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
+ <version>${javax.el-api-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>${javax.el-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
- <!-- for testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- for testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
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 994918a..6dc2253 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
@@ -62,9 +62,9 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String
-| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | int
-| *productToken* (producer) | *Required* The unique token to use | | String
+| *defaultFrom* (producer) | This is the sender name. The maximum length is 11 characters. | | String)
+| *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)::Int)
+| *productToken* (producer) | *Required* The unique token to use | | String)
| *testConnectionOnStartup* (producer) | Whether to test the connection to the SMS Gateway on startup | false | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
|===
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index e2d98e7..fac0ef8 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -93,6 +93,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-swagger-java-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 224049e..12ad67f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,8 +297,8 @@
<hazelcast-version>3.9.3</hazelcast-version>
<hbase-version>1.2.6</hbase-version>
<hessian-version>4.0.51</hessian-version>
- <hibernate-validator-version>5.4.2.Final</hibernate-validator-version>
- <hibernate-version>5.0.12.Final</hibernate-version>
+ <hibernate-validator-version>6.0.8.Final</hibernate-validator-version>
+ <hibernate-version>5.2.14.Final</hibernate-version>
<hikaricp-version>2.3.13</hikaricp-version>
<hk2-version>2.3.0</hk2-version>
<hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
@@ -691,7 +691,7 @@
<unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
<urlrewritefilter-version>4.0.4</urlrewritefilter-version>
<urlrewritefilter-bundle-version>4.0.4_1</urlrewritefilter-bundle-version>
- <validation-api-version>1.1.0.Final</validation-api-version>
+ <validation-api-version>2.0.1.Final</validation-api-version>
<velocity-bundle-version>1.7_6</velocity-bundle-version>
<velocity-tools-version>2.0</velocity-tools-version>
<velocity-version>2.0</velocity-version>
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.