Author: aheritier
Date: Thu Mar 15 17:19:08 2007
New Revision: 518813
URL: http://svn.apache.org/viewvc?view=rev&rev=518813
Log:
MECLIPSE-241 : Compiler settings in pluginManagement aren't used in wtp facet
Fixed this time
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?view=diff&rev=518813&r1=518812&r2=518813
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Thu Mar 15 17:19:08 2007
@@ -250,9 +250,26 @@
*/
public static String getCompilerPluginSetting( MavenProject project,
String optionName )
{
+ String value = findCompilerPluginSettingInPlugins(
project.getModel().getBuild().getPlugins(), optionName );
+ if ( value == null &&
project.getModel().getBuild().getPluginManagement() != null )
+ {
+ value =
+ findCompilerPluginSettingInPlugins(
project.getModel().getBuild().getPluginManagement().getPlugins(),
+ optionName );
+ }
+ return value;
+ }
+
+ /**
+ * Returns a compiler plugin settings from a list of plugins .
+ * @param project maven project
+ * @return option value (may be null)
+ */
+ private static String findCompilerPluginSettingInPlugins( List plugins,
String optionName )
+ {
String value = null;
- for ( Iterator it =
project.getModel().getBuild().getPlugins().iterator(); it.hasNext(); )
+ for ( Iterator it = plugins.iterator(); it.hasNext(); )
{
Plugin plugin = (Plugin) it.next();
@@ -281,8 +298,6 @@
}
}
}
-
return value;
}
-
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml?view=diff&rev=518813&r1=518812&r2=518813
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/pom.xml
Thu Mar 15 17:19:08 2007
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<groupId>eclipse.project28</groupId>
@@ -8,12 +7,13 @@
<version>1.0</version>
<name>Master project</name>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>test</version>
- </plugin>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -22,7 +22,8 @@
<target>1.5</target>
</configuration>
</plugin>
- </plugins>
+ </plugins>
+ </pluginManagement>
</build>
<modules>
<module>module-1</module>
