Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Only ever return pom path for type=pom #1731

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −8
Draft

Only ever return pom path for type=pom #1731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea9a37e
Only ever return pom path for type=pom
kwin Apr 4, 2024
c6b72f7
Update version
kwin Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.m2e.core/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.m2e.core;singleton:=true
Bundle-Version: 2.6.0.qualifier
Bundle-Version: 2.6.1.qualifier
Bundle-Activator: org.eclipse.m2e.core.internal.MavenPluginActivator
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</parent>

<artifactId>org.eclipse.m2e.core</artifactId>
<version>2.6.0-SNAPSHOT</version>
<version>2.6.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<name>Maven Integration for Eclipse Core Plug-in</name>
Expand Down
11 changes: 6 additions & 5 deletions ...rc/org/eclipse/m2e/core/internal/project/registry/EclipseWorkspaceArtifactRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ protected File resolveAsEclipseProject(String groupId, String artifactId, String

if(context.resolverConfiguration.isResolveWorkspaceProjects()) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
IPath file = pom.getLocation();
if(file == null) {
IPath pomFile = pom.getLocation();
if(pomFile == null) {
return ProjectRegistryManager.toJavaIoFile(pom);
}
if(!POM_EXTENSION.equals(extension)) {
kwin marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -94,12 +94,13 @@ protected File resolveAsEclipseProject(String groupId, String artifactId, String
if(location != null) {
IResource res = root.findMember(location);
if(res != null) {
file = res.getLocation();
return res.getLocation().toFile();
}
}
return null;
} else {
return pomFile.toFile();
}

return file.toFile();
}

return null;
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.m2e.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.m2e.feature"
label="%featureName"
version="2.6.0.qualifier"
version="2.6.1.qualifier"
provider-name="%providerName"
plugin="org.eclipse.m2e.core"
license-feature="org.eclipse.license"
Expand Down
Loading