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 25c8c8f6c96dfd702ade0d2cb3b7615abaa520b7 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Apr 10 16:46:16 2018 +0200 CAMEL-12430: Fixed Karaf tests to use javax validation v1 api --- parent/pom.xml | 1 + platforms/karaf/features/src/main/resources/features.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2919792..82434b5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -695,6 +695,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-1-api-version>1.1.0.Final</validation-1-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> diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index f5a0aeb..b493067 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -1349,7 +1349,7 @@ </feature> <feature name='camel-kubernetes' 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.validation/validation-api/${validation-1-api-version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr311-api-1.1.1/${servicemix-specs-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle> @@ -2200,7 +2200,7 @@ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson2-version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson2-version}</bundle> <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle> - <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-api-version}</bundle> + <bundle dependency='true'>mvn:javax.validation/validation-api/${validation-1-api-version}</bundle> <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle> <bundle dependency='true'>mvn:com.google.guava/guava/${swagger-java-guava-version}</bundle> <bundle dependency='true'>mvn:io.swagger/swagger-core/${swagger-java-version}</bundle> -- To stop receiving notification emails like this one, please contact davscl...@apache.org.