Skip to content

Commit 172f6be

Browse files
kwinHannesWell
authored andcommitted
Support launch without pom.xml
This closes #1427
1 parent 656652c commit 172f6be

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

org.eclipse.m2e.launching/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Bundle-Name
44
Bundle-SymbolicName: org.eclipse.m2e.launching;singleton:=true
5-
Bundle-Version: 2.0.500.qualifier
5+
Bundle-Version: 2.0.600.qualifier
66
Bundle-Localization: plugin
77
Require-Bundle: org.eclipse.core.runtime,
88
org.eclipse.core.variables,

org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.eclipse.core.resources.ResourcesPlugin;
3636
import org.eclipse.core.runtime.CoreException;
3737
import org.eclipse.core.runtime.ILog;
38+
import org.eclipse.core.runtime.IPath;
3839
import org.eclipse.core.runtime.IProgressMonitor;
3940
import org.eclipse.core.runtime.NullProgressMonitor;
4041
import org.eclipse.core.runtime.Path;
@@ -244,14 +245,17 @@ public static String readEnforcedJavaVersion(File pomDirectory, IProgressMonitor
244245
try {
245246
Optional<IContainer> container = getContainer(pomDirectory);
246247
if(container.isPresent()) {
247-
IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
248-
IFile pomFile = container.get().getFile(Path.fromOSString(IMavenConstants.POM_FILE_NAME));
249-
IMavenProjectFacade mavenProject = projectManager.create(pomFile, true, new NullProgressMonitor());
250-
if(mavenProject != null) {
251-
return readEnforcedVersion(mavenProject, monitor);
248+
IPath pomPath = Path.fromOSString(IMavenConstants.POM_FILE_NAME);
249+
if(container.get().exists(pomPath)) {
250+
IFile pomFile = container.get().getFile(pomPath);
251+
IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
252+
IMavenProjectFacade mavenProject = projectManager.create(pomFile, true, new NullProgressMonitor());
253+
if(mavenProject != null) {
254+
return readEnforcedVersion(mavenProject, monitor);
255+
}
252256
}
253257
}
254-
//TODO: handle the case if the pomDirectory points to a project not in the project. Then load the bare project.
258+
//TODO: handle the case if the pomDirectory points to a project not in the workspace. Then load the bare project.
255259
} catch(CoreException ex) {
256260
logEnforcedJavaVersionCalculationError(ex);
257261
}

0 commit comments

Comments
 (0)