You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2005/08/04 08:30:23 UTC
svn commit: r227310 -
/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Author: evenisse
Date: Wed Aug 3 23:30:13 2005
New Revision: 227310
URL: http://svn.apache.org/viewcvs?rev=227310&view=rev
Log:
Allowed user to defined maven.repo.local if settings.xml file exist
Modified:
maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=227310&r1=227309&r2=227310&view=diff
==============================================================================
--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Wed Aug 3 23:30:13 2005
@@ -153,7 +153,11 @@
{
userModelReader.parse( settingsXml );
- mavenRepoLocal = userModelReader.getLocalRepository();
+ if ( mavenRepoLocal != null )
+ {
+ // user don't override mavenRepoLocal with maven.repo.local system property
+ mavenRepoLocal = userModelReader.getLocalRepository();
+ }
}
if ( mavenRepoLocal == null )
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r227310 - /maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Posted by Emmanuel Venisse <em...@venisse.net>.
fixed. sorry.
Emmanuel
Yann Le Du wrote:
> Oopsie... My <localRepository> in ~/.m2/settings.xml isn't used anymore and
> Maven defaults to ~/.m2/repository (though I didn't define a maven.repo.local)
>
> if ( mavenRepoLocal != null )
> {
> // user don't override mavenRepoLocal with maven.repo.local system property
> mavenRepoLocal = userModelReader.getLocalRepository();
> }
>
> Maybe mavenRepoLocal is already not null ? (equals default ~/.m2/repository ? -
> just a guess)
>
> Regards,
>
> Yann
>
>
>
>
> --- evenisse@apache.org a écrit :
>
>
>>Author: evenisse
>>Date: Wed Aug 3 23:30:13 2005
>>New Revision: 227310
>>
>>URL: http://svn.apache.org/viewcvs?rev=227310&view=rev
>>Log:
>>Allowed user to defined maven.repo.local if settings.xml file exist
>>
>>Modified:
>> maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
>>
>>Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
>>URL:
>>
>
> http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=227310&r1=227309&r2=227310&view=diff
>
> ==============================================================================
>
>>--- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
>>+++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Wed Aug 3
>>23:30:13 2005
>>@@ -153,7 +153,11 @@
>> {
>> userModelReader.parse( settingsXml );
>>
>>- mavenRepoLocal = userModelReader.getLocalRepository();
>>+ if ( mavenRepoLocal != null )
>>+ {
>>+ // user don't override mavenRepoLocal with maven.repo.local
>>system property
>>+ mavenRepoLocal = userModelReader.getLocalRepository();
>>+ }
>> }
>>
>> if ( mavenRepoLocal == null )
>>
>>
>>
>>---------------------------------------------------------------------
>>To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>>For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
>
>
>
>
>
>
>
> ___________________________________________________________________________
> Appel audio GRATUIT partout dans le monde avec le nouveau Yahoo! Messenger
> Téléchargez cette version sur http://fr.messenger.yahoo.com
>
> ---------------------------------------------------------------------
> 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: r227310 - /maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
Posted by Yann Le Du <le...@yahoo.com>.
Oopsie... My <localRepository> in ~/.m2/settings.xml isn't used anymore and
Maven defaults to ~/.m2/repository (though I didn't define a maven.repo.local)
if ( mavenRepoLocal != null )
{
// user don't override mavenRepoLocal with maven.repo.local system property
mavenRepoLocal = userModelReader.getLocalRepository();
}
Maybe mavenRepoLocal is already not null ? (equals default ~/.m2/repository ? -
just a guess)
Regards,
Yann
--- evenisse@apache.org a écrit :
> Author: evenisse
> Date: Wed Aug 3 23:30:13 2005
> New Revision: 227310
>
> URL: http://svn.apache.org/viewcvs?rev=227310&view=rev
> Log:
> Allowed user to defined maven.repo.local if settings.xml file exist
>
> Modified:
> maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
>
> Modified: maven/components/trunk/maven-mboot2/src/main/java/MBoot.java
> URL:
>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-mboot2/src/main/java/MBoot.java?rev=227310&r1=227309&r2=227310&view=diff
>
==============================================================================
> --- maven/components/trunk/maven-mboot2/src/main/java/MBoot.java (original)
> +++ maven/components/trunk/maven-mboot2/src/main/java/MBoot.java Wed Aug 3
> 23:30:13 2005
> @@ -153,7 +153,11 @@
> {
> userModelReader.parse( settingsXml );
>
> - mavenRepoLocal = userModelReader.getLocalRepository();
> + if ( mavenRepoLocal != null )
> + {
> + // user don't override mavenRepoLocal with maven.repo.local
> system property
> + mavenRepoLocal = userModelReader.getLocalRepository();
> + }
> }
>
> if ( mavenRepoLocal == null )
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
___________________________________________________________________________
Appel audio GRATUIT partout dans le monde avec le nouveau Yahoo! Messenger
Téléchargez cette version sur http://fr.messenger.yahoo.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org