You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Brett Porter <br...@apache.org> on 2008/02/24 23:10:57 UTC
Re: svn commit: r630217 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Hi Ralph,
Not questioning this - but can you explain why and perhaps attach it
to a JIRA issue? Also, doesn't this need to be merged to trunk?
- Brett
On 23/02/2008, at 1:22 AM, rgoers@apache.org wrote:
> Author: rgoers
> Date: Fri Feb 22 06:21:59 2008
> New Revision: 630217
>
> URL: http://svn.apache.org/viewvc?rev=630217&view=rev
> Log:
> Include all remote repositories when merging the managed dependencies
>
> Modified:
> maven/components/branches/maven-2.0.x/maven-project/src/main/java/
> org/apache/maven/project/DefaultMavenProjectBuilder.java
>
> Modified: maven/components/branches/maven-2.0.x/maven-project/src/
> main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
> URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=630217&r1=630216&r2=630217&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- maven/components/branches/maven-2.0.x/maven-project/src/main/
> java/org/apache/maven/project/DefaultMavenProjectBuilder.java
> (original)
> +++ maven/components/branches/maven-2.0.x/maven-project/src/main/
> java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri
> Feb 22 06:21:59 2008
> @@ -846,7 +846,7 @@
> // merge any duplicated plugin definitions together, using
> the first appearance as the dominant one.
>
> ModelUtils
> .mergeDuplicatePluginDefinitions( project.getModel().getBuild() );
>
> - mergeManagedDependencies(project.getModel(),
> localRepository, parentSearchRepositories);
> + mergeManagedDependencies(project.getModel(),
> localRepository, repositories);
>
> try
> {
>
>
--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r630217 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Posted by Ralph Goers <Ra...@dslextreme.com>.
I did commit it to trunk. It just took me a while to do it as my
maven-artifact was seriously out of date and I was getting compile
errors in maven-project (and I had to go to work for the day) so it took
me a while to verify it.
If you really think this warrants a Jira issue I can create one. I
didn't think it would need one since the feature hasn't even been
formally released yet. But the bottom line here was that the pom was
only being fetched from the local repository or central, not any of the
configured remote repositories. Interestingly, someone conveniently had
a loop setting up the repositories variable right before the call but
then the variable was never used anywhere that I could see.
Ralph
Brett Porter wrote:
> Hi Ralph,
>
> Not questioning this - but can you explain why and perhaps attach it
> to a JIRA issue? Also, doesn't this need to be merged to trunk?
>
> - Brett
>
> On 23/02/2008, at 1:22 AM, rgoers@apache.org wrote:
>
>> Author: rgoers
>> Date: Fri Feb 22 06:21:59 2008
>> New Revision: 630217
>>
>> URL: http://svn.apache.org/viewvc?rev=630217&view=rev
>> Log:
>> Include all remote repositories when merging the managed dependencies
>>
>> Modified:
>>
>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>>
>>
>> Modified:
>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>>
>> URL:
>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=630217&r1=630216&r2=630217&view=diff
>>
>> ==============================================================================
>>
>> ---
>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>> (original)
>> +++
>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>> Fri Feb 22 06:21:59 2008
>> @@ -846,7 +846,7 @@
>> // merge any duplicated plugin definitions together, using
>> the first appearance as the dominant one.
>> ModelUtils.mergeDuplicatePluginDefinitions(
>> project.getModel().getBuild() );
>>
>> - mergeManagedDependencies(project.getModel(),
>> localRepository, parentSearchRepositories);
>> + mergeManagedDependencies(project.getModel(),
>> localRepository, repositories);
>>
>> try
>> {
>>
>>
>
> --
> Brett Porter
> brett@apache.org
> http://blogs.exist.com/bporter/
>
>
> ---------------------------------------------------------------------
> 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: r630217 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Posted by Brett Porter <br...@apache.org>.
On 25/02/2008, at 2:04 PM, Ralph Goers wrote:
> Maybe that's because I didn't merge? Would merging from 2.0.x to
> trunk work correctly? I guess it wouldn't have hurt to try.
Nah, it's just a convention we've used in the paste
On 25/02/2008, at 2:00 PM, Ralph Goers wrote:
> If you really think this warrants a Jira issue I can create one. I
> didn't think it would need one since the feature hasn't even been
> formally released yet. But the bottom line here was that the pom
> was only being fetched from the local repository or central, not any
> of the configured remote repositories. Interestingly, someone
> conveniently had a loop setting up the repositories variable right
> before the call but then the variable was never used anywhere that I
> could see.
Ok, I didn't realise this was related to the earlier change you'd made.
Cheers,
Brett
--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r630217 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Posted by Ralph Goers <Ra...@dslextreme.com>.
Maybe that's because I didn't merge? Would merging from 2.0.x to trunk
work correctly? I guess it wouldn't have hurt to try.
Brett Porter wrote:
> sorry, I see the trunk commit now - just didn't have the normal
> "merged from" notation. Same question applies for the reasoning :)
>
> On 25/02/2008, at 9:10 AM, Brett Porter wrote:
>
>> Hi Ralph,
>>
>> Not questioning this - but can you explain why and perhaps attach it
>> to a JIRA issue? Also, doesn't this need to be merged to trunk?
>>
>> - Brett
>>
>> On 23/02/2008, at 1:22 AM, rgoers@apache.org wrote:
>>
>>> Author: rgoers
>>> Date: Fri Feb 22 06:21:59 2008
>>> New Revision: 630217
>>>
>>> URL: http://svn.apache.org/viewvc?rev=630217&view=rev
>>> Log:
>>> Include all remote repositories when merging the managed dependencies
>>>
>>> Modified:
>>>
>>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>>>
>>>
>>> Modified:
>>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>>>
>>> URL:
>>> http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=630217&r1=630216&r2=630217&view=diff
>>>
>>> ==============================================================================
>>>
>>> ---
>>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>>> (original)
>>> +++
>>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>>> Fri Feb 22 06:21:59 2008
>>> @@ -846,7 +846,7 @@
>>> // merge any duplicated plugin definitions together, using
>>> the first appearance as the dominant one.
>>> ModelUtils.mergeDuplicatePluginDefinitions(
>>> project.getModel().getBuild() );
>>>
>>> - mergeManagedDependencies(project.getModel(),
>>> localRepository, parentSearchRepositories);
>>> + mergeManagedDependencies(project.getModel(),
>>> localRepository, repositories);
>>>
>>> try
>>> {
>>>
>>>
>>
>> --
>> Brett Porter
>> brett@apache.org
>> http://blogs.exist.com/bporter/
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>
> --
> Brett Porter
> brett@apache.org
> http://blogs.exist.com/bporter/
>
>
> ---------------------------------------------------------------------
> 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: r630217 - /maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Posted by Brett Porter <br...@apache.org>.
sorry, I see the trunk commit now - just didn't have the normal
"merged from" notation. Same question applies for the reasoning :)
On 25/02/2008, at 9:10 AM, Brett Porter wrote:
> Hi Ralph,
>
> Not questioning this - but can you explain why and perhaps attach it
> to a JIRA issue? Also, doesn't this need to be merged to trunk?
>
> - Brett
>
> On 23/02/2008, at 1:22 AM, rgoers@apache.org wrote:
>
>> Author: rgoers
>> Date: Fri Feb 22 06:21:59 2008
>> New Revision: 630217
>>
>> URL: http://svn.apache.org/viewvc?rev=630217&view=rev
>> Log:
>> Include all remote repositories when merging the managed dependencies
>>
>> Modified:
>> maven/components/branches/maven-2.0.x/maven-project/src/main/java/
>> org/apache/maven/project/DefaultMavenProjectBuilder.java
>>
>> Modified: maven/components/branches/maven-2.0.x/maven-project/src/
>> main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>> URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=630217&r1=630216&r2=630217&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- maven/components/branches/maven-2.0.x/maven-project/src/main/
>> java/org/apache/maven/project/DefaultMavenProjectBuilder.java
>> (original)
>> +++ maven/components/branches/maven-2.0.x/maven-project/src/main/
>> java/org/apache/maven/project/DefaultMavenProjectBuilder.java Fri
>> Feb 22 06:21:59 2008
>> @@ -846,7 +846,7 @@
>> // merge any duplicated plugin definitions together, using
>> the first appearance as the dominant one.
>>
>> ModelUtils
>> .mergeDuplicatePluginDefinitions( project.getModel().getBuild() );
>>
>> - mergeManagedDependencies(project.getModel(),
>> localRepository, parentSearchRepositories);
>> + mergeManagedDependencies(project.getModel(),
>> localRepository, repositories);
>>
>> try
>> {
>>
>>
>
> --
> Brett Porter
> brett@apache.org
> http://blogs.exist.com/bporter/
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
--
Brett Porter
brett@apache.org
http://blogs.exist.com/bporter/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org