Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If maven.compile.target or maven.compile.source are empty, then use by default the version 1.4 for wtp and preferences

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@531862 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier
2007-04-24 10:21:51 +00:00
parent 6dacf1ef52
commit 6715444892
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eclipse/src/plugin-resources/templates/org.eclipse.jdt.core.prefs.jelly
View File

@@ -18,13 +18,15 @@
-->
<j:whitespace xmlns:j="jelly:core" xmlns="dummy" trim="false">
<j:set var="target" value="${maven.compile.target}" />
<j:if test="${target==null}">
<j:set var="target" value="1.4" />
</j:if>
<j:set var="source" value="${maven.compile.source}" />
<j:if test="${source==null}">
<j:set var="source" value="1.4" />
</j:if>
eclipse.preferences.version=1
<j:if test="${target!=null}">
org.eclipse.jdt.core.compiler.codegen.targetPlatform=${target}
org.eclipse.jdt.core.compiler.compliance=${target}
</j:if>
<j:if test="${source!=null}">
org.eclipse.jdt.core.compiler.source=${source}
</j:if>
</j:whitespace>

5
eclipse/src/plugin-resources/templates/wtp/1.5/org.eclipse.wst.common.project.facet.core.xml.jelly
View File

@@ -21,9 +21,12 @@
<faceted-project>
<fixed facet="jst.java" />
<j:set var="javaversion" value="${maven.compile.target}" />
<j:if test="javaversion==null">
<j:if test="${javaversion==null}">
<j:set var="javaversion" value="${maven.compile.source}" />
</j:if>
<j:if test="${javaversion==null}">
<j:set var="javaversion" value="1.4" />
</j:if>
<j:choose>
<j:when test="${javaversion.startsWith('1.5')}">
<j:set var="javaversion" value="5.0" />

1
eclipse/xdocs/changes.xml
View File

@@ -24,6 +24,7 @@
</properties>
<body>
<release version="1.12-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="fix">If maven.compile.target or maven.compile.source are empty, then use by default the version 1.4 for wtp and preferences</action>
<action dev="aheritier" type="update">Maven offline mode (-o or maven.mode.online=false) overrides maven.eclipse.src.download and maven.eclipse.javadoc.download</action>
<action dev="aheritier" type="add">Project preferences are now generated with the classpath (to define the java version for sources and target).</action>
<action dev="aheritier" type="update">WTP settings are now generated if maven.eclipse.wtp.enable=false. No more need to define natures, build commands.</action>