You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/02/18 20:52:58 UTC
svn commit: r745629 - in /maven/components/trunk: build-mercury.xml
mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar pom.xml
Author: ogusakov
Date: Wed Feb 18 19:52:54 2009
New Revision: 745629
URL: http://svn.apache.org/viewvc?rev=745629&view=rev
Log:
[MNG-3969] intermediate commit - all dependencies are processed correctly, including modello. Problem was stale cached metadata. Also upreved to the released mercury
Modified:
maven/components/trunk/build-mercury.xml
maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
maven/components/trunk/pom.xml
Modified: maven/components/trunk/build-mercury.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/build-mercury.xml?rev=745629&r1=745628&r2=745629&view=diff
==============================================================================
--- maven/components/trunk/build-mercury.xml (original)
+++ maven/components/trunk/build-mercury.xml Wed Feb 18 19:52:54 2009
@@ -34,7 +34,7 @@
<property name="it.workdir.version" value="3.0.x"/>
<target name="initTaskDefs">
- <xmlproperty file="pom.xml" prefix="pom.xml" />
+ <xmlproperty file="pom.xml" prefix="pom" keepRoot="false"/>
<path id="mercury-ant-tasks.classpath" path="mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar"/>
<typedef resource="org/apache/maven/mercury/ant/tasks/antlib.xml" uri="urn:mercury-ant-tasks" classpathref="mercury-ant-tasks.classpath"/>
</target>
@@ -63,7 +63,13 @@
<!-- Initialize properties -->
<property name="maven.home.basename.expected" value="apache-maven-${pom.project.version}"/>
<property name="maven.assembly" location="maven-distribution/target/${maven.home.basename.expected}-bin.zip"/>
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+<!--
+ <property name="maven.repo.central" value="http://repository.sonatype.org/content/groups/public"/>
+ <mercury:remote-repository location="${maven.repo.central}"/>
+-->
+
<property name="surefire.useFile" value="true"/>
<echo>maven.home = ${maven.home}</echo>
</target>
@@ -81,16 +87,39 @@
<delete file="${basedir}/dependencies.xml"/>
- <mercury:local-repository location="${maven.repo.local}"/>
+ <mercury:local-repository location="${maven.repo.local}"/>
<mercury:resolve-dependencies>
- <mercury:dependency id="org.apache.maven:maven:3.0-SNAPSHOT::pom" source="maven:${basedir}/pom.xml"/>
+ <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.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 -->
+<!--
+ <mercury:resolve-dependencies pathid="plexus.classpath">
<mercury:dependency id="org.codehaus.plexus:plexus-component-metadata:${pom.properties.plexusVersion}"/>
</mercury:resolve-dependencies>
-
+
+ <mercury:resolve-dependencies pathid="modello.classpath">
+ <mercury:dependency id="org.codehaus.modello:modello-maven-plugin:${pom.properties.modelloVersion}"/>
+ </mercury:resolve-dependencies>
+-->
+ <echo>========================================================================</echo>
+ <property name="mcc" refid="mercury.classpath.compile"/>
+ <echo>mercury.classpath.compile=${mcc}</echo>
+ <echo>========================================================================</echo>
+ <property name="mct" refid="mercury.classpath.test"/>
+ <echo>mercury.classpath.test=${mct}</echo>
+ <echo>========================================================================</echo>
+<!--
+ <property name="cp.plexus" refid="plexus.classpath"/>
+ <echo>cp.plexus=${cp.plexus}</echo>
+ <echo>========================================================================</echo>
+ <property name="cp.modello" refid="modello.classpath"/>
+ <echo>cp.modello=${cp.modello}</echo>
+ <echo>========================================================================</echo>
+-->
<!-- Pull the dependencies for Modello
<mercury:dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="${pom.properties.modelloVersion}"/>
</mercury:resolve-dependencies>
Modified: maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/maven/components/trunk/mercury-ant-tasks-1.0-alpha-6-SNAPSHOT.jar?rev=745629&r1=745628&r2=745629&view=diff
==============================================================================
Binary files - no diff available.
Modified: maven/components/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=745629&r1=745628&r2=745629&view=diff
==============================================================================
--- maven/components/trunk/pom.xml (original)
+++ maven/components/trunk/pom.xml Wed Feb 18 19:52:54 2009
@@ -55,9 +55,9 @@
<plexusUtilsVersion>1.5.8</plexusUtilsVersion>
<wagonVersion>1.0-beta-4</wagonVersion>
<modelBuilderVersion>1.3</modelBuilderVersion>
- <mercuryVersion>1.0.0-alpha-4</mercuryVersion>
+ <mercuryVersion>1.0-alpha-5</mercuryVersion>
<mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
- <securityDispatcherVersion>1.0-alpha-4-SNAPSHOT</securityDispatcherVersion>
+ <securityDispatcherVersion>1.0</securityDispatcherVersion>
<woodstoxVersion>3.2.6</woodstoxVersion>
<modelloVersion>1.0.1-SNAPSHOT</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>