From f5586b6753f1e82a88bffde55f967911e9803a2c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 16 May 2017 12:07:41 -0400 Subject: [PATCH] don't downgrade maven to 1.7 (#1956) --- .../appengine/standard/java8/AppEngineWebBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8/src/com/google/cloud/tools/eclipse/appengine/standard/java8/AppEngineWebBuilder.java b/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8/src/com/google/cloud/tools/eclipse/appengine/standard/java8/AppEngineWebBuilder.java index fdf30b70e9..e702b38c6a 100644 --- a/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8/src/com/google/cloud/tools/eclipse/appengine/standard/java8/AppEngineWebBuilder.java +++ b/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8/src/com/google/cloud/tools/eclipse/appengine/standard/java8/AppEngineWebBuilder.java @@ -19,6 +19,8 @@ import com.google.cloud.tools.appengine.AppEngineDescriptor; import com.google.cloud.tools.eclipse.appengine.facets.AppEngineStandardFacet; import com.google.cloud.tools.eclipse.appengine.facets.WebProjectUtil; +import com.google.cloud.tools.eclipse.util.MavenUtils; + import java.io.IOException; import java.io.InputStream; import java.util.HashSet; @@ -86,7 +88,9 @@ private void checkRuntimeElement(IFacetedProject project, IFile appEngineWebDesc Set updates = new HashSet<>(); if (hasJava8Runtime) { updates.add(new Action(Action.Type.VERSION_CHANGE, JavaFacet.VERSION_1_8, null)); - } else { + } else if (!MavenUtils.hasMavenNature(project.getProject())) { + // see https://github.com/GoogleCloudPlatform/google-cloud-eclipse/issues/1941 + // still not totally clear why this works for standard projects and not maven updates.add(new Action(Action.Type.VERSION_CHANGE, JavaFacet.VERSION_1_7, null)); } logger.fine(getProject() + ": changing facets: " + updates);