camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bvah...@apache.org
Subject svn commit: r1334397 - in /camel/branches/camel-2.9.x: ./ apache-camel/pom.xml components/camel-msv/pom.xml
Date Sat, 05 May 2012 11:01:31 GMT
Author: bvahdat
Date: Sat May  5 11:01:31 2012
New Revision: 1334397

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

........
  r1300914 | bvahdat | 2012-03-15 12:15:06 +0100 (Do, 15 Mär 2012) | 1 line
  
  Fixed the failed build because of camel-msv dependencies while using Maven 3.0.4.
........

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

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1300914

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

Modified: camel/branches/camel-2.9.x/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/apache-camel/pom.xml?rev=1334397&r1=1334396&r2=1334397&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/apache-camel/pom.xml (original)
+++ camel/branches/camel-2.9.x/apache-camel/pom.xml Sat May  5 11:01:31 2012
@@ -301,13 +301,6 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-msv</artifactId>
-      <!--Avoid the WARNING message -->
-      <exclusions>
-         <exclusion>
-           <groupId>org.iso_relax.verifier.jaxp.validation</groupId>
-           <artifactId>isorelax-jaxp-bridge</artifactId> 
-         </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>

Modified: camel/branches/camel-2.9.x/components/camel-msv/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-msv/pom.xml?rev=1334397&r1=1334396&r2=1334397&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-msv/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-msv/pom.xml Sat May  5 11:01:31 2012
@@ -35,6 +35,27 @@
     <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>



Mime
View raw message