Updated Branches: refs/heads/master 1e513ecf0 -> 600483f60
CAMEL-6486: Upgrade camel-bean-validator to JSR349 (Bean Validation 1.1) Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/600483f6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/600483f6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/600483f6 Branch: refs/heads/master Commit: 600483f60968617258f500f2332f7a172b13c186 Parents: 1e513ec Author: cmueller <cmuel...@apache.org> Authored: Wed Jul 10 22:37:42 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Wed Jul 10 22:37:48 2013 +0200 ---------------------------------------------------------------------- components/camel-bean-validator/pom.xml | 10 ++++++++++ .../bean/validator/BeanValidatorConfigurationTest.java | 7 ++++++- parent/pom.xml | 6 +++++- platforms/karaf/features/src/main/resources/features.xml | 6 ++++-- 4 files changed, 25 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/600483f6/components/camel-bean-validator/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml index 233bee6..a7d2c57 100644 --- a/components/camel-bean-validator/pom.xml +++ b/components/camel-bean-validator/pom.xml @@ -56,6 +56,16 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/600483f6/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java index 8a8be01..ce97c33 100644 --- a/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java +++ b/components/camel-bean-validator/src/test/java/org/apache/camel/component/bean/validator/BeanValidatorConfigurationTest.java @@ -29,8 +29,8 @@ import javax.validation.TraversableResolver; import org.apache.camel.impl.JndiRegistry; import org.apache.camel.impl.ProcessorEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; -import org.hibernate.validator.internal.engine.ConstraintValidatorFactoryImpl; import org.hibernate.validator.internal.engine.ValidatorImpl; +import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorFactoryImpl; import org.hibernate.validator.internal.engine.resolver.DefaultTraversableResolver; import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator; import org.junit.Test; @@ -118,5 +118,10 @@ public class BeanValidatorConfigurationTest extends CamelTestSupport { public <T extends ConstraintValidator<?, ?>> T getInstance(Class<T> key) { return null; } + + @Override + public void releaseInstance(ConstraintValidator<?, ?> arg0) { + // noop + } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/600483f6/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f8671b2..0b30651 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -70,6 +70,7 @@ <castor-bundle-version>1.3.2_2</castor-bundle-version> <cglib-bundle-version>2.1_3_7</cglib-bundle-version> <cglib-version>2.2</cglib-version> + <classmate-version>0.8.0</classmate-version> <cmis-version>0.8.0</cmis-version> <cometd-bayeux-version>6.1.11</cometd-bayeux-version> <cometd-java-client-version>2.4.3</cometd-java-client-version> @@ -170,7 +171,7 @@ <hazelcast-version>2.6</hazelcast-version> <hbase-version>0.94.3</hbase-version> <hbase-bundle-version>0.94.3_1</hbase-bundle-version> - <hibernate-validator-version>4.3.1.Final</hibernate-validator-version> + <hibernate-validator-version>5.0.1.Final</hibernate-validator-version> <hibernate-version>4.2.2.Final</hibernate-version> <httpunit-version>1.7</httpunit-version> <httpcore4-version>4.2.4</httpcore4-version> @@ -193,6 +194,8 @@ <java-apns-version>0.1.6</java-apns-version> <javacrumbs-version>0.22</javacrumbs-version> <javassist-bundle-version>3.12.1.GA_3</javassist-bundle-version> + <javax.el-api-version>2.2.4</javax.el-api-version> + <javax.el-version>2.2.4</javax.el-version> <javax-inject-bundle-version>1_2</javax-inject-bundle-version> <javax-mail-version>1.4.7</javax-mail-version> <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version> @@ -374,6 +377,7 @@ <twitter4j-version>3.0.3</twitter4j-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> <velocity-bundle-version>1.7_6</velocity-bundle-version> <velocity-tools-version>2.0</velocity-tools-version> <velocity-version>1.7</velocity-version> http://git-wip-us.apache.org/repos/asf/camel/blob/600483f6/platforms/karaf/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml index a322690..5031e2e 100644 --- a/platforms/karaf/features/src/main/resources/features.xml +++ b/platforms/karaf/features/src/main/resources/features.xml @@ -131,8 +131,10 @@ </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:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr303-api-1.0.0/${servicemix-specs-version}</bundle> - <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix-specs-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-bean-validator/${project.version}</bundle>
