glennm 2002/07/25 14:32:14
Modified: src/java/org/apache/maven/project BaseObject.java
Project.java
src/plugins-build/reactor project.xml
Log:
Glenn McAllister - 2002/07/25
- BaseObject.getId no longer returns new id numbers every time it is called for
the same object.
- Removed duplicate dependency in the reactor plugin to the maven project. The
duplicate was causing an empty <dependency /> element to be written out
during the Jelly interpolation stage, which created the "blank" dependency
when it was reparsed by betwixt, which we would see as a failure to download
dependency ##-null.jar.
- Project.addDependency will now add only unique dependencies to prevent this
problem from occuring again.
Revision Changes Path
1.10 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/project/BaseObject.java
Index: BaseObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/BaseObject.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- BaseObject.java 22 Jul 2002 22:33:28 -0000 1.9
+++ BaseObject.java 25 Jul 2002 21:32:14 -0000 1.10
@@ -129,7 +129,7 @@
{
if (id == null)
{
- return Integer.toString(uniqueId++);
+ id = Integer.toString(uniqueId++);
}
return id;
1.33 +6 -3
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Project.java 21 Jul 2002 03:56:23 -0000 1.32
+++ Project.java 25 Jul 2002 21:32:14 -0000 1.33
@@ -352,13 +352,16 @@
}
/**
- * Add a dependency for this project.
+ * Add a unique dependency for this project.
*
* @param dependency Dependency for this project.
*/
public void addDependency(Dependency dependency)
{
- dependencies.add(dependency);
+ if (!dependencies.contains(dependency))
+ {
+ dependencies.add(dependency);
+ }
}
/**
1.9 +0 -6 jakarta-turbine-maven/src/plugins-build/reactor/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/reactor/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 23 Jul 2002 23:55:38 -0000 1.8
+++ project.xml 25 Jul 2002 21:32:14 -0000 1.9
@@ -109,12 +109,6 @@
<version>1.4-dev</version>
</dependency>
- <dependency>
- <id>maven</id>
- <version>b5</version>
- <jar>maven.jar</jar>
- </dependency>
-
</dependencies>
<build>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
