Skip to content

Commit 20150b2

Browse files
committed
Force local checksum mode on validate
1 parent c418ee3 commit 20150b2

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,19 @@ protected AbstractChecksumCalculator getChecksumCalculator() throws MojoExecutio
9393
}
9494

9595
protected AbstractChecksumCalculator getChecksumCalculator(Config config) throws MojoExecutionException {
96+
return getChecksumCalculator(config, false);
97+
}
98+
99+
protected AbstractChecksumCalculator getChecksumCalculator(Config config, boolean forceLocalChecksumMode) throws MojoExecutionException {
96100
ProjectBuildingRequest artifactBuildingRequest = newResolveArtifactProjectBuildingRequest();
97101
ProjectBuildingRequest pluginBuildingRequest = newResolvePluginProjectBuildingRequest();
98102

99-
switch (checksumModeDeprecation(config.getChecksumMode())) {
103+
String checksumMode = checksumModeDeprecation(config.getChecksumMode());
104+
if (forceLocalChecksumMode) {
105+
checksumMode = "local";
106+
}
107+
108+
switch (checksumMode) {
100109
case "local":
101110
return new FileSystemChecksumCalculator(
102111
dependencyResolver,
@@ -107,7 +116,7 @@ protected AbstractChecksumCalculator getChecksumCalculator(Config config) throws
107116
return new RemoteChecksumCalculator(
108117
config.getChecksumAlgorithm(), artifactBuildingRequest, pluginBuildingRequest);
109118
default:
110-
throw new MojoExecutionException("Invalid checksum mode: " + config.getChecksumMode());
119+
throw new MojoExecutionException("Invalid checksum mode: " + checksumMode);
111120
}
112121
}
113122

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void execute() throws MojoExecutionException {
4545
getLog().warn("No config was found in the lock file. Using default config.");
4646
}
4747
MetaData metaData = new MetaData(environment, config);
48-
AbstractChecksumCalculator checksumCalculator = getChecksumCalculator(config);
48+
AbstractChecksumCalculator checksumCalculator = getChecksumCalculator(config, true);
4949
LockFile lockFileFromProject = LockFileFacade.generateLockFileFromProject(
5050
session, project, dependencyCollectorBuilder, checksumCalculator, metaData);
5151
if (!Objects.equals(lockFileFromFile.getEnvironment(), lockFileFromProject.getEnvironment())) {

0 commit comments

Comments
 (0)