diff options
| author | Fred Bricon | 2013-01-17 09:29:05 +0000 |
|---|---|---|
| committer | Fred Bricon | 2013-01-17 09:29:05 +0000 |
| commit | 35202201043d016a1de2307bf0fe2cf6185e9aa8 (patch) | |
| tree | 1a58ad94ba45aef7928d0ae2c3beef6ccb28853d | |
| parent | bc99c062a1ab0617a89b3c8d9f42e6fb5d5b9142 (diff) | |
| download | m2e-core-35202201043d016a1de2307bf0fe2cf6185e9aa8.tar.gz m2e-core-35202201043d016a1de2307bf0fe2cf6185e9aa8.tar.xz m2e-core-35202201043d016a1de2307bf0fe2cf6185e9aa8.zip | |
398369 : Use m-compiler-p 3.0 when converting to Maven
Signed-off-by: Fred Bricon <fbricon@gmail.com>
| -rw-r--r-- | org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java index 44384887..ca1e08a5 100644 --- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java +++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/JavaProjectConversionParticipant.java @@ -67,7 +67,7 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP private static final String COMPILER_ARTIFACT_ID = "maven-compiler-plugin"; //$NON-NLS-1$ - private static final String COMPILER_VERSION = "2.3.2"; //$NON-NLS-1$ + private static final String DEFAULT_COMPILER_VERSION = "3.0"; //$NON-NLS-1$ private static final String TARGET_KEY = "target"; //$NON-NLS-1$ @@ -161,7 +161,7 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP compiler = new Plugin(); compiler.setGroupId(COMPILER_GROUP_ID); compiler.setArtifactId(COMPILER_ARTIFACT_ID); - compiler.setVersion(COMPILER_VERSION); + compiler.setVersion(getCompilerVersion()); build.addPlugin(compiler); } @@ -356,4 +356,10 @@ public class JavaProjectConversionParticipant extends AbstractProjectConversionP return this; } } + + private String getCompilerVersion() { + //FIXME Workaround until we can get the version from JDT conversion preferences instead + //Useful for test purposes. + return System.getProperty("org.eclipse.m2e.jdt.conversion.compiler.version", DEFAULT_COMPILER_VERSION); + } } |