Author: bvahdat Date: Mon May 7 06:34:38 2012 New Revision: 1334883 URL: http://svn.apache.org/viewvc?rev=1334883&view=rev Log: Merged revisions 1334397 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................ r1334397 | bvahdat | 2012-05-05 13:01:31 +0200 (Sa, 05 Mai 2012) | 9 lines 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.8.x/ (props changed) camel/branches/camel-2.8.x/apache-camel/pom.xml camel/branches/camel-2.8.x/components/camel-msv/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1300914 Merged /camel/branches/camel-2.9.x:r1334397 Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/apache-camel/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/apache-camel/pom.xml?rev=1334883&r1=1334882&r2=1334883&view=diff ============================================================================== --- camel/branches/camel-2.8.x/apache-camel/pom.xml (original) +++ camel/branches/camel-2.8.x/apache-camel/pom.xml Mon May 7 06:34:38 2012 @@ -289,13 +289,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.8.x/components/camel-msv/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-msv/pom.xml?rev=1334883&r1=1334882&r2=1334883&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-msv/pom.xml (original) +++ camel/branches/camel-2.8.x/components/camel-msv/pom.xml Mon May 7 06:34:38 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>
