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 c34268b124d1974eed8f48ec39657f9dde69f8b6
Author: Claus Ibsen <claus.ib...@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 | 4 +-
4 files changed, 95 insertions(+), 87 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 405e97b..7826924 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -297,7 +297,7 @@
<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-validator-version>6.0.8.Final</hibernate-validator-version>
<hibernate-version>5.2.16.Final</hibernate-version>
<hikaricp-version>2.3.13</hikaricp-version>
<hk2-version>2.3.0</hk2-version>
@@ -697,7 +697,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
davscl...@apache.org.
