camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject git commit: CAMEL-6344: camel-bean-validator. Upgrade to latest release and use the JAR as is for OSGi as its bundle now.
Date Wed, 08 May 2013 06:03:07 GMT
Updated Branches:
  refs/heads/master 1d8ebe220 -> ed17edf40


CAMEL-6344: camel-bean-validator. Upgrade to latest release and use the JAR as is for OSGi
as its bundle now.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed17edf4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed17edf4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed17edf4

Branch: refs/heads/master
Commit: ed17edf409304f818a54d759be7c09aaba310616
Parents: 1d8ebe2
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed May 8 08:02:57 2013 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed May 8 08:02:57 2013 +0200

----------------------------------------------------------------------
 components/camel-bean-validator/pom.xml            |   27 ++++++---------
 .../validator/BeanValidatorConfigurationTest.java  |    6 ++--
 .../src/test/resources/META-INF/validation.xml     |    2 -
 parent/pom.xml                                     |    5 ++-
 .../karaf/features/src/main/resources/features.xml |    3 +-
 .../src/test/resources/META-INF/validation.xml     |    2 -
 6 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ed17edf4/components/camel-bean-validator/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index ccafe18..233bee6 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -29,26 +29,10 @@
     <packaging>bundle</packaging>
 
     <properties>
-        <hibernate-validator-version>4.1.0.Final</hibernate-validator-version>
         <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>
 
-    <repositories>
-        <!-- for Hibernate Validator -->
-        <repository>
-            <id>jboss</id>
-            <name>JBoss Maven Repository</name>
-            <url>http://repository.jboss.org/nexus/content/groups/public/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
     <dependencies>
 
         <dependency>
@@ -59,6 +43,17 @@
             <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>org.slf4j</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/ed17edf4/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 3545949..8a8be01 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,9 +29,9 @@ 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.engine.ConstraintValidatorFactoryImpl;
-import org.hibernate.validator.engine.ValidatorImpl;
-import org.hibernate.validator.engine.resolver.DefaultTraversableResolver;
+import org.hibernate.validator.internal.engine.ConstraintValidatorFactoryImpl;
+import org.hibernate.validator.internal.engine.ValidatorImpl;
+import org.hibernate.validator.internal.engine.resolver.DefaultTraversableResolver;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/camel/blob/ed17edf4/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
----------------------------------------------------------------------
diff --git a/components/camel-bean-validator/src/test/resources/META-INF/validation.xml b/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
index 9ae52ce..585b76f 100644
--- a/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
+++ b/components/camel-bean-validator/src/test/resources/META-INF/validation.xml
@@ -20,8 +20,6 @@
 
     <default-provider>org.hibernate.validator.HibernateValidator</default-provider>
     <message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
-    <traversable-resolver>org.hibernate.validator.engine.resolver.DefaultTraversableResolver</traversable-resolver>
-    <constraint-validator-factory>org.hibernate.validator.engine.ConstraintValidatorFactoryImpl</constraint-validator-factory>
     <constraint-mapping>/constraints-car.xml</constraint-mapping>
 
 </validation-config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/ed17edf4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a43544a..8ab66f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -168,8 +168,8 @@
     <hazelcast-version>2.5</hazelcast-version>
     <hbase-version>0.94.3</hbase-version>
     <hbase-bundle-version>0.94.3_1</hbase-bundle-version>
-    <hibernate-validator-bundle-version>4.1.0.Final_3</hibernate-validator-bundle-version>
-    <hibernate-version>4.1.11.Final</hibernate-version>
+    <hibernate-validator-version>4.3.1.Final</hibernate-validator-version>
+    <hibernate-version>4.2.1.Final</hibernate-version>
     <httpunit-version>1.7</httpunit-version>
     <httpcore4-version>4.2.4</httpcore4-version>
     <httpclient4-version>4.2.5</httpclient4-version>
@@ -196,6 +196,7 @@
     <jaxb-bundle-version>2.2.1.1_2</jaxb-bundle-version>
     <jaxen-version>1.1.4</jaxen-version>
     <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
+    <jboss-logging-version>3.1.3.GA</jboss-logging-version>
     <jclouds-version>1.5.7</jclouds-version>
     <!-- jclouds must use this guava version -->
     <jclouds-google-guava-version>13.0.1</jclouds-google-guava-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/ed17edf4/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 a714580..c824d40 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -133,7 +133,8 @@
     <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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.hibernate-validator/${hibernate-validator-bundle-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>
   </feature>
   <feature name='camel-beanio' version='${project.version}' resolver='(obr)' start-level='50'>

http://git-wip-us.apache.org/repos/asf/camel/blob/ed17edf4/tests/camel-itest-osgi/src/test/resources/META-INF/validation.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/resources/META-INF/validation.xml b/tests/camel-itest-osgi/src/test/resources/META-INF/validation.xml
index 9ae52ce..585b76f 100644
--- a/tests/camel-itest-osgi/src/test/resources/META-INF/validation.xml
+++ b/tests/camel-itest-osgi/src/test/resources/META-INF/validation.xml
@@ -20,8 +20,6 @@
 
     <default-provider>org.hibernate.validator.HibernateValidator</default-provider>
     <message-interpolator>org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator</message-interpolator>
-    <traversable-resolver>org.hibernate.validator.engine.resolver.DefaultTraversableResolver</traversable-resolver>
-    <constraint-validator-factory>org.hibernate.validator.engine.ConstraintValidatorFactoryImpl</constraint-validator-factory>
     <constraint-mapping>/constraints-car.xml</constraint-mapping>
 
 </validation-config>
\ No newline at end of file


Mime
View raw message