Author: davsclaus
Date: Sun Oct 2 07:24:39 2011
New Revision: 1178137
URL: http://svn.apache.org/viewvc?rev=1178137&view=rev
Log:
CAMEL-4507: Fixed warn about ant tasks/target in build system
Modified:
camel/trunk/components/camel-blueprint/pom.xml
camel/trunk/components/camel-jpa/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-web/pom.xml
camel/trunk/etc/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/pom.xml
camel/trunk/tests/camel-itest-osgi/pom.xml
Modified: camel/trunk/components/camel-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Sun Oct 2 07:24:39 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/trunk/components/camel-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/pom.xml (original)
+++ camel/trunk/components/camel-jpa/pom.xml Sun Oct 2 07:24:39 2011
@@ -122,7 +122,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<path id="cp">
<path refid="maven.test.classpath" />
<path refid="maven.compile.classpath" />
@@ -154,7 +154,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/trunk/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Sun Oct 2 07:24:39 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/trunk/components/camel-web/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Sun Oct 2 07:24:39 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/trunk/etc/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/etc/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/etc/pom.xml (original)
+++ camel/trunk/etc/pom.xml Sun Oct 2 07:24:39 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/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Oct 2 07:24:39 2011
@@ -1485,7 +1485,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}" />
@@ -1506,7 +1506,7 @@
camel.osgi.version.clean = ${ov}
camel.schema.version = ${os}
</echo>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Sun Oct 2 07:24:39 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>
Modified: camel/trunk/tests/camel-itest-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/pom.xml?rev=1178137&r1=1178136&r2=1178137&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/pom.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/pom.xml Sun Oct 2 07:24:39 2011
@@ -393,7 +393,7 @@
<execution>
<phase>process-test-classes</phase>
<configuration>
- <tasks>
+ <target>
<path id="cp">
<path refid="maven.test.classpath"/>
<path refid="maven.compile.classpath"/>
@@ -424,7 +424,7 @@
<copy overwrite="true"
todir="${basedir}/target/test-classes">
<fileset
dir="${basedir}/target/jpa-test-classes"/>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
