From 20150b24650281fbadea132f15ef00d9d884dcc8 Mon Sep 17 00:00:00 2001 From: Elias Lundell Date: Thu, 31 Jul 2025 15:23:18 +0200 Subject: [PATCH 1/2] Force local checksum mode on validate --- .../maven_lockfile/AbstractLockfileMojo.java | 13 +++++++++++-- .../maven_lockfile/ValidateChecksumMojo.java | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java index a546bedf3..f22b4355e 100644 --- a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java +++ b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java @@ -93,10 +93,19 @@ protected AbstractChecksumCalculator getChecksumCalculator() throws MojoExecutio } protected AbstractChecksumCalculator getChecksumCalculator(Config config) throws MojoExecutionException { + return getChecksumCalculator(config, false); + } + + protected AbstractChecksumCalculator getChecksumCalculator(Config config, boolean forceLocalChecksumMode) throws MojoExecutionException { ProjectBuildingRequest artifactBuildingRequest = newResolveArtifactProjectBuildingRequest(); ProjectBuildingRequest pluginBuildingRequest = newResolvePluginProjectBuildingRequest(); - switch (checksumModeDeprecation(config.getChecksumMode())) { + String checksumMode = checksumModeDeprecation(config.getChecksumMode()); + if (forceLocalChecksumMode) { + checksumMode = "local"; + } + + switch (checksumMode) { case "local": return new FileSystemChecksumCalculator( dependencyResolver, @@ -107,7 +116,7 @@ protected AbstractChecksumCalculator getChecksumCalculator(Config config) throws return new RemoteChecksumCalculator( config.getChecksumAlgorithm(), artifactBuildingRequest, pluginBuildingRequest); default: - throw new MojoExecutionException("Invalid checksum mode: " + config.getChecksumMode()); + throw new MojoExecutionException("Invalid checksum mode: " + checksumMode); } } diff --git a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/ValidateChecksumMojo.java b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/ValidateChecksumMojo.java index 595dd5278..da3732e1e 100644 --- a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/ValidateChecksumMojo.java +++ b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/ValidateChecksumMojo.java @@ -45,7 +45,7 @@ public void execute() throws MojoExecutionException { getLog().warn("No config was found in the lock file. Using default config."); } MetaData metaData = new MetaData(environment, config); - AbstractChecksumCalculator checksumCalculator = getChecksumCalculator(config); + AbstractChecksumCalculator checksumCalculator = getChecksumCalculator(config, true); LockFile lockFileFromProject = LockFileFacade.generateLockFileFromProject( session, project, dependencyCollectorBuilder, checksumCalculator, metaData); if (!Objects.equals(lockFileFromFile.getEnvironment(), lockFileFromProject.getEnvironment())) { From ec15b5912fa78e6849acb30da0fa90690df44bd3 Mon Sep 17 00:00:00 2001 From: LogFlames <36220731+LogFlames@users.noreply.github.com> Date: Thu, 31 Jul 2025 13:25:19 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20Update=20Documentation=20wit?= =?UTF-8?q?h=20current=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chains_project/maven_lockfile/AbstractLockfileMojo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java index f22b4355e..599e3b522 100644 --- a/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java +++ b/maven_plugin/src/main/java/io/github/chains_project/maven_lockfile/AbstractLockfileMojo.java @@ -96,7 +96,8 @@ protected AbstractChecksumCalculator getChecksumCalculator(Config config) throws return getChecksumCalculator(config, false); } - protected AbstractChecksumCalculator getChecksumCalculator(Config config, boolean forceLocalChecksumMode) throws MojoExecutionException { + protected AbstractChecksumCalculator getChecksumCalculator(Config config, boolean forceLocalChecksumMode) + throws MojoExecutionException { ProjectBuildingRequest artifactBuildingRequest = newResolveArtifactProjectBuildingRequest(); ProjectBuildingRequest pluginBuildingRequest = newResolvePluginProjectBuildingRequest();