Author: fgiust
Date: Sun Dec 31 02:36:22 2006
New Revision: 491400
URL: http://svn.apache.org/viewvc?view=rev&rev=491400
Log:
handle java 6 version for WTP projects (must be "6.0", "6" is not a valid
version for java facet)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java?view=diff&rev=491400&r1=491399&r2=491400
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/AbstractWtpResourceWriter.java
Sun Dec 31 02:36:22 2006
@@ -283,9 +283,17 @@
IdeUtils.getCompilerSourceVersion( config.getProject() );
}
- if ( "1.5".equals( version ) || "5".equals( version ) ) //$NON-NLS-1$
//$NON-NLS-2$
+ if ( "1.5".equals( version ) ) //$NON-NLS-1$ //$NON-NLS-2$
{
version = "5.0";// see MECLIPSE-47 eclipse only accept 5.0 as a
valid version //$NON-NLS-1$
+ }
+ else if ( "1.6".equals( version ) ) //$NON-NLS-1$ //$NON-NLS-2$
+ {
+ version = "6.0";
+ }
+ else if ( version != null && version.length() == 1 )
+ {
+ version = version + ".0";// 5->5.0 6->6.0 7->7.0 //$NON-NLS-1$
}
return version == null ? "1.4" : version; //$NON-NLS-1$
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/pom.xml?view=diff&rev=491400&r1=491399&r2=491400
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/pom.xml
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-26/pom.xml
Sun Dec 31 02:36:22 2006
@@ -23,8 +23,8 @@
<goal>testCompile</goal>
</goals>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>6</source>
+ <target>6</target>
</configuration>
</execution>
</executions>
