camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1438677 - in /camel/branches/camel-2.10.x: ./ components/camel-msv/pom.xml
Date Fri, 25 Jan 2013 20:00:17 GMT
Author: bvahdat
Date: Fri Jan 25 20:00:17 2013
New Revision: 1438677

URL: http://svn.apache.org/viewvc?rev=1438677&view=rev
Log:
Merged revisions 1438662 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1438662 | bvahdat | 2013-01-25 20:44:23 +0100 (Fr, 25 Jan 2013) | 1 line
  
  camel-msv now builds without any extra action required using Maven 3.0.4+.
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-msv/pom.xml

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1438662

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-msv/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-msv/pom.xml?rev=1438677&r1=1438676&r2=1438677&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-msv/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-msv/pom.xml Fri Jan 25 20:00:17 2013
@@ -35,41 +35,23 @@
     <camel.osgi.export.pkg>org.apache.camel.component.validator.msv.*</camel.osgi.export.pkg>
   </properties>
 
-  <!--
-    The POM of org.iso_relax.verifier.jaxp.validation:isorelax-jaxp-bridge:jar:1.0
-    on the central repo is not 4.0.0 complaint so that we should pick the one SMX
-    Repo already provides, as otherwise building under Maven 3.0.4 would fail!
-    So delete any old .m2 cache entries of yours for this artifact beforehand if
-    you make use of Maven 3.0.4+
-  -->
-  <repositories>
-    <repository>
-      <id>apache.smx.repo</id>
-      <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
-      <name>Apache ServiceMix Repo</name>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.iso_relax.verifier.jaxp.validation</groupId>
-      <artifactId>isorelax-jaxp-bridge</artifactId>
-      <version>1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>msv</groupId>
-      <artifactId>isorelax</artifactId>
-      <version>20050913</version>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.isorelax</artifactId>
+      <version>20050913_4</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>
     </dependency>
     <dependency>
       <groupId>msv</groupId>
@@ -81,19 +63,9 @@
       <artifactId>xsdlib</artifactId>
       <version>20060615</version>
     </dependency>
-    <dependency>
-      <groupId>relaxngDatatype</groupId>
-      <artifactId>relaxngDatatype</artifactId>
-      <version>20020414</version>
-    </dependency>
 
     <!-- for testing -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-test-spring</artifactId>
       <scope>test</scope>
@@ -104,4 +76,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file



Mime
View raw message