Skip to content

Commit bf3dff5

Browse files
committed
Use baseVersion
1 parent 03827ee commit bf3dff5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/LockFileFacade.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,11 @@ private static Set<io.github.chains_project.maven_lockfile.graph.DependencyNode>
222222
String groupPath = pluginArtifact.getGroupId().replace(".", "/");
223223
String artifactId = pluginArtifact.getArtifactId();
224224
String version = pluginArtifact.getVersion();
225+
String baseVersion = pluginArtifact.getBaseVersion();
225226
String pomFileName = artifactId + "-" + version + ".pom";
226227

227228
Path localPomPath =
228-
Paths.get(localRepoBase.getAbsolutePath(), groupPath, artifactId, version, pomFileName);
229+
Paths.get(localRepoBase.getAbsolutePath(), groupPath, artifactId, baseVersion, pomFileName);
229230
if (Files.exists(localPomPath)) {
230231
pluginPomFile = localPomPath.toFile();
231232
} else {

maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/checksum/FileSystemChecksumCalculator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ private Optional<RepositoryInformation> getResolvedFieldInternal(
150150

151151
String groupId = artifact.getGroupId().replace(".", "/");
152152
String artifactId = artifact.getArtifactId();
153-
String version = artifact.getVersion();
153+
String baseVersion = artifact.getBaseVersion();
154154

155155
String url = remoteRepository.get().getUrl().replaceAll("/$", "") + "/" + groupId + "/" + artifactId + "/"
156-
+ version + "/" + target;
156+
+ baseVersion + "/" + target;
157157

158158
return Optional.of(new RepositoryInformation(ResolvedUrl.of(url), RepositoryId.of(repository)));
159159
} catch (Exception e) {

0 commit comments

Comments
 (0)