From 755a92bc2d78efcbb39a48a6284d84866fd1190a Mon Sep 17 00:00:00 2001 From: brett Date: Fri, 10 Jun 2005 06:50:03 +0000 Subject: [PATCH] PR: MPIDEA-19 Submitted by: Jose Peleteiro Reviewed by: Brett Porter Add maven.idea.jdk property git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@189909 13f79535-47bb-0310-9956-ffa450edef68 --- idea/plugin.properties | 3 +++ idea/src/plugin-resources/templates/v4/module.jelly | 2 +- idea/xdocs/changes.xml | 9 +++++---- idea/xdocs/properties.xml | 7 +++++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/idea/plugin.properties b/idea/plugin.properties index dac44e0a..cf229fa5 100644 --- a/idea/plugin.properties +++ b/idea/plugin.properties @@ -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}" diff --git a/idea/src/plugin-resources/templates/v4/module.jelly b/idea/src/plugin-resources/templates/v4/module.jelly index 07186de5..4234136f 100644 --- a/idea/src/plugin-resources/templates/v4/module.jelly +++ b/idea/src/plugin-resources/templates/v4/module.jelly @@ -143,7 +143,7 @@ - + diff --git a/idea/xdocs/changes.xml b/idea/xdocs/changes.xml index db64b142..440eba10 100644 --- a/idea/xdocs/changes.xml +++ b/idea/xdocs/changes.xml @@ -25,10 +25,11 @@ - Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies - Add a property for specifying generated source directories to include in the module - Set source level properties based on the compile source level - Deployment descriptor for ejb.jar hard-coded + Make projects within the reactor set IDEA module dependencies, but keep all others as JAR dependencies + Add a property for specifying generated source directories to include in the module + Set source level properties based on the compile source level + Add maven.idea.jdk property so that the JDK can be explicitly specified if it does not use the IDEA default + Deployment descriptor for ejb.jar hard-coded v4/module.jelly generates incorrect references to $MODULE_DIR$ Generate a module for the multiproject itself idea:multiproject without idea:workspace so a local workspaces aren't lost diff --git a/idea/xdocs/properties.xml b/idea/xdocs/properties.xml index 4ec15ac7..dcda3e09 100644 --- a/idea/xdocs/properties.xml +++ b/idea/xdocs/properties.xml @@ -98,6 +98,13 @@ Default value is true. + + maven.idea.jdk + Yes + + The target JDK module name. java version "${java.version}" is the default. (IDEA 4 only) + +