You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/03/02 19:36:52 UTC
svn commit: r632809 - in /maven/ant-tasks/branches/maven-ant-tasks-2.0.x:
pom.xml sample.build.xml
src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
src/test/settings-profile-default.xml src/test/settings-profile-file.xml
Author: hboutemy
Date: Sun Mar 2 10:36:51 2008
New Revision: 632809
URL: http://svn.apache.org/viewvc?rev=632809&view=rev
Log:
[MANTTASKS-105] add profiles support (merged from trunk r632808)
Added:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-default.xml (contents, props changed)
- copied, changed from r632808, maven/ant-tasks/trunk/src/test/settings-profile-default.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-file.xml (contents, props changed)
- copied, changed from r632808, maven/ant-tasks/trunk/src/test/settings-profile-file.xml
Modified:
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml?rev=632809&r1=632808&r2=632809&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/pom.xml Sun Mar 2 10:36:51 2008
@@ -202,7 +202,7 @@
</dependencies>
<properties>
- <mavenVersion>2.0.8</mavenVersion>
+ <mavenVersion>2.0.9-SNAPSHOT</mavenVersion>
<wagonVersion>1.0-beta-2</wagonVersion>
</properties>
</project>
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml?rev=632809&r1=632808&r2=632809&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/sample.build.xml Sun Mar 2 10:36:51 2008
@@ -40,7 +40,7 @@
</target>
<target name="test-all-deps" description="All dependencies tests"
- depends="test-pom,test-pom-with-parent,test-no-deps,test-pom-deps,test-deps-two-repos,test-deps,test-legacy-pom,test-deps-mirror,test-deps-order,test-deps-sources,test-deps-sources-empty">
+ depends="test-pom,test-pom-with-parent,test-no-deps,test-pom-deps,test-deps-two-repos,test-deps,test-legacy-pom,test-deps-mirror,test-deps-order,test-deps-sources,test-deps-sources-empty,test-deps-profile">
<echo>test-bad-dep and test-invalid-pom-ref must be run manually, since they are intended to fail</echo>
</target>
@@ -318,6 +318,20 @@
<available file="${basedir}/target/files/empty/javadoc.bin" property="javadoc.bin"/>
<fail if="javadoc.bin">no dependencies javadoc should have been found</fail>
+ </target>
+
+ <target name="test-deps-profile" depends="initTaskDefs">
+ <delete dir="${basedir}/target/tmp"/>
+ <artifact:dependencies settingsFile="./src/test/settings-profile-default.xml">
+ <dependency groupId="it.ant-tasks" artifactId="release" version="2.0.7"/>
+ <localRepository path="${basedir}/target/tmp"/>
+ </artifact:dependencies>
+
+ <delete dir="${basedir}/target/tmp"/>
+ <artifact:dependencies settingsFile="./src/test/settings-profile-file.xml">
+ <dependency groupId="it.ant-tasks" artifactId="release" version="2.0.7"/>
+ <localRepository path="${basedir}/target/tmp"/>
+ </artifact:dependencies>
</target>
<target name="test-deploy-spaces" depends="initTaskDefs,installSshProvider">
Modified: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=632809&r1=632808&r2=632809&view=diff
==============================================================================
--- maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sun Mar 2 10:36:51 2008
@@ -27,6 +27,7 @@
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.profiles.DefaultProfileManager;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
@@ -273,8 +274,7 @@
settings.setLocalRepository( location );
}
- // removed since it breaks dependencies order when injecting profile dependencies
- //profileManager = new DefaultProfileManager( getContainer(), getSettings(), System.getProperties() );
+ profileManager = new DefaultProfileManager( getContainer(), getSettings(), System.getProperties() );
WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
Copied: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-default.xml (from r632808, maven/ant-tasks/trunk/src/test/settings-profile-default.xml)
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-default.xml?p2=maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-default.xml&p1=maven/ant-tasks/trunk/src/test/settings-profile-default.xml&r1=632808&r2=632809&rev=632809&view=diff
==============================================================================
(empty)
Propchange: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-default.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-file.xml (from r632808, maven/ant-tasks/trunk/src/test/settings-profile-file.xml)
URL: http://svn.apache.org/viewvc/maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-file.xml?p2=maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-file.xml&p1=maven/ant-tasks/trunk/src/test/settings-profile-file.xml&r1=632808&r2=632809&rev=632809&view=diff
==============================================================================
(empty)
Propchange: maven/ant-tasks/branches/maven-ant-tasks-2.0.x/src/test/settings-profile-file.xml
------------------------------------------------------------------------------
svn:eol-style = native