You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2017/04/13 12:59:58 UTC
camel git commit: CAMEL-10373: removing dependency on
hibernate-validator from starters
Repository: camel
Updated Branches:
refs/heads/master d4f2eb749 -> 45b82e807
CAMEL-10373: removing dependency on hibernate-validator from starters
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/45b82e80
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/45b82e80
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/45b82e80
Branch: refs/heads/master
Commit: 45b82e807d71a7b29c7d50c51c673c9ccf330afa
Parents: d4f2eb7
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Thu Apr 13 14:54:20 2017 +0200
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Thu Apr 13 14:57:56 2017 +0200
----------------------------------------------------------------------
.../components-starter/camel-jetty9-starter/pom.xml | 4 ----
.../components-starter/camel-netty4-http-starter/pom.xml | 4 ----
.../components-starter/camel-netty4-starter/pom.xml | 4 ----
.../components-starter/camel-restlet-starter/pom.xml | 4 ----
.../components-starter/camel-undertow-starter/pom.xml | 4 ----
.../org/apache/camel/itest/springboot/CamelJetty9Test.java | 1 +
.../apache/camel/itest/springboot/CamelNetty4HttpTest.java | 1 +
.../org/apache/camel/itest/springboot/CamelRestletTest.java | 1 +
.../org/apache/camel/itest/springboot/CamelUndertowTest.java | 1 +
.../main/resources/spring-boot-fix-dependencies.properties | 7 +------
10 files changed, 5 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
index bb3b2e0..5b76a52 100644
--- a/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
@@ -57,10 +57,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
<!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
index 38a8a0f..61cced0 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
@@ -54,10 +54,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
<!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
index f3eedcd..b82329c 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
@@ -46,10 +46,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
<!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
index cd21be7..66a6656 100644
--- a/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
@@ -54,10 +54,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
<!--END OF GENERATED CODE-->
</dependencies>
<!--START OF GENERATED CODE-->
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
index f5b9cc4..0f71adc 100644
--- a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
@@ -46,10 +46,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
<!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
index 62fc1c9..8623d89 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJetty9Test.java
@@ -36,6 +36,7 @@ public class CamelJetty9Test extends AbstractSpringBootTestSupport {
return new ITestConfigBuilder()
.module(inferModuleName(CamelJetty9Test.class))
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|JettyHttpContentTypeTest$)")
+ .dependency("org.hibernate:hibernate-validator")
// in JettyHttpContentTypeTest the case of the encoding string is different in Jetty 9.3
.build();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
index 0dcdd57..0d4d87e 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelNetty4HttpTest.java
@@ -37,6 +37,7 @@ public class CamelNetty4HttpTest extends AbstractSpringBootTestSupport {
.module(inferModuleName(CamelNetty4HttpTest.class))
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseNettyTest$|ManagedNettyEndpointTest$|NettyMixedCaseHttpPathTest$|NettyHttpContentTypeTest$)")
+ .dependency("org.hibernate:hibernate-validator")
// removed JMX check tests and tests that nof fail singularly
.build();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
index 36e30c0..0f15ca0 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelRestletTest.java
@@ -38,6 +38,7 @@ public class CamelRestletTest extends AbstractSpringBootTestSupport {
.module(inferModuleName(CamelRestletTest.class))
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|RestletConfigurationTest$)")
.testLibraryVersion("com.google.guava:guava", DependencyResolver.resolveCamelParentProperty("${google-guava-version}"))
+ .dependency("org.hibernate:hibernate-validator")
.build();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
index 90408a4..e2cc7d8 100644
--- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelUndertowTest.java
@@ -37,6 +37,7 @@ public class CamelUndertowTest extends AbstractSpringBootTestSupport {
.module(inferModuleName(CamelUndertowTest.class))
//.dependency(DependencyResolver.withVersion("org.hibernate:hibernate-validator"))
.unitTestExclusionPattern(".*(\\.integration\\..*|IntegrationTest$|BaseUndertowTest$|UndertowHttpsSpringTest$)")
+ .dependency("org.hibernate:hibernate-validator")
.build();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/45b82e80/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
index ce6adbd..ce95925 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
+++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/spring-boot-fix-dependencies.properties
@@ -42,24 +42,20 @@ camel-hl7=org.apache.camel:camel-netty4:${project.version}
# Camel Core requires on APT for the usage of CollectionStringBuffer.
# Remove this dependency if it was a mistake
-camel-jetty9=org.hibernate:hibernate-validator,org.apache.camel:apt:${project.version}
+camel-jetty9=org.apache.camel:apt:${project.version}
camel-jbpm=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-jcr=org.apache.lucene:lucene-core:${lucene3-version}
camel-jira=com.atlassian.jira:jira-rest-java-client
camel-jms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-jpa=org.apache.geronimo.specs:geronimo-jpa_2.0_spec
camel-kubernetes=org.hibernate:hibernate-validator
-camel-netty4=org.hibernate:hibernate-validator
-camel-netty4-http=org.hibernate:hibernate-validator
camel-scala=org.scala-lang:scala-library:${scala-version},org.scala-lang.modules:scala-xml_2.11:${scalaxml-version}
camel-sjms=org.apache.geronimo.specs:geronimo-jms_1.1_spec
camel-sjms2=org.apache.geronimo.specs:geronimo-jms_2.0_spec
-camel-spark-rest=org.hibernate:hibernate-validator
camel-spring-boot=org.apache.camel:camel-core-starter
camel-spring-ws=org.springframework.boot:spring-boot-starter-web:${spring-boot-version}
-camel-restlet=org.hibernate:hibernate-validator
# Force the spring-boot version of jetty
camel-salesforce=org.eclipse.jetty:jetty-client,org.eclipse.jetty:jetty-util,org.eclipse.jetty:jetty-util-ajax,org.eclipse.jetty:jetty-io
@@ -67,7 +63,6 @@ camel-salesforce=org.eclipse.jetty:jetty-client,org.eclipse.jetty:jetty-util,org
camel-servletlistener=javax.servlet:javax.servlet-api
camel-swagger-java=org.hibernate:hibernate-validator
-camel-undertow=org.hibernate:hibernate-validator
# Needs JPA 2.1