camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject git commit: Upgraded the msv version
Date Fri, 26 Sep 2014 13:36:39 GMT
Repository: camel
Updated Branches:
  refs/heads/master 90981bc4f -> b459854c4


Upgraded the msv version


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

Branch: refs/heads/master
Commit: b459854c43f3e70b68403f8415911629151af813
Parents: 90981bc
Author: Willem Jiang <willem.jiang@gmail.com>
Authored: Fri Sep 26 21:35:26 2014 +0800
Committer: Willem Jiang <willem.jiang@gmail.com>
Committed: Fri Sep 26 21:35:26 2014 +0800

----------------------------------------------------------------------
 components/camel-msv/pom.xml | 27 ++++++++++-----------------
 parent/pom.xml               |  4 +++-
 2 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b459854c/components/camel-msv/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index b332531..b5b327e 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -41,28 +41,21 @@
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.isorelax</artifactId>
-      <version>${isorelax-bundle-version}</version>
-      <exclusions>
-        <!-- exclude the following dependency as it's content is already embedded inside
the SMX bundle anyway! -->
-        <!-- other than that it causes problems with Maven 3.0.4+ as it's not POM model
4.0.0 complaint -->
-        <exclusion>
-          <groupId>org.iso_relax.verifier.jaxp.validation</groupId>
-          <artifactId>isorelax-jaxp-bridge</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.jopendocument</groupId>
+      <artifactId>isorelax-jaxp-bridge-ILM</artifactId>
+      <version>${isorelax-jaxp-bridge-version}</version>
     </dependency>
     <dependency>
-      <groupId>msv</groupId>
-      <artifactId>msv</artifactId>
-      <version>${msv-version}</version>
+      <groupId>com.sun.xml.bind.jaxb</groupId>
+      <artifactId>isorelax</artifactId>
+      <version>${isorelax-version}</version>
     </dependency>
     <dependency>
-      <groupId>com.sun.msv.datatype.xsd</groupId>
-      <artifactId>xsdlib</artifactId>
-      <version>${xsdlib-version}</version>
+      <groupId>net.java.dev.msv</groupId>
+      <artifactId>msv-core</artifactId>
+      <version>${msv-version}</version>
     </dependency>
+    
 
     <!-- test dependencies -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/b459854c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1a84bba..85ade16 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -208,6 +208,8 @@
     <irclib-bundle-version>1.10_5</irclib-bundle-version>
     <irclib-version>1.10</irclib-version>
     <isorelax-bundle-version>20050913_4</isorelax-bundle-version>
+    <isorelax-version>20090621</isorelax-version>
+    <isorelax-jaxp-bridge-version>1.1</isorelax-jaxp-bridge-version>
     <jini-version>2.1</jini-version>
     <jackson-version>1.9.12</jackson-version>
     <jackson2-version>2.4.1</jackson2-version>
@@ -322,7 +324,7 @@
     <mockito-version>1.9.5</mockito-version>
     <mongo-java-driver-version>2.12.0</mongo-java-driver-version>
     <mqtt-client-version>1.10</mqtt-client-version>
-    <msv-version>20050913</msv-version>
+    <msv-version>2013.6.1</msv-version>
     <mustache-java-version>0.8.16</mustache-java-version>
     <mustache-bundle-version>0.8.15_1/</mustache-bundle-version>
     <mvel-version>2.2.1.Final</mvel-version>


Mime
View raw message