Repository: camel Updated Branches: refs/heads/master 9b7852b40 -> fe96676d1
Update the setup.eclipse target to work with Maven 3.2.x Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe96676d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe96676d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe96676d Branch: refs/heads/master Commit: fe96676d1748ed539dc38ee2bf243bf78ffdfdb3 Parents: 9b7852b Author: Daniel Kulp <dk...@apache.org> Authored: Fri Aug 15 12:36:31 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Fri Aug 15 12:36:48 2014 -0400 ---------------------------------------------------------------------- parent/pom.xml | 7 +++++++ pom.xml | 28 ++++++++++------------------ 2 files changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fe96676d/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1d906ef..e6bd2b4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2836,6 +2836,13 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <inherited>true</inherited> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-buildtools</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <executions> <execution> <id>setup.eclipse.project</id> http://git-wip-us.apache.org/repos/asf/camel/blob/fe96676d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 78fe4fd..fdfa981 100755 --- a/pom.xml +++ b/pom.xml @@ -141,13 +141,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> <version>2.9</version> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-buildtools</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <configuration> <downloadSources>true</downloadSources> <downloadJavadocs>false</downloadJavadocs> @@ -287,13 +280,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-buildtools</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> <executions> <execution> <id>setup.workspace</id> @@ -304,10 +290,16 @@ <property name="full.eclipse.workspace" refid="ecp.ws.path" /> <path path="${basedir}/etc" id="etc.path" /> - <whichresource resource="/camel-eclipse-pmd" property="pmd.url" /> - <whichresource resource="/camel-pmd-ruleset.xml" property="pmdruleset.url" /> - <whichresource resource="/camel-eclipse-checkstyle" property="eclipse.checkstyle.url" /> - <whichresource resource="/camel-checkstyle.xml" property="checkstyle.url" /> + <path id="buildtools.classpath"> + <fileset dir="${basedir}/buildingtools/target" includes="*.jar"/> + <pathelement location="${basedir}/buildingtools/target/classes"/> + <pathelement location="${basedir}/buildingtools/src/main/resources"/> + </path> + + <whichresource resource="/camel-eclipse-pmd" property="pmd.url" classpathref="buildtools.classpath" /> + <whichresource resource="/camel-pmd-ruleset.xml" property="pmdruleset.url" classpathref="buildtools.classpath" /> + <whichresource resource="/camel-eclipse-checkstyle" property="eclipse.checkstyle.url" classpathref="buildtools.classpath" /> + <whichresource resource="/camel-checkstyle.xml" property="checkstyle.url" classpathref="buildtools.classpath" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core" />
