vmassol 2003/11/12 14:34:32
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
Rolled back fix for bug
http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-977. The bug was invalid.
Revision Changes Path
1.7 +0 -6 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- changes.xml 8 Nov 2003 12:45:46 -0000 1.6
+++ changes.xml 12 Nov 2003 22:34:32 -0000 1.7
@@ -24,12 +24,6 @@
property instead of hard-coding the war name to
<code>${pom.artifactId}.war</code>.
</action>
- <action dev="vmassol" type="fix">
- Fixed bug
- <a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-977";>MAVEN-977</a>.
- Cactus <code>cactus.src.includes</code> and
- <code>cactus.src.excludes</code> properties should now work.
- </action>
<action dev="vmassol" type="add">
Moved the Cactus plugin from the Maven CVS to the Cactus CVS.
</action>
1.7 +0 -4 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 8 Nov 2003 12:45:46 -0000 1.6
+++ plugin.jelly 12 Nov 2003 22:34:32 -0000 1.7
@@ -122,8 +122,6 @@
optimize="${pom.getPluginContext('maven-java-plugin').getVariable('maven.compile.optimize')}">
<ant:src path="${cactus.src.dir}"/>
- <ant:include name="${cactus.src.includes}"/>
- <ant:exclude name="${cactus.src.excludes}"/>
<ant:classpath>
<ant:path refid="maven.dependency.classpath"/>
@@ -161,8 +159,6 @@
<ant:fileset dir="${cactus.src.dir}">
<ant:exclude name="**/*.java"/>
<ant:exclude name="**/*.html"/>
- <ant:include name="${cactus.src.includes}"/>
- <ant:exclude name="${cactus.src.excludes}"/>
</ant:fileset>
</ant:copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
