Skip to content

[MNG-8687] Restore ability to run on JIMFS #2256

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

Merged
cstamas merged 1 commit into from
Apr 14, 2025
Merged

[MNG-8687] Restore ability to run on JIMFS #2256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions ...at/maven-model-builder/src/main/java/org/apache/maven/model/building/FileModelSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

import java.io.File;
import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;

import org.apache.maven.building.FileSource;

Expand All @@ -40,6 +42,10 @@ public FileModelSource(File pomFile) {
super(pomFile);
}

public FileModelSource(Path pomFile) {
super(pomFile);
}

/**
*
* @return the file of this source
Expand All @@ -55,15 +61,15 @@ public File getPomFile() {
public ModelSource2 getRelatedSource(String relPath) {
relPath = relPath.replace('\\', File.separatorChar).replace('/', File.separatorChar);

File relatedPom = new File(getFile().getParentFile(), relPath);
Path relatedPom = getPath().getParent().resolve(relPath);

if (relatedPom.isDirectory()) {
if (Files.isDirectory(relatedPom)) {
// TODO figure out how to reuse ModelLocator.locatePom(File) here
relatedPom = new File(relatedPom, "pom.xml");
relatedPom = relatedPom.resolve("pom.xml");
}

if (relatedPom.isFile() && relatedPom.canRead()) {
return new FileModelSource(new File(relatedPom.toURI().normalize()));
if (Files.isRegularFile(relatedPom) && Files.isReadable(relatedPom)) {
return new FileModelSource(relatedPom.normalize());
}

return null;
Expand Down
4 changes: 2 additions & 2 deletions ...ver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.maven.repository.internal;

import java.io.File;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
Expand Down Expand Up @@ -161,7 +161,7 @@ public ModelSource resolveModel(String groupId, String artifactId, String versio
throw new UnresolvableModelException(e.getMessage(), groupId, artifactId, version, e);
}

File pomFile = pomArtifact.getFile();
Path pomFile = pomArtifact.getPath();

return new FileModelSource(pomFile);
}
Expand Down