Re: cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2004-12-05 Thread Jason van Zyl 
On Sat, 2004-12-04 at 15:03, Brett Porter wrote:
> Actually, it will, because it starts with a number :)
> 
> I'm not particularly happy with the property syntax for JAR overrides 
> and its dual meaning, but something that can be rectified later.

I think it would be perfectly fine to only allow the specification of a
property that indicated a version. All artifacts then must be present in
a repository and not in some random place in the filesystem. That hack
was added for whacky jakarta commons usage and I would be more than
happy to see it go away.

> - Brett
> 
> Jason van Zyl wrote:
> 
> >On Fri, 2004-12-03 at 23:07, [EMAIL PROTECTED] wrote:
> >  
> >
> >>brett   2004/12/03 23:07:08
> >>
> >>  Modified:src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
> >>ArtifactListBuilder.java
> >>  Log:
> >>  has to match exactly, as a path can contain SNAPSHOT
> >>
> >>
> >
> >Then determine whether the property is for a path or version because
> >what you've changed won't allow 1.1-SNAPSHOT as a version which is what
> >we've decided we're going to allow.
> >
> >  
> >
> 
> 
> 
> -
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]

-- 
jvz.

Jason van Zyl
[EMAIL PROTECTED]
http://maven.apache.org

happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...

 -- Thoreau 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2004-12-04 Thread Brett Porter 
Actually, it will, because it starts with a number :)
I'm not particularly happy with the property syntax for JAR overrides 
and its dual meaning, but something that can be rectified later.

- Brett
Jason van Zyl wrote:
On Fri, 2004-12-03 at 23:07, [EMAIL PROTECTED] wrote:
 

brett   2004/12/03 23:07:08
 Modified:src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
   ArtifactListBuilder.java
 Log:
 has to match exactly, as a path can contain SNAPSHOT
   

Then determine whether the property is for a path or version because
what you've changed won't allow 1.1-SNAPSHOT as a version which is what
we've decided we're going to allow.
 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2004-12-04 Thread Jason van Zyl 
On Fri, 2004-12-03 at 23:07, [EMAIL PROTECTED] wrote:
> brett   2004/12/03 23:07:08
> 
>   Modified:src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
> ArtifactListBuilder.java
>   Log:
>   has to match exactly, as a path can contain SNAPSHOT

Then determine whether the property is for a path or version because
what you've changed won't allow 1.1-SNAPSHOT as a version which is what
we've decided we're going to allow.

-- 
jvz.

Jason van Zyl
[EMAIL PROTECTED]
http://maven.apache.org

happiness is like a butterfly: the more you chase it, the more it will
elude you, but if you turn your attention to other things, it will come
and sit softly on your shoulder ...

 -- Thoreau 


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2004-12-03 Thread brett 
brett   2004/12/03 23:07:08

  Modified:src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
ArtifactListBuilder.java
  Log:
  has to match exactly, as a path can contain SNAPSHOT
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.14.4.5  +2 -2  maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.14.4.4
  retrieving revision 1.14.4.5
  diff -u -r1.14.4.4 -r1.14.4.5
  --- ArtifactListBuilder.java  4 Dec 2004 06:59:05 -   1.14.4.4
  +++ ArtifactListBuilder.java  4 Dec 2004 07:07:07 -   1.14.4.5
  @@ -61,7 +61,7 @@
   // The jar override option has been set and we have a 
property
   // for the this dependency so override the path with the user
   // specified value.
  -if ( Character.isDigit( mavenJarProperty.charAt( 0 ) ) || 
mavenJarProperty.indexOf( "SNAPSHOT" ) >= 0 )
  +if ( Character.isDigit( mavenJarProperty.charAt( 0 ) ) || 
"SNAPSHOT".equals( mavenJarProperty ) )
   {
   // User is requesting a specific version of a dependency
   // be used.
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2004-12-03 Thread brett 
brett   2004/12/03 22:59:05

  Modified:src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
ArtifactListBuilder.java
  Log:
  PR: MAVEN-1511

  allow SNAPSHOT as a JAR override
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.14.4.4  +5 -7  maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.14.4.3
  retrieving revision 1.14.4.4
  diff -u -r1.14.4.3 -r1.14.4.4
  --- ArtifactListBuilder.java  24 Sep 2004 10:38:43 -  1.14.4.3
  +++ ArtifactListBuilder.java  4 Dec 2004 06:59:05 -   1.14.4.4
  @@ -29,9 +29,7 @@
   import java.util.List;
   
   /**
  - *
* @author mailto:[EMAIL PROTECTED]">Jason van Zyl
  - *
* @version $Id$
*/
   public class ArtifactListBuilder
  @@ -47,23 +45,23 @@
* @param project MavenSession project.
* @return the list of artifacts for a project
*/
  -public static List build( final Project project  )
  +public static List build( final Project project )
   {
   List projectArtifacts = new ArrayList();
   boolean mavenJarOverride = 
project.getContext().getMavenJarOverride().booleanValue();
   
  -for ( Iterator i = project.getDependencies().iterator(); 
i.hasNext();)
  +for ( Iterator i = project.getDependencies().iterator(); 
i.hasNext(); )
   {
   Dependency d = (Dependency) i.next();
   String mavenJarProperty = 
project.getContext().getMavenJarOverride( Project.standardToLegacyId( d.getId() 
) );
   Artifact artifact = DefaultArtifactFactory.createArtifact( d );
   
  -if ( mavenJarOverride && 
StringUtils.isNotEmpty(mavenJarProperty) )
  +if ( mavenJarOverride && StringUtils.isNotEmpty( 
mavenJarProperty ) )
   {
   // The jar override option has been set and we have a 
property
   // for the this dependency so override the path with the user
   // specified value.
  -if ( Character.isDigit( mavenJarProperty.charAt( 0 ) ) )
  +if ( Character.isDigit( mavenJarProperty.charAt( 0 ) ) || 
mavenJarProperty.indexOf( "SNAPSHOT" ) >= 0 )
   {
   // User is requesting a specific version of a dependency
   // be used.
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2004-01-07 Thread dion 
dion2004/01/07 08:23:25

  Modified:src/java/org/apache/maven Tag: MAVEN-1_0-BRANCH
ArtifactListBuilder.java
  Log:
  Code cleanup
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.14.4.1  +2 -2  maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.14
  retrieving revision 1.14.4.1
  diff -u -r1.14 -r1.14.4.1
  --- ArtifactListBuilder.java  19 Aug 2003 04:31:38 -  1.14
  +++ ArtifactListBuilder.java  7 Jan 2004 16:23:25 -   1.14.4.1
  @@ -91,7 +91,7 @@
   List projectArtifacts = new ArrayList();
   boolean mavenJarOverride = 
project.getContext().getMavenJarOverride().booleanValue();
   
  -for ( Iterator i = project.getDependencies().iterator(); i.hasNext(); )
  +for ( Iterator i = project.getDependencies().iterator(); i.hasNext();)
   {
   Dependency d = (Dependency) i.next();
   String mavenJarProperty = project.getContext().getMavenJarOverride( 
Project.standardToLegacyId( d.getId() ) );
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2003-07-28 Thread dion 
dion2003/07/28 17:09:08

  Modified:src/java/org/apache/maven ArtifactListBuilder.java
  Log:
  Rollback to plexus string utils
  
  Revision  ChangesPath
  1.12  +2 -2  maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ArtifactListBuilder.java  28 Jul 2003 04:41:16 -  1.11
  +++ ArtifactListBuilder.java  29 Jul 2003 00:09:08 -  1.12
  @@ -56,7 +56,7 @@
* 
*/
   
  -import org.apache.commons.lang.StringUtils;
  +import org.apache.plexus.util.StringUtils;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.repository.Artifact;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2003-07-27 Thread dion 
dion2003/07/27 21:41:16

  Modified:src/java/org/apache/maven ArtifactListBuilder.java
  Log:
  Add back use of StringUtils
  
  Revision  ChangesPath
  1.11  +5 -5  maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ArtifactListBuilder.java  27 Jul 2003 23:33:56 -  1.10
  +++ ArtifactListBuilder.java  28 Jul 2003 04:41:16 -  1.11
  @@ -56,6 +56,7 @@
* 
*/
   
  +import org.apache.commons.lang.StringUtils;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.repository.Artifact;
  @@ -83,8 +84,9 @@
* taking into account any user specified overrides.
*
* @param project MavenSession project.
  + * @return the list of artifacts for a project
*/
  -public static List build( Project project )
  +public static List build( final Project project  )
   {
   List projectArtifacts = new ArrayList();
   boolean mavenJarOverride = project.getMavenJarOverride();
  @@ -95,9 +97,7 @@
   String mavenJarProperty = project.getMavenJarOverride( 
Project.standardToLegacyId( d.getId() ) );
   Artifact artifact = DefaultArtifactFactory.createArtifact( d );
   
  -if (mavenJarOverride
  - && mavenJarProperty != null
  - && mavenJarProperty.length() > 0 )
  +if ( mavenJarOverride && StringUtils.isNotEmpty(mavenJarProperty) )
   {
   // The jar override option has been set and we have a property
   // for the this dependency so override the path with the user
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: maven/src/java/org/apache/maven ArtifactListBuilder.java

2003-07-16 Thread dion 
dion2003/07/16 18:02:28

  Modified:src/java/org/apache/maven ArtifactListBuilder.java
  Log:
  Docs and a little code clean
  
  Revision  ChangesPath
  1.9   +5 -5  maven/src/java/org/apache/maven/ArtifactListBuilder.java
  
  Index: ArtifactListBuilder.java
  ===
  RCS file: /home/cvs/maven/src/java/org/apache/maven/ArtifactListBuilder.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ArtifactListBuilder.java  11 Apr 2003 23:45:33 -  1.8
  +++ ArtifactListBuilder.java  17 Jul 2003 01:02:28 -  1.9
  @@ -56,6 +56,7 @@
* 
*/
   
  +import org.apache.commons.lang.StringUtils;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.repository.Artifact;
  @@ -83,8 +84,9 @@
* taking into account any user specified overrides.
*
* @param project MavenSession project.
  + * @return the list of artifacts for a project
*/
  -public static List build( Project project  )
  +public static List build( final Project project  )
   {
   List projectArtifacts = new ArrayList();
   boolean mavenJarOverride = 
project.getContext().getMavenJarOverride().booleanValue();
  @@ -95,9 +97,7 @@
   String mavenJarProperty = project.getContext().getMavenJarOverride( 
Project.standardToLegacyId( d.getId() ) );
   Artifact artifact = DefaultArtifactFactory.createArtifact( d );
   
  -if (mavenJarOverride
  - && mavenJarProperty != null
  - && mavenJarProperty.length() > 0 )
  +if ( mavenJarOverride && StringUtils.isNotEmpty(mavenJarProperty) )
   {
   // The jar override option has been set and we have a property
   // for the this dependency so override the path with the user
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]