From ef2789c0f9a733c84be348423d9e77de8b6af3c4 Mon Sep 17 00:00:00 2001
From: brett <brett@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 31 Jan 2005 11:50:19 +0000
Subject: [PATCH] PR: MPIDEA-17 set module to JAVA_MODULE to be comptabile with
 Irida

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@149241 13f79535-47bb-0310-9956-ffa450edef68
---
 idea/project.xml                                    | 2 +-
 idea/src/plugin-resources/templates/v4/module.jelly | 2 +-
 idea/xdocs/changes.xml                              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/idea/project.xml b/idea/project.xml
index 52509dfa..dc3f57cd 100644
--- a/idea/project.xml
+++ b/idea/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-idea-plugin</id>
   <name>Maven IDEA Plug-in</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.5.1-SNAPSHOT</currentVersion>
   <shortDescription>IDEA Plugin for Maven</shortDescription>
   <description>IDEA Plugin for Maven.</description>
   <url>http://maven.apache.org/reference/plugins/idea/</url>
diff --git a/idea/src/plugin-resources/templates/v4/module.jelly b/idea/src/plugin-resources/templates/v4/module.jelly
index c44cf547..2b97d5fe 100644
--- a/idea/src/plugin-resources/templates/v4/module.jelly
+++ b/idea/src/plugin-resources/templates/v4/module.jelly
@@ -21,7 +21,7 @@
 
   <maven:get var="type" plugin="maven-multiproject-plugin" property="maven.multiproject.type" />
 
-  <j:set var="IDEA_TYPE" value=""/>
+  <j:set var="IDEA_TYPE" value="JAVA_MODULE"/>
   <j:if test="${type == 'ejb'}">
     <j:set var="IDEA_TYPE" value="J2EE_EJB_MODULE"/>
   </j:if>
diff --git a/idea/xdocs/changes.xml b/idea/xdocs/changes.xml
index d618fbb8..19d51e97 100644
--- a/idea/xdocs/changes.xml
+++ b/idea/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="michal.maczka@dimatic.com">Michal Maczka</author>
   </properties>
   <body>
+    <release version="1.5.1-SNAPSHOT" date="in SVN">
+      <action dev="brett" type="fix" issue="MPIDEA-17">set module to JAVA_MODULE for compatibility with both 4.5 and Irida.</action>
+    </release>
     <release version="1.5" date="2004-06-25">
       <action dev="brett" type="add" issue="MPIDEA-5">match module type to artifact type</action>
     </release>