You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by pg...@apache.org on 2009/04/30 01:14:02 UTC
svn commit: r769988 - in /maven/ant-tasks/trunk: pom.xml
src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Author: pgier
Date: Wed Apr 29 23:14:02 2009
New Revision: 769988
URL: http://svn.apache.org/viewvc?rev=769988&view=rev
Log:
Get the ant tasks building.
Modified:
maven/ant-tasks/trunk/pom.xml
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Modified: maven/ant-tasks/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=769988&r1=769987&r2=769988&view=diff
==============================================================================
--- maven/ant-tasks/trunk/pom.xml (original)
+++ maven/ant-tasks/trunk/pom.xml Wed Apr 29 23:14:02 2009
@@ -44,8 +44,8 @@
</issueManagement>
<properties>
- <mavenVersion>2.1-SNAPSHOT</mavenVersion>
- <artifactVersion>3.0-SNAPSHOT</artifactVersion>
+ <mavenVersion>2.1.0</mavenVersion>
+ <artifactVersion>2.1.0</artifactVersion>
<junitVersion>3.8.1</junitVersion>
<plexusVersion>1.0-alpha-48</plexusVersion>
<plexusUtilsVersion>1.5.4</plexusUtilsVersion>
@@ -87,7 +87,7 @@
<version>1.6.2</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.artifact</groupId>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${artifactVersion}</version>
</dependency>
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=769988&r1=769987&r2=769988&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Wed Apr 29 23:14:02 2009
@@ -281,7 +281,7 @@
settings.setLocalRepository( location );
}
- profileManager = new DefaultProfileManager( getContainer(), null );
+ profileManager = new DefaultProfileManager( getContainer(), getSettings(), System.getProperties() );
WagonManager wagonManager = (WagonManager) lookup( WagonManager.ROLE );
wagonManager.setDownloadMonitor( new AntDownloadMonitor() );
@@ -539,7 +539,7 @@
MavenProject mavenProject;
try
{
- mavenProject = projectBuilder.buildStandaloneSuperProject();
+ mavenProject = projectBuilder.buildStandaloneSuperProject( localArtifactRepository, getProfileManager() );
}
catch ( ProjectBuildingException e )
{
Re: svn commit: r769988 - in /maven/ant-tasks/trunk: pom.xml src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Posted by Jason van Zyl <jv...@sonatype.com>.
On 1-May-09, at 2:05 PM, Paul Gier wrote:
> Ok, I was kind of wondering about that. When I first tried trunk it
> was not building and had some outdated stuff in there, but I
> committed changes in both places to be safe.
>
> I'll stop committing to trunk, and then we can start fresh after
> 2.0.10 like you suggested.
>
Go ahead and nuke them on trunk.
> Hervé BOUTEMY wrote:
>> I don't think merging changes to ant-tasks/trunk is worth the
>> effort now.
>> Trunk was created in r524632, in april 2007, when Maven 2.0.x and
>> Maven 2.1.x started 2 different branches. Changes were done by
>> Jason in ant-tasks/trunk to match Maven 2.1.x structural changes,
>> but AFAIK they stopped when Maven 2.1 was renamed to Maven 3, and
>> maven-artifact replaced with Mercury, maven-ant-tasks being
>> replaced by mercury-ant-tasks.
>> IMHO, ant-tasks/trunk is in a state that can't do anything useful
>> now.
>> Any objection if I delete ant-tasks/trunk?
>> When Maven Ant Tasks 2.0.10 will be released, it will be time to
>> recreate ant-tasks/trunk to match Maven 2.1.0 core.
>> Regards,
>> Hervé
>> Le jeudi 30 avril 2009, pgier@apache.org a écrit :
>>> Author: pgier
>>> Date: Wed Apr 29 23:14:02 2009
>>> New Revision: 769988
>>>
>>> URL: http://svn.apache.org/viewvc?rev=769988&view=rev
>>> Log:
>>> Get the ant tasks building.
>>>
>>> Modified:
>>> maven/ant-tasks/trunk/pom.xml
>>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/
>>> ant/AbstractA
>>> rtifactTask.java
>>>
>>> Modified: maven/ant-tasks/trunk/pom.xml
>>> URL:
>>> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=769988&r1=76
>>> 9987&r2=769988&view=diff
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> ====================================================================
>>> === --- maven/ant-tasks/trunk/pom.xml (original)
>>> +++ maven/ant-tasks/trunk/pom.xml Wed Apr 29 23:14:02 2009
>>> @@ -44,8 +44,8 @@
>>> </issueManagement>
>>>
>>> <properties>
>>> - <mavenVersion>2.1-SNAPSHOT</mavenVersion>
>>> - <artifactVersion>3.0-SNAPSHOT</artifactVersion>
>>> + <mavenVersion>2.1.0</mavenVersion>
>>> + <artifactVersion>2.1.0</artifactVersion>
>>> <junitVersion>3.8.1</junitVersion>
>>> <plexusVersion>1.0-alpha-48</plexusVersion>
>>> <plexusUtilsVersion>1.5.4</plexusUtilsVersion>
>>> @@ -87,7 +87,7 @@
>>> <version>1.6.2</version>
>>> </dependency>
>>> <dependency>
>>> - <groupId>org.apache.maven.artifact</groupId>
>>> + <groupId>org.apache.maven</groupId>
>>> <artifactId>maven-artifact</artifactId>
>>> <version>${artifactVersion}</version>
>>> </dependency>
>>>
>>> Modified:
>>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>>> AbstractA
>>> rtifactTask.java URL:
>>> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache
>>> /maven/artifact/ant/AbstractArtifactTask.java?
>>> rev=769988&r1=769987&r2=769988
>>> &view=diff
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> ====================================================================
>>> === ---
>>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>>> AbstractA
>>> rtifactTask.java (original) +++
>>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>>> AbstractA
>>> rtifactTask.java Wed Apr 29 23:14:02 2009 @@ -281,7 +281,7 @@
>>> settings.setLocalRepository( location );
>>> }
>>>
>>> - profileManager = new
>>> DefaultProfileManager( getContainer(), null
>>> ); + profileManager = new
>>> DefaultProfileManager( getContainer(),
>>> getSettings(), System.getProperties() );
>>>
>>> WagonManager wagonManager = (WagonManager) lookup(
>>> WagonManager.ROLE ); wagonManager.setDownloadMonitor( new
>>> AntDownloadMonitor() ); @@ -539,7 +539,7 @@
>>> MavenProject mavenProject;
>>> try
>>> {
>>> - mavenProject =
>>> projectBuilder.buildStandaloneSuperProject();
>>> + mavenProject =
>>> projectBuilder.buildStandaloneSuperProject(
>>> localArtifactRepository, getProfileManager() ); }
>>> catch ( ProjectBuildingException e )
>>> {
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
http://twitter.com/jvanzyl
http://twitter.com/SonatypeNexus
http://twitter.com/SonatypeM2E
----------------------------------------------------------
Selfish deeds are the shortest path to self destruction.
-- The Seven Samuari, Akira Kurosawa
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r769988 - in /maven/ant-tasks/trunk: pom.xml src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Posted by Paul Gier <pg...@redhat.com>.
Ok, I was kind of wondering about that. When I first tried trunk it was not
building and had some outdated stuff in there, but I committed changes in both
places to be safe.
I'll stop committing to trunk, and then we can start fresh after 2.0.10 like you
suggested.
Hervé BOUTEMY wrote:
> I don't think merging changes to ant-tasks/trunk is worth the effort now.
>
> Trunk was created in r524632, in april 2007, when Maven 2.0.x and Maven 2.1.x
> started 2 different branches. Changes were done by Jason in ant-tasks/trunk
> to match Maven 2.1.x structural changes, but AFAIK they stopped when Maven
> 2.1 was renamed to Maven 3, and maven-artifact replaced with Mercury,
> maven-ant-tasks being replaced by mercury-ant-tasks.
>
> IMHO, ant-tasks/trunk is in a state that can't do anything useful now.
>
> Any objection if I delete ant-tasks/trunk?
>
> When Maven Ant Tasks 2.0.10 will be released, it will be time to recreate
> ant-tasks/trunk to match Maven 2.1.0 core.
>
> Regards,
>
> Hervé
>
> Le jeudi 30 avril 2009, pgier@apache.org a écrit :
>> Author: pgier
>> Date: Wed Apr 29 23:14:02 2009
>> New Revision: 769988
>>
>> URL: http://svn.apache.org/viewvc?rev=769988&view=rev
>> Log:
>> Get the ant tasks building.
>>
>> Modified:
>> maven/ant-tasks/trunk/pom.xml
>>
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>> rtifactTask.java
>>
>> Modified: maven/ant-tasks/trunk/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=769988&r1=76
>> 9987&r2=769988&view=diff
>> ===========================================================================
>> === --- maven/ant-tasks/trunk/pom.xml (original)
>> +++ maven/ant-tasks/trunk/pom.xml Wed Apr 29 23:14:02 2009
>> @@ -44,8 +44,8 @@
>> </issueManagement>
>>
>> <properties>
>> - <mavenVersion>2.1-SNAPSHOT</mavenVersion>
>> - <artifactVersion>3.0-SNAPSHOT</artifactVersion>
>> + <mavenVersion>2.1.0</mavenVersion>
>> + <artifactVersion>2.1.0</artifactVersion>
>> <junitVersion>3.8.1</junitVersion>
>> <plexusVersion>1.0-alpha-48</plexusVersion>
>> <plexusUtilsVersion>1.5.4</plexusUtilsVersion>
>> @@ -87,7 +87,7 @@
>> <version>1.6.2</version>
>> </dependency>
>> <dependency>
>> - <groupId>org.apache.maven.artifact</groupId>
>> + <groupId>org.apache.maven</groupId>
>> <artifactId>maven-artifact</artifactId>
>> <version>${artifactVersion}</version>
>> </dependency>
>>
>> Modified:
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>> rtifactTask.java URL:
>> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache
>> /maven/artifact/ant/AbstractArtifactTask.java?rev=769988&r1=769987&r2=769988
>> &view=diff
>> ===========================================================================
>> === ---
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>> rtifactTask.java (original) +++
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>> rtifactTask.java Wed Apr 29 23:14:02 2009 @@ -281,7 +281,7 @@
>> settings.setLocalRepository( location );
>> }
>>
>> - profileManager = new DefaultProfileManager( getContainer(), null
>> ); + profileManager = new DefaultProfileManager( getContainer(),
>> getSettings(), System.getProperties() );
>>
>> WagonManager wagonManager = (WagonManager) lookup(
>> WagonManager.ROLE ); wagonManager.setDownloadMonitor( new
>> AntDownloadMonitor() ); @@ -539,7 +539,7 @@
>> MavenProject mavenProject;
>> try
>> {
>> - mavenProject = projectBuilder.buildStandaloneSuperProject();
>> + mavenProject = projectBuilder.buildStandaloneSuperProject(
>> localArtifactRepository, getProfileManager() ); }
>> catch ( ProjectBuildingException e )
>> {
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r769988 - in /maven/ant-tasks/trunk: pom.xml src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Posted by Jason van Zyl <jv...@sonatype.com>.
On 1-May-09, at 1:56 PM, Hervé BOUTEMY wrote:
> I don't think merging changes to ant-tasks/trunk is worth the effort
> now.
>
> Trunk was created in r524632, in april 2007, when Maven 2.0.x and
> Maven 2.1.x
> started 2 different branches. Changes were done by Jason in ant-
> tasks/trunk
> to match Maven 2.1.x structural changes, but AFAIK they stopped when
> Maven
> 2.1 was renamed to Maven 3, and maven-artifact replaced with Mercury,
> maven-ant-tasks being replaced by mercury-ant-tasks.
>
> IMHO, ant-tasks/trunk is in a state that can't do anything useful now.
>
> Any objection if I delete ant-tasks/trunk?
>
Go for it, too much hassle and will ultimately be replaced with the
Mercury tasks.
> When Maven Ant Tasks 2.0.10 will be released, it will be time to
> recreate
> ant-tasks/trunk to match Maven 2.1.0 core.
>
> Regards,
>
> Hervé
>
> Le jeudi 30 avril 2009, pgier@apache.org a écrit :
>> Author: pgier
>> Date: Wed Apr 29 23:14:02 2009
>> New Revision: 769988
>>
>> URL: http://svn.apache.org/viewvc?rev=769988&view=rev
>> Log:
>> Get the ant tasks building.
>>
>> Modified:
>> maven/ant-tasks/trunk/pom.xml
>>
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>> AbstractA
>> rtifactTask.java
>>
>> Modified: maven/ant-tasks/trunk/pom.xml
>> URL:
>> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=769988&r1=76
>> 9987&r2=769988&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> === --- maven/ant-tasks/trunk/pom.xml (original)
>> +++ maven/ant-tasks/trunk/pom.xml Wed Apr 29 23:14:02 2009
>> @@ -44,8 +44,8 @@
>> </issueManagement>
>>
>> <properties>
>> - <mavenVersion>2.1-SNAPSHOT</mavenVersion>
>> - <artifactVersion>3.0-SNAPSHOT</artifactVersion>
>> + <mavenVersion>2.1.0</mavenVersion>
>> + <artifactVersion>2.1.0</artifactVersion>
>> <junitVersion>3.8.1</junitVersion>
>> <plexusVersion>1.0-alpha-48</plexusVersion>
>> <plexusUtilsVersion>1.5.4</plexusUtilsVersion>
>> @@ -87,7 +87,7 @@
>> <version>1.6.2</version>
>> </dependency>
>> <dependency>
>> - <groupId>org.apache.maven.artifact</groupId>
>> + <groupId>org.apache.maven</groupId>
>> <artifactId>maven-artifact</artifactId>
>> <version>${artifactVersion}</version>
>> </dependency>
>>
>> Modified:
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>> AbstractA
>> rtifactTask.java URL:
>> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache
>> /maven/artifact/ant/AbstractArtifactTask.java?
>> rev=769988&r1=769987&r2=769988
>> &view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> === ---
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>> AbstractA
>> rtifactTask.java (original) +++
>> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/
>> AbstractA
>> rtifactTask.java Wed Apr 29 23:14:02 2009 @@ -281,7 +281,7 @@
>> settings.setLocalRepository( location );
>> }
>>
>> - profileManager = new
>> DefaultProfileManager( getContainer(), null
>> ); + profileManager = new
>> DefaultProfileManager( getContainer(),
>> getSettings(), System.getProperties() );
>>
>> WagonManager wagonManager = (WagonManager) lookup(
>> WagonManager.ROLE ); wagonManager.setDownloadMonitor( new
>> AntDownloadMonitor() ); @@ -539,7 +539,7 @@
>> MavenProject mavenProject;
>> try
>> {
>> - mavenProject =
>> projectBuilder.buildStandaloneSuperProject();
>> + mavenProject =
>> projectBuilder.buildStandaloneSuperProject(
>> localArtifactRepository, getProfileManager() ); }
>> catch ( ProjectBuildingException e )
>> {
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
Thanks,
Jason
----------------------------------------------------------
Jason van Zyl
Founder, Apache Maven
http://twitter.com/jvanzyl
http://twitter.com/SonatypeNexus
http://twitter.com/SonatypeM2E
----------------------------------------------------------
People develop abstractions by generalizing from concrete examples.
Every attempt to determine the correct abstraction on paper without
actually developing a running system is doomed to failure. No one
is that smart. A framework is a resuable design, so you develop it by
looking at the things it is supposed to be a design of. The more
examples
you look at, the more general your framework will be.
-- Ralph Johnson & Don Roberts, Patterns for Evolving Frameworks
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r769988 - in /maven/ant-tasks/trunk: pom.xml src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
Posted by Hervé BOUTEMY <he...@free.fr>.
I don't think merging changes to ant-tasks/trunk is worth the effort now.
Trunk was created in r524632, in april 2007, when Maven 2.0.x and Maven 2.1.x
started 2 different branches. Changes were done by Jason in ant-tasks/trunk
to match Maven 2.1.x structural changes, but AFAIK they stopped when Maven
2.1 was renamed to Maven 3, and maven-artifact replaced with Mercury,
maven-ant-tasks being replaced by mercury-ant-tasks.
IMHO, ant-tasks/trunk is in a state that can't do anything useful now.
Any objection if I delete ant-tasks/trunk?
When Maven Ant Tasks 2.0.10 will be released, it will be time to recreate
ant-tasks/trunk to match Maven 2.1.0 core.
Regards,
Hervé
Le jeudi 30 avril 2009, pgier@apache.org a écrit :
> Author: pgier
> Date: Wed Apr 29 23:14:02 2009
> New Revision: 769988
>
> URL: http://svn.apache.org/viewvc?rev=769988&view=rev
> Log:
> Get the ant tasks building.
>
> Modified:
> maven/ant-tasks/trunk/pom.xml
>
> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>rtifactTask.java
>
> Modified: maven/ant-tasks/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/pom.xml?rev=769988&r1=76
>9987&r2=769988&view=diff
> ===========================================================================
>=== --- maven/ant-tasks/trunk/pom.xml (original)
> +++ maven/ant-tasks/trunk/pom.xml Wed Apr 29 23:14:02 2009
> @@ -44,8 +44,8 @@
> </issueManagement>
>
> <properties>
> - <mavenVersion>2.1-SNAPSHOT</mavenVersion>
> - <artifactVersion>3.0-SNAPSHOT</artifactVersion>
> + <mavenVersion>2.1.0</mavenVersion>
> + <artifactVersion>2.1.0</artifactVersion>
> <junitVersion>3.8.1</junitVersion>
> <plexusVersion>1.0-alpha-48</plexusVersion>
> <plexusUtilsVersion>1.5.4</plexusUtilsVersion>
> @@ -87,7 +87,7 @@
> <version>1.6.2</version>
> </dependency>
> <dependency>
> - <groupId>org.apache.maven.artifact</groupId>
> + <groupId>org.apache.maven</groupId>
> <artifactId>maven-artifact</artifactId>
> <version>${artifactVersion}</version>
> </dependency>
>
> Modified:
> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>rtifactTask.java URL:
> http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache
>/maven/artifact/ant/AbstractArtifactTask.java?rev=769988&r1=769987&r2=769988
>&view=diff
> ===========================================================================
>=== ---
> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>rtifactTask.java (original) +++
> maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractA
>rtifactTask.java Wed Apr 29 23:14:02 2009 @@ -281,7 +281,7 @@
> settings.setLocalRepository( location );
> }
>
> - profileManager = new DefaultProfileManager( getContainer(), null
> ); + profileManager = new DefaultProfileManager( getContainer(),
> getSettings(), System.getProperties() );
>
> WagonManager wagonManager = (WagonManager) lookup(
> WagonManager.ROLE ); wagonManager.setDownloadMonitor( new
> AntDownloadMonitor() ); @@ -539,7 +539,7 @@
> MavenProject mavenProject;
> try
> {
> - mavenProject = projectBuilder.buildStandaloneSuperProject();
> + mavenProject = projectBuilder.buildStandaloneSuperProject(
> localArtifactRepository, getProfileManager() ); }
> catch ( ProjectBuildingException e )
> {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org