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/05/01 03:11:37 UTC
cvs commit: maven-plugins/multiproject/xdocs changes.xml
brett 2004/04/30 18:11:37
Modified: idea plugin.jelly plugin.properties project.xml
multiproject plugin.jelly project.xml
multiproject/xdocs changes.xml
Log:
PR: MPIDEA-4
fix idea:multiproject
Revision Changes Path
1.10 +6 -5 maven-plugins/idea/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/idea/plugin.jelly,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- plugin.jelly 4 Mar 2004 18:15:13 -0000 1.9
+++ plugin.jelly 1 May 2004 01:11:37 -0000 1.10
@@ -19,10 +19,13 @@
<project xmlns:j="jelly:core"
+ xmlns:multiproject="multiproject"
xmlns:ant="jelly:ant"
xmlns:util="jelly:util"
xmlns:maven="jelly:maven">
+ <multiproject:dependency-handle />
+
<!--==================================================================-->
<!-- Generate IntelliJ IDEA project, workspace and model files -->
<!--==================================================================-->
@@ -84,10 +87,8 @@
<goal name="idea:multiproject" prereqs="idea:init">
<j:set var="ideaVersion" value="${maven.idea.project.version}"/>
- <j:if test="${ideaVersion=='3'}">
- <ant:echo>WARNING: This goal should be used only with IDEA 4.</ant:echo>
- <ant:echo>Property 'maven.idea.project.version' is set to '3'</ant:echo>
- <!-- how to exist from goal? -->
+ <j:if test="${ideaVersion == '3'}">
+ <ant:fail>ERROR: This goal should be used only with IDEA 4 and above.</ant:fail>
</j:if>
@@ -111,7 +112,6 @@
<j:if test="${multiprojectBasedir == null or multiprojectBasedir.length() eq 0}">
<maven:pluginVar var="multiprojectBasedir" plugin="maven-multiproject-plugin" property="maven.multiproject.basedir"/>
</j:if>
-
<maven:reactor
basedir="${multiprojectBasedir}"
@@ -130,3 +130,4 @@
</goal>
</project>
+
1.4 +2 -2 maven-plugins/idea/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/idea/plugin.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.properties 4 Mar 2004 18:15:13 -0000 1.3
+++ plugin.properties 1 May 2004 01:11:37 -0000 1.4
@@ -14,5 +14,5 @@
# limitations under the License.
# -------------------------------------------------------------------
-# Project version - v3 for 3.0+; v4 for "Aurora"
-maven.idea.project.version=3
\ No newline at end of file
+# Project version - valid values are 3, 4
+maven.idea.project.version=4
1.23 +1 -1 maven-plugins/idea/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/idea/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 10 Apr 2004 00:59:23 -0000 1.22
+++ project.xml 1 May 2004 01:11:37 -0000 1.23
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-idea-plugin</id>
<name>Maven IDEA Plug-in</name>
- <currentVersion>1.3</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<shortDescription>IDEA Plugin for Maven</shortDescription>
<description>IDEA Plugin for Maven. Requires Maven 1.0 RC2.</description>
<url>http://maven.apache.org/reference/plugins/idea/</url>
1.42 +7 -0 maven-plugins/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/plugin.jelly,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- plugin.jelly 30 Apr 2004 07:26:32 -0000 1.41
+++ plugin.jelly 1 May 2004 01:11:37 -0000 1.42
@@ -20,11 +20,18 @@
<project
xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant"
xmlns:doc="doc"
xmlns:util="jelly:util"
xmlns:velocity="jelly:velocity">
+
+ <define:taglib uri="multiproject">
+ <define:tag name="dependency-handle">
+ <!-- this page left intentionally blank -->
+ </define:tag>
+ </define:taglib>
<!--==================================================================-->
<!-- Default goal: builds sites for all subprojects -->
1.22 +10 -0 maven-plugins/multiproject/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 29 Apr 2004 15:24:46 -0000 1.21
+++ project.xml 1 May 2004 01:11:37 -0000 1.22
@@ -75,6 +75,16 @@
</roles>
<timezone>+1</timezone>
</developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>brett@apache.org</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+10</timezone>
+ </developer>
</developers>
<dependencies>
<dependency>
1.20 +2 -0 maven-plugins/multiproject/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/multiproject/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 30 Apr 2004 07:26:32 -0000 1.19
+++ changes.xml 1 May 2004 01:11:37 -0000 1.20
@@ -38,6 +38,8 @@
<code>multiproject:site</code> goal.
</action>
<action dev="brett" type="add">Utilise new reactor parameter "projectList" to avoid reloading projects</action>
+ <action dev="brett" type="add">Add a dependency-handle tag so that you can use multiproject properties in
+ your plugin without calling the goals.</action>
</release>
<release version="1.2" date="2004-03-07">
<action dev="evenisse" type="fix">Fix dependency convergence page when project have no dependency.</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org