brett 2004/09/17 15:17:58
Modified: . project.xml
src/java/main/org/apache/maven/jelly/tags/maven
CopyResources.java
Log:
switch to maven-model
upgrade dependencies
Revision Changes Path
1.4 +11 -5 maven-jelly-tags/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-jelly-tags/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 28 May 2004 00:59:00 -0000 1.3
+++ project.xml 17 Sep 2004 22:17:58 -0000 1.4
@@ -23,7 +23,7 @@
<groupId>maven</groupId>
<artifactId>maven-jelly-tags</artifactId>
<name>Maven Jelly Tag Library</name>
- <currentVersion>1.0.1-SNAPSHOT</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://www.apache.org/</url>
@@ -143,7 +143,7 @@
<dependency>
<artifactId>commons-jelly</artifactId>
<groupId>commons-jelly</groupId>
- <version>20030902.160215</version>
+ <version>1.0-beta-4</version>
<url>http://jakarta.apache.org/commons/jelly/</url>
</dependency>
<dependency>
@@ -152,11 +152,17 @@
<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>
+ <url>http://maven.apache.org/</url>
+ </dependency>
+ <dependency>
<groupId>maven</groupId>
- <version>1.0-rc3</version>
- <jar>maven.jar</jar>
+ <artifactId>maven-model</artifactId>
+ <version>2.0-SNAPSHOT</version>
<url>http://maven.apache.org/</url>
</dependency>
<dependency>
@@ -186,7 +192,7 @@
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
- <version>20030625.032346</version>
+ <version>1.0</version>
<url>http://jakarta.apache.org/commons/jelly/tags/ant/</url>
</dependency>
<!-- Runtime dependencies -->
1.5 +4 -4
maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/CopyResources.java
Index: CopyResources.java
===================================================================
RCS file:
/home/cvs/maven-jelly-tags/src/java/main/org/apache/maven/jelly/tags/maven/CopyResources.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopyResources.java 23 Mar 2004 02:18:19 -0000 1.4
+++ CopyResources.java 17 Sep 2004 22:17:58 -0000 1.5
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.jelly.tags.BaseTagSupport;
-import org.apache.maven.project.Resource;
+import org.apache.maven.model.v300.Resource;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
@@ -108,8 +108,8 @@
org.apache.tools.ant.taskdefs.Copy copyTask = new
org.apache.tools.ant.taskdefs.Copy();
copyTask.setProject( getMavenContext().getAntProject() );
copyTask.setTodir( targetDirectory );
- copyTask.setFiltering(resource.getFiltering());
- copyTask.setOverwrite(resource.getFiltering());
+ copyTask.setFiltering(resource.isFiltering());
+ copyTask.setOverwrite(resource.isFiltering());
FileSet fileSet = new FileSet();
fileSet.setDir( directory );
if (resource.getIncludes().isEmpty())
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
