You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2004/09/18 03:02:15 UTC
cvs commit: maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven AddPathTag.java PropertyTag.java ReactorTag.java
brett 2004/09/17 18:02:14
Modified: . project.xml
src/java/main/org/apache/maven/jelly/tags/maven
AddPathTag.java PropertyTag.java ReactorTag.java
Log:
depend on maven-1.1-SNAPSHOT
Revision Changes Path
1.5 +2 -3 maven-jelly-tags/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-jelly-tags/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 17 Sep 2004 22:17:58 -0000 1.4
+++ project.xml 18 Sep 2004 01:02:14 -0000 1.5
@@ -152,11 +152,10 @@
<version>0.8.1</version>
<url>http://jakarta.apache.org/commons/sandbox/graph/</url>
</dependency>
- <!-- TODO: need to get rid of this circular dependency -->
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
<url>http://maven.apache.org/</url>
</dependency>
<dependency>
@@ -168,7 +167,7 @@
<dependency>
<artifactId>werkz</artifactId>
<groupId>werkz</groupId>
- <version>20040114.081319</version>
+ <version>20040426.222000</version>
<url>http://werkz.codehaus.org/</url>
</dependency>
<dependency>
1.17 +2 -2 maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/AddPathTag.java
Index: AddPathTag.java
===================================================================
RCS file: /home/cvs/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/AddPathTag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AddPathTag.java 28 May 2004 00:59:00 -0000 1.16
+++ AddPathTag.java 18 Sep 2004 01:02:14 -0000 1.17
@@ -50,7 +50,7 @@
public void doTag( XMLOutput output )
throws JellyTagException
{
- Project project = AntTagLibrary.getProject( getMavenContext() );
+ Project project = AntTagLibrary.getProject( getContext() );
if ( project == null )
{
1.8 +3 -3 maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/PropertyTag.java
Index: PropertyTag.java
===================================================================
RCS file: /home/cvs/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/PropertyTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertyTag.java 23 Mar 2004 02:18:19 -0000 1.7
+++ PropertyTag.java 18 Sep 2004 01:02:14 -0000 1.8
@@ -65,7 +65,7 @@
checkAttribute( defaultValue, "defaultValue" );
- String property = (String) getMavenContext().getVariable( name );
+ String property = (String) getContext().getVariable( name );
if ( property == null )
{
@@ -74,11 +74,11 @@
if ( var != null )
{
- getMavenContext().setVariable( var, property );
+ getContext().setVariable( var, property );
}
else
{
- getMavenContext().setVariable( name, property );
+ getContext().setVariable( name, property );
}
}
}
1.41 +2 -2 maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file: /home/cvs/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ReactorTag.java 28 May 2004 00:59:00 -0000 1.40
+++ ReactorTag.java 18 Sep 2004 01:02:14 -0000 1.41
@@ -453,7 +453,7 @@
*/
public void onException(Project project, Exception e)
{
- getMavenContext().setVariable( MavenConstants.BUILD_FAILURE, "true" );
+ getContext().setVariable( MavenConstants.BUILD_FAILURE, "true" );
failedProjects.add( project );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org