Attachment 237184 Details for Bug 420848 – [UPDATE-2] Proposed patch for m2e-core, adding java compiler settings for java 8

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] [UPDATE-2] Proposed patch for m2e-core, adding java compiler settings for java 8

0001-420848-maven-compiler-plugin-source-target-1.8-not-r.patch (text/plain), 3.24 KB, created by Daniel Dietrich

on 2013-11-04 18:26:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Dietrich

Created: 2013-11-04 18:26:24 EST

Size: 3.24 KB

patch

obsolete

>From fd6c0b40e00fdb6bbb60c6bab47feaa5a7ab76f0 Mon Sep 17 00:00:00 2001
>From: Daniel Dietrich <daniel.dietrich@gmx.net>
>Date: Tue, 5 Nov 2013 00:21:20 +0100
>Subject: [PATCH] 420848 - maven-compiler-plugin source/target 1.8 not
> recognized
>
>The jdt component of m2e v1.4 does not import java 1.8 projects correctly into eclipse.
>Instead of setting the compiler compliance level to java 1.8, java 1.4 is used.
>This patch fixes this issue by adding JavaSE-1.8 to the list of known java runtime environments
>and adding java 1.8 (respectively java 8) to the list of known source/target compliance levels.
>
>This contribution complies with http://www.eclipse.org/legal/CoO.php
>
>Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=420848
>Signed-off-by: Daniel Dietrich <daniel.dietrich@gmx.net>
>---
> .../m2e/jdt/internal/AbstractJavaProjectConfigurator.java      | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
>index d936dc4..6fea0b9 100644
>--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
>+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
>@@ -72,9 +72,10 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
> 
>   public static final String COMPILER_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
> 
>-  protected static final List<String> SOURCES = Arrays.asList("1.1,1.2,1.3,1.4,1.5,5,1.6,6,1.7,7".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
>+  protected static final List<String> SOURCES = Arrays.asList("1.1,1.2,1.3,1.4,1.5,5,1.6,6,1.7,7,1.8,8".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
> 
>-  protected static final List<String> TARGETS = Arrays.asList("1.1,1.2,1.3,1.4,jsr14,1.5,5,1.6,6,1.7,7".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
>+  protected static final List<String> TARGETS = Arrays
>+      .asList("1.1,1.2,1.3,1.4,jsr14,1.5,5,1.6,6,1.7,7,1.8,8".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
> 
>   private static final String GOAL_RESOURCES = "resources";
> 
>@@ -95,6 +96,7 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
>     ENVIRONMENTS.put("jsr14", "J2SE-1.5"); //$NON-NLS-1$ //$NON-NLS-2$
>     ENVIRONMENTS.put("1.6", "JavaSE-1.6"); //$NON-NLS-1$ //$NON-NLS-2$
>     ENVIRONMENTS.put("1.7", "JavaSE-1.7"); //$NON-NLS-1$ //$NON-NLS-2$
>+    ENVIRONMENTS.put("1.8", "JavaSE-1.8"); //$NON-NLS-1$ //$NON-NLS-2$
>   }
> 
>   protected static final String DEFAULT_COMPILER_LEVEL = "1.4"; //$NON-NLS-1$
>@@ -469,6 +471,8 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
>       source = "1.6";
>     } else if(source.equals("7")) {
>       source = "1.7";
>+    } else if(source.equals("8")) {
>+      source = "1.8";
>     }
> 
>     // While "5" and "6" are valid synonyms for Java 5 and Java 6 target,
>@@ -479,6 +483,8 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
>       target = "1.6";
>     } else if(target.equals("7")) {
>       target = "1.7";
>+    } else if(target.equals("8")) {
>+      target = "1.8";
>     }
> 
>     options.put(JavaCore.COMPILER_SOURCE, source);
>-- 
>1.8.3.4 (Apple Git-47)
>

Actions: View | Diff

Attachments on bug 420848: 237137 | 237138 | 237162 | 237163 | 237184 | 237185