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 2005/06/10 08:50:04 UTC
svn commit: r189909 - in /maven/maven-1/plugins/trunk/idea:
plugin.properties src/plugin-resources/templates/v4/module.jelly
xdocs/changes.xml xdocs/properties.xml
Author: brett
Date: Thu Jun 9 23:50:03 2005
New Revision: 189909
URL: http://svn.apache.org/viewcvs?rev=189909&view=rev
Log:
PR: MPIDEA-19
Submitted by: Jose Peleteiro
Reviewed by: Brett Porter
Add maven.idea.jdk property
Modified:
maven/maven-1/plugins/trunk/idea/plugin.properties
maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly
maven/maven-1/plugins/trunk/idea/xdocs/changes.xml
maven/maven-1/plugins/trunk/idea/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/idea/plugin.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/idea/plugin.properties?rev=189909&r1=189908&r2=189909&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/plugin.properties (original)
+++ maven/maven-1/plugins/trunk/idea/plugin.properties Thu Jun 9 23:50:03 2005
@@ -17,3 +17,6 @@
# Project version - valid values are 3, 4
maven.idea.project.version=4
maven.idea.target.exclude=true
+
+# JDK version
+maven.idea.jdk=java version "${java.version}"
Modified: maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly?rev=189909&r1=189908&r2=189909&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly (original)
+++ maven/maven-1/plugins/trunk/idea/src/plugin-resources/templates/v4/module.jelly Thu Jun 9 23:50:03 2005
@@ -143,7 +143,7 @@
<excludeFolder url="file://$$MODULE_DIR$$/${defaulttargetdir}/classes"/>
<excludeFolder url="file://$$MODULE_DIR$$/${defaulttargetdir}/test-classes"/>
</content>
- <orderEntry type="jdk" jdkName="java version "${java.version}""/>
+ <orderEntry type="jdk" jdkName="${maven.idea.jdk}"/>
<!-- MPIDEA-11 (duplicates MPIDEA-22): Reference resources directory -->
<j:forEach var="res" items="${pom.build.resources}">
<orderEntry type="module-library">
Modified: maven/maven-1/plugins/trunk/idea/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/idea/xdocs/changes.xml?rev=189909&r1=189908&r2=189909&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/idea/xdocs/changes.xml Thu Jun 9 23:50:03 2005
@@ -25,10 +25,11 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
- <action dev="brett" type="fix" issue="MPIDEA-7" due-to="David Jencks">Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies</action>
- <action dev="brett" type="fix" issue="MPIDEA-10" due-to="David Jencks">Add a property for specifying generated source directories to include in the module</action>
- <action dev="brett" type="fix" issue="MPIDEA-19">Set source level properties based on the compile source level</action>
- <action dev="brett" type="fix" issue="MPIDEA-9" due-to="Eirik Bjorsnos">Deployment descriptor for ejb.jar hard-coded</action>
+ <action dev="brett" type="update" issue="MPIDEA-7" due-to="David Jencks">Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies</action>
+ <action dev="brett" type="add" issue="MPIDEA-10" due-to="David Jencks">Add a property for specifying generated source directories to include in the module</action>
+ <action dev="brett" type="update" issue="MPIDEA-19">Set source level properties based on the compile source level</action>
+ <action dev="brett" type="add" issue="MPIDEA-19" due-to="Jose Peleteiro">Add <code>maven.idea.jdk</code> property so that the JDK can be explicitly specified if it does not use the IDEA default</action>
+ <action dev="brett" type="update" issue="MPIDEA-9" due-to="Eirik Bjorsnos">Deployment descriptor for ejb.jar hard-coded</action>
<action dev="brett" type="fix" issue="MPIDEA-15" due-to="Geoffrey De Smet">v4/module.jelly generates incorrect references to $MODULE_DIR$</action>
<action dev="brett" type="add" issue="MPIDEA-28" due-to="Geoffrey De Smet">Generate a module for the multiproject itself</action>
<action dev="brett" type="update" issue="MPIDEA-26" due-to="Geoffrey De Smet">idea:multiproject without idea:workspace so a local workspaces aren't lost</action>
Modified: maven/maven-1/plugins/trunk/idea/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/idea/xdocs/properties.xml?rev=189909&r1=189908&r2=189909&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/idea/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/idea/xdocs/properties.xml Thu Jun 9 23:50:03 2005
@@ -98,6 +98,13 @@
Default value is true.
</td>
</tr>
+ <tr>
+ <td>maven.idea.jdk</td>
+ <td>Yes</td>
+ <td>
+ The target JDK module name. <code>java version "${java.version}"</code> is the default. (IDEA 4 only)
+ </td>
+ </tr>
</table>
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org