Author: dkulp Date: Mon Oct 3 18:28:22 2011 New Revision: 1178496 URL: http://svn.apache.org/viewvc?rev=1178496&view=rev Log: Merged revisions 1178137 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r1178137 | davsclaus | 2011-10-02 03:24:39 -0400 (Sun, 02 Oct 2011) | 1 line CAMEL-4507: Fixed warn about ant tasks/target in build system ........ Modified: camel/branches/camel-2.8.x/ (props changed) camel/branches/camel-2.8.x/components/camel-blueprint/pom.xml camel/branches/camel-2.8.x/components/camel-jpa/pom.xml camel/branches/camel-2.8.x/components/camel-spring/pom.xml camel/branches/camel-2.8.x/components/camel-web/pom.xml camel/branches/camel-2.8.x/etc/pom.xml camel/branches/camel-2.8.x/parent/pom.xml camel/branches/camel-2.8.x/pom.xml Propchange: camel/branches/camel-2.8.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.8.x/components/camel-blueprint/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-blueprint/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-blueprint/pom.xml (original) +++ camel/branches/camel-2.8.x/components/camel-blueprint/pom.xml Mon Oct 3 18:28:22 2011 @@ -121,13 +121,13 @@ <id>package</id> <phase>package</phase> <configuration> - <tasks> + <target> <echo>Including source code from camel-core-xml in the camel-blueprint-sources.jar</echo> <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" update="true"> <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*" /> <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*" /> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -236,7 +236,7 @@ <id>process-sources</id> <phase>process-sources</phase> <configuration> - <tasks> + <target> <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" /> <echo>Copying to code together for the XSD generation</echo> @@ -269,7 +269,7 @@ </schemagen> <replace file="${project.build.directory}/schema/camel-blueprint.xsd" token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/blueprint" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: camel/branches/camel-2.8.x/components/camel-jpa/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jpa/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-jpa/pom.xml (original) +++ camel/branches/camel-2.8.x/components/camel-jpa/pom.xml Mon Oct 3 18:28:22 2011 @@ -114,7 +114,7 @@ <execution> <phase>process-test-classes</phase> <configuration> - <tasks> + <target> <path id="cp"> <path refid="maven.test.classpath" /> <path refid="maven.compile.classpath" /> @@ -138,7 +138,7 @@ <copy overwrite="true" todir="${basedir}/target/test-classes"> <fileset dir="${basedir}/target/jpa-test-classes" /> </copy> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: camel/branches/camel-2.8.x/components/camel-spring/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-spring/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-spring/pom.xml (original) +++ camel/branches/camel-2.8.x/components/camel-spring/pom.xml Mon Oct 3 18:28:22 2011 @@ -248,13 +248,13 @@ <id>package</id> <phase>package</phase> <configuration> - <tasks> + <target> <echo>Including source code from camel-core-xml in the camel-spring-sources.jar</echo> <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-sources.jar" update="true"> <fileset dir="${basedir}/../camel-core-osgi/src/main/java" includes="**/*" /> <fileset dir="${basedir}/../camel-core-xml/src/main/java" includes="**/*" /> </jar> - </tasks> + </target> </configuration> <goals> <goal>run</goal> @@ -264,7 +264,7 @@ <id>process-sources</id> <phase>process-sources</phase> <configuration> - <tasks> + <target> <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" /> <echo>Copying code together for the XSD generation</echo> @@ -302,7 +302,7 @@ <copy file="${project.build.directory}/schema/camel-spring.xsd" tofile="${project.build.directory}/schema/camel-spring-v${camel.schema.version}.xsd" /> <replace file="${project.build.directory}/schema/camel-spring-v${camel.schema.version}.xsd" token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/spring/v${camel.schema.version}" /> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: camel/branches/camel-2.8.x/components/camel-web/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-web/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/components/camel-web/pom.xml (original) +++ camel/branches/camel-2.8.x/components/camel-web/pom.xml Mon Oct 3 18:28:22 2011 @@ -487,7 +487,7 @@ <id>process-sources</id> <phase>process-sources</phase> <configuration> - <tasks> + <target> <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath" /> <echo>Copying to code together for the XSD generation</echo> @@ -509,7 +509,7 @@ <classpath refid="maven.compile.classpath" /> </schemagen> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: camel/branches/camel-2.8.x/etc/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/etc/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/etc/pom.xml (original) +++ camel/branches/camel-2.8.x/etc/pom.xml Mon Oct 3 18:28:22 2011 @@ -66,7 +66,7 @@ <id>setup.workspace</id> <phase>validate</phase> <configuration> - <tasks> + <target> <path id="ecp.ws.path" location="${workspace}" /> <property name="full.eclipse.workspace" refid="ecp.ws.path" /> <path path="${basedir}" id="etc.path"/> @@ -123,7 +123,7 @@ <entry key="outlinesortoption" value="T,SF,F,SI,I,C,SM,M," /> <entry key="org.eclipse.jdt.ui.enable.visibility.order" value="true" /> </propertyfile> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: camel/branches/camel-2.8.x/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/parent/pom.xml (original) +++ camel/branches/camel-2.8.x/parent/pom.xml Mon Oct 3 18:28:22 2011 @@ -1465,7 +1465,7 @@ <id>create-prop</id> <phase>initialize</phase> <configuration> - <tasks> + <target> <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" /> <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp" /> <property name="mv" value="${project.version}" /> @@ -1486,7 +1486,7 @@ camel.osgi.version.clean = ${ov} camel.schema.version = ${os} </echo> - </tasks> + </target> </configuration> <goals> <goal>run</goal> Modified: camel/branches/camel-2.8.x/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/pom.xml?rev=1178496&r1=1178495&r2=1178496&view=diff ============================================================================== --- camel/branches/camel-2.8.x/pom.xml (original) +++ camel/branches/camel-2.8.x/pom.xml Mon Oct 3 18:28:22 2011 @@ -666,7 +666,7 @@ <id>setup.workspace</id> <phase>validate</phase> <configuration> - <tasks> + <target> <path id="ecp.ws.path" location="${eclipse.workspace.dir}" /> <property name="full.eclipse.workspace" refid="ecp.ws.path" /> <path path="${basedir}/etc" id="etc.path" /> @@ -731,7 +731,7 @@ <!-- Add Camel templates for Spring DSL --> <entry key="org.eclipse.wst.sse.ui.custom_templates" value="${eclipse.camel.xml.code.templates}" /> </propertyfile> - </tasks> + </target> </configuration> <goals> <goal>run</goal>