Skip to content

Commit

Permalink
don't downgrade maven to 1.7 (#1956)
Browse files Browse the repository at this point in the history
  • Loading branch information
elharo authored May 16, 2017
1 parent 672fd33 commit f5586b6
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -86,7 +88,9 @@ private void checkRuntimeElement(IFacetedProject project, IFile appEngineWebDesc
Set<Action> 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);
Expand Down

0 comments on commit f5586b6

Please sign in to comment.