Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missed build-mercury.xml when upgrading Modello to 1.0 in r745260 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@745971 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Herve Boutemy 2009-02-19 19:02:40 +00:00
parent 73c0f41e3b
commit 45b99d20cf
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
build-mercury.xml
View File

@ -19,18 +19,18 @@ under the License.
<!-- START SNIPPET: ant-bootstrap <!-- START SNIPPET: ant-bootstrap
By default the bootstrap will use ~/.m2/repository as the integration repository but you can define the integration By default the bootstrap will use ~/.m2/repository as the integration repository but you can define the integration
repository by specifying a property on the command line: repository by specifying a property on the command line:
ant -Dmaven.repo.local=/my/integration/repository ant -Dmaven.repo.local=/my/integration/repository
Those familiar with Maven will note this is the same way the local repository can be set from the command-line. Those familiar with Maven will note this is the same way the local repository can be set from the command-line.
This facilitates having a set of builds converge on the same repository for integration purposes. This facilitates having a set of builds converge on the same repository for integration purposes.
END SNIPPET: ant-bootstrap --> END SNIPPET: ant-bootstrap -->
<project default="all" basedir="." xmlns:mercury="urn:mercury-ant-tasks"> <project default="all" basedir="." xmlns:mercury="urn:mercury-ant-tasks">
<property name="it.workdir.version" value="3.0.x"/> <property name="it.workdir.version" value="3.0.x"/>
<target name="initTaskDefs"> <target name="initTaskDefs">
@ -57,7 +57,7 @@ END SNIPPET: ant-bootstrap -->
</target> </target>
<target name="init" depends="isMavenHomeSet"> <target name="init" depends="isMavenHomeSet">
<xmlproperty prefix="pom" file="pom.xml"/> <xmlproperty prefix="pom" file="pom.xml"/>
<basename file="${maven.home}" property="maven.home.basename"/> <basename file="${maven.home}" property="maven.home.basename"/>
<dirname file="${maven.home}" property="maven.home.dirname"/> <dirname file="${maven.home}" property="maven.home.dirname"/>
<!-- Initialize properties --> <!-- Initialize properties -->
@ -69,8 +69,8 @@ END SNIPPET: ant-bootstrap -->
<property name="maven.repo.central" value="http://repository.sonatype.org/content/groups/public"/> <property name="maven.repo.central" value="http://repository.sonatype.org/content/groups/public"/>
<mercury:remote-repository location="${maven.repo.central}"/> <mercury:remote-repository location="${maven.repo.central}"/>
--> -->
<property name="surefire.useFile" value="true"/> <property name="surefire.useFile" value="true"/>
<echo>maven.home = ${maven.home}</echo> <echo>maven.home = ${maven.home}</echo>
</target> </target>
@ -78,29 +78,29 @@ END SNIPPET: ant-bootstrap -->
<delete dir="bootstrap"/> <delete dir="bootstrap"/>
</target> </target>
<target name="pull" depends="init" unless="skip.pull"> <target name="pull" depends="init" unless="skip.pull">
<property name="verbose" value="false"/> <property name="verbose" value="false"/>
<!-- Pull the dependencies that Maven needs to build --> <!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml"/> <copy file="pom.xml" tofile="dependencies.xml"/>
<replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/> <replace file="${basedir}/dependencies.xml" token="&lt;!--start--&gt;" value="&lt;!--"/>
<replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/> <replace file="${basedir}/dependencies.xml" token="&lt;!--end--&gt;" value="--&gt;"/>
<delete file="${basedir}/dependencies.xml"/> <delete file="${basedir}/dependencies.xml"/>
<mercury:local-repository location="${maven.repo.local}"/> <mercury:local-repository location="${maven.repo.local}"/>
<mercury:resolve-dependencies> <mercury:resolve-dependencies>
<mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/> <mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/>
<mercury:dependency id="org.apache.maven:maven:3.0-SNAPSHOT::pom" source="maven:pom.xml"/> <mercury:dependency id="org.apache.maven:maven:3.0-SNAPSHOT::pom" source="maven:pom.xml"/>
<mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/> <mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/>
</mercury:resolve-dependencies> </mercury:resolve-dependencies>
<!-- those are for debugging and example (named paths) only. Remove as needed --> <!-- those are for debugging and example (named paths) only. Remove as needed -->
<!-- <!--
<mercury:resolve-dependencies pathid="plexus.classpath"> <mercury:resolve-dependencies pathid="plexus.classpath">
<mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/> <mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/>
</mercury:resolve-dependencies> </mercury:resolve-dependencies>
<mercury:resolve-dependencies pathid="modello.classpath"> <mercury:resolve-dependencies pathid="modello.classpath">
<mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/> <mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/>
</mercury:resolve-dependencies> </mercury:resolve-dependencies>
@ -119,12 +119,12 @@ END SNIPPET: ant-bootstrap -->
<property name="cp.modello" refid="modello.classpath"/> <property name="cp.modello" refid="modello.classpath"/>
<echo>cp.modello=${cp.modello}</echo> <echo>cp.modello=${cp.modello}</echo>
<echo>========================================================================</echo> <echo>========================================================================</echo>
--> -->
<!-- Pull the dependencies for Modello <!-- Pull the dependencies for Modello
<mercury:dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}"/> <mercury:dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}"/>
</mercury:resolve-dependencies> </mercury:resolve-dependencies>
--> -->
<!-- Pull the dependencies for the MetadataGenerator CLI <!-- Pull the dependencies for the MetadataGenerator CLI
<mercury:resolve-dependencies id="pmdg"> <mercury:resolve-dependencies id="pmdg">
<mercury:dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}"/> <mercury:dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}"/>
@ -135,14 +135,14 @@ END SNIPPET: ant-bootstrap -->
<target name="process-classes" depends="pull" description="generates plexus component metadata."> <target name="process-classes" depends="pull" description="generates plexus component metadata.">
<mkdir dir="${basedir}/bootstrap/target"/> <mkdir dir="${basedir}/bootstrap/target"/>
<mkdir dir="${basedir}/bootstrap/target/classes"/> <mkdir dir="${basedir}/bootstrap/target/classes"/>
<path id="maven.classpath"> <path id="maven.classpath">
<pathelement location="bootstrap/target/classes"/> <pathelement location="bootstrap/target/classes"/>
<path refid="sources"/> <path refid="sources"/>
<path refid="mercury.classpath"/> <path refid="mercury.classpath"/>
</path> </path>
<echo>Using plexus version ${pom.properties.plexusVersion}</echo> <echo>Using plexus version ${pom.properties.plexusVersion}</echo>
<java fork="fork" classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" failonerror="true"> <java fork="fork" classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli" failonerror="true">
<classpath refid="maven.classpath"/> <classpath refid="maven.classpath"/>
<!-- We need to generate component descriptors from the maven-artifact sources which use javadoc annotations. --> <!-- We need to generate component descriptors from the maven-artifact sources which use javadoc annotations. -->
@ -158,8 +158,8 @@ END SNIPPET: ant-bootstrap -->
<arg value="--output"/> <arg value="--output"/>
<arg value="${basedir}/bootstrap/target/classes/META-INF/plexus/components.xml"/> <arg value="${basedir}/bootstrap/target/classes/META-INF/plexus/components.xml"/>
</java> </java>
</target> </target>
<target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files"> <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
<mkdir dir="bootstrap/target"/> <mkdir dir="bootstrap/target"/>
<mkdir dir="bootstrap/target/generated-sources"/> <mkdir dir="bootstrap/target/generated-sources"/>
@ -170,11 +170,13 @@ END SNIPPET: ant-bootstrap -->
<attribute name="version"/> <attribute name="version"/>
<sequential> <sequential>
<java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true" classpathref="mercury.classpath"> <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true" classpathref="mercury.classpath">
<arg file="@{file}"/> <arg file="@{file}"/> <!-- model file -->
<arg value="@{mode}"/> <arg value="@{mode}"/> <!-- output type -->
<arg file="bootstrap/target/generated-sources"/> <arg file="bootstrap/target/generated-sources"/> <!-- output directory -->
<arg value="@{version}"/> <arg value="@{version}"/> <!-- model version -->
<arg value="false"/> <arg value="false"/> <!-- package with version -->
<arg value="true"/> <!-- use Java 5 -->
<arg value="UTF-8"/> <!-- encoding -->
</java> </java>
</sequential> </sequential>
</macrodef> </macrodef>
@ -224,7 +226,7 @@ END SNIPPET: ant-bootstrap -->
<target name="maven-compile" depends="compile-boot,process-classes" description="compiles Maven using the bootstrap Maven, skipping automated tests"> <target name="maven-compile" depends="compile-boot,process-classes" description="compiles Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true"> <java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true">
<classpath refid="maven.classpath"/> <classpath refid="maven.classpath"/>
<arg value="-e"/> <arg value="-e"/>
<arg value="-B"/> <arg value="-B"/>
<arg value="clean"/> <arg value="clean"/>
<arg value="install"/> <arg value="install"/>
@ -233,9 +235,9 @@ END SNIPPET: ant-bootstrap -->
</java> </java>
</target> </target>
<target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven"> <target name="maven-assembly" depends="maven-compile" description="generates the Maven installation assembly using the bootstrap Maven">
<echo> <echo>
The new Maven distribution was created as part of the MAVEN-COMPILE step, above. The new Maven distribution was created as part of the MAVEN-COMPILE step, above.
This goal just validates the presence of that distribution. This goal just validates the presence of that distribution.
</echo> </echo>
<condition property="build.failed"> <condition property="build.failed">
@ -258,7 +260,7 @@ END SNIPPET: ant-bootstrap -->
</fileset> </fileset>
</chmod> </chmod>
</target> </target>
<target name="all" depends="clean-bootstrap,init,extract-assembly"/> <target name="all" depends="clean-bootstrap,init,extract-assembly"/>
</project> </project>