olamy commented on code in PR #171:
URL:
https://github.com/apache/maven-build-cache-extension/pull/171#discussion_r1713561956
##########
src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java:
##########
@@ -684,51 +804,58 @@ private SortedMap<String, String>
getMutableDependenciesHashes(String keyPrefix,
projectInputCalculator.calculateInput(dependencyProject).getChecksum();
} else // this is a snapshot dependency
{
- DigestItem resolved =
resolveArtifact(repoSystem.createDependencyArtifact(dependency), false);
+ DigestItem resolved = null;
+ try {
+ resolved = resolveArtifact(dependency);
+ } catch (ArtifactResolutionException |
InvalidVersionSpecificationException e) {
+ throw new IOException(e);
+ }
projectHash = resolved.getHash();
}
result.put(
- keyPrefix +
KeyUtils.getVersionlessArtifactKey(repoSystem.createDependencyArtifact(dependency)),
- projectHash);
+ keyPrefix +
KeyUtils.getVersionlessArtifactKey(createDependencyArtifact(dependency)),
projectHash);
}
return result;
}
@Nonnull
- private DigestItem resolveArtifact(final Artifact dependencyArtifact,
boolean isOffline) throws IOException {
- ArtifactResolutionRequest request = new ArtifactResolutionRequest()
- .setArtifact(dependencyArtifact)
- .setResolveRoot(true)
- .setResolveTransitively(false)
- .setLocalRepository(session.getLocalRepository())
- .setRemoteRepositories(project.getRemoteArtifactRepositories())
- .setOffline(session.isOffline() || isOffline)
- .setForceUpdate(session.getRequest().isUpdateSnapshots())
- .setServers(session.getRequest().getServers())
- .setMirrors(session.getRequest().getMirrors())
- .setProxies(session.getRequest().getProxies());
-
- final ArtifactResolutionResult result = repoSystem.resolve(request);
-
- if (!result.isSuccess()) {
+ private DigestItem resolveArtifact(final Dependency dependency)
+ throws IOException, ArtifactResolutionException,
InvalidVersionSpecificationException {
+
+ org.eclipse.aether.artifact.Artifact dependencyArtifact = new
org.eclipse.aether.artifact.DefaultArtifact(
+ dependency.getGroupId(),
+ dependency.getArtifactId(),
+ dependency.getClassifier(),
+ null,
+ dependency.getVersion(),
+ new DefaultArtifactType(dependency.getType()));
+ ArtifactRequest artifactRequest = new
ArtifactRequest().setArtifact(dependencyArtifact);
+
+ ArtifactResult result =
artifactResolver.resolveArtifact(session.getRepositorySession(),
artifactRequest);
Review Comment:
fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@maven.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
