Support Resolver 2.x update policy control via CLI

maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java

@@ -140,6 +140,10 @@ public class DefaultMavenExecutionRequest implements MavenExecutionRequest {
 
     private boolean updateSnapshots = false;
 
+    private String artifactsUpdatePolicy = null;
+
+    private String metadataUpdatePolicy = null;
+
     private List<ArtifactRepository> remoteRepositories;
 
     private List<ArtifactRepository> pluginArtifactRepositories;
@@ -201,11 +205,13 @@ public static MavenExecutionRequest copy(MavenExecutionRequest original) {
         copy.setLoggingLevel(original.getLoggingLevel());
         copy.setGlobalChecksumPolicy(original.getGlobalChecksumPolicy());
         copy.setUpdateSnapshots(original.isUpdateSnapshots());
+        copy.setNoSnapshotUpdates(original.isNoSnapshotUpdates());
+        copy.setArtifactsUpdatePolicy(original.getArtifactsUpdatePolicy());
+        copy.setMetadataUpdatePolicy(original.getMetadataUpdatePolicy());
         copy.setRemoteRepositories(original.getRemoteRepositories());
         copy.setPluginArtifactRepositories(original.getPluginArtifactRepositories());
         copy.setRepositoryCache(original.getRepositoryCache());
         copy.setWorkspaceReader(original.getWorkspaceReader());
-        copy.setNoSnapshotUpdates(original.isNoSnapshotUpdates());
         copy.setExecutionListener(original.getExecutionListener());
         copy.setUseLegacyLocalRepository(original.isUseLegacyLocalRepository());
         copy.setBuilderId(original.getBuilderId());
@@ -403,6 +409,28 @@ public boolean isNoSnapshotUpdates() {
         return noSnapshotUpdates;
     }
 
+    @Override
+    public MavenExecutionRequest setArtifactsUpdatePolicy(String policy) {
+        this.artifactsUpdatePolicy = policy;
+        return this;
+    }
+
+    @Override
+    public String getArtifactsUpdatePolicy() {
+        return artifactsUpdatePolicy;
+    }
+
+    @Override
+    public MavenExecutionRequest setMetadataUpdatePolicy(String policy) {
+        this.metadataUpdatePolicy = policy;
+        return this;
+    }
+
+    @Override
+    public String getMetadataUpdatePolicy() {
+        return metadataUpdatePolicy;
+    }
+
     @Override
     public String getGlobalChecksumPolicy() {
         return globalChecksumPolicy;

maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java

@@ -219,6 +219,28 @@ public interface MavenExecutionRequest {
 
     boolean isNoSnapshotUpdates();
 
+    // 3.10.x+ artifact and metadata policies
+
+    /**
+     * @since 3.10.0
+     */
+    MavenExecutionRequest setArtifactsUpdatePolicy(String policy);
+
+    /**
+     * @since 3.10.0
+     */
+    String getArtifactsUpdatePolicy();
+
+    /**
+     * @since 3.10.0
+     */
+    MavenExecutionRequest setMetadataUpdatePolicy(String policy);
+
+    /**
+     * @since 3.10.0
+     */
+    String getMetadataUpdatePolicy();
+
     // Checksum policy
     MavenExecutionRequest setGlobalChecksumPolicy(String globalChecksumPolicy);
 

maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java

@@ -212,12 +212,24 @@ public RepositorySystemSession.SessionBuilder newRepositorySession(MavenExecutio
 
         mainSessionBuilder.setOffline(request.isOffline());
         mainSessionBuilder.setChecksumPolicy(request.getGlobalChecksumPolicy());
-        if (request.isNoSnapshotUpdates()) {
-            mainSessionBuilder.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_NEVER);
-        } else if (request.isUpdateSnapshots()) {
-            mainSessionBuilder.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS);
+
+        if (request.getArtifactsUpdatePolicy() == null && request.getMetadataUpdatePolicy() == null) {
+            // we go "old" way
+            if (request.isNoSnapshotUpdates()) {
+                mainSessionBuilder.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_NEVER);
+            } else if (request.isUpdateSnapshots()) {
+                mainSessionBuilder.setUpdatePolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS);
+            } else {
+                mainSessionBuilder.setUpdatePolicy(null);
+            }
         } else {
-            mainSessionBuilder.setUpdatePolicy(null);
+            // we go "new" way
+            if (request.getArtifactsUpdatePolicy() != null) {
+                mainSessionBuilder.setArtifactUpdatePolicy(request.getArtifactsUpdatePolicy());
+            }
+            if (request.getMetadataUpdatePolicy() != null) {
+                mainSessionBuilder.setMetadataUpdatePolicy(request.getMetadataUpdatePolicy());
+            }
         }
 
         int errorPolicy = 0;

maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java

@@ -109,7 +109,11 @@ public class CLIManager {
 
     public static final String IGNORE_TRANSITIVE_REPOSITORIES = "itr";
 
-    private static final String RAW_STREAMS = "raw-streams";
+    public static final String RAW_STREAMS = "raw-streams";
+
+    public static final String ARTIFACTS_UPDATE_POLICY = "artifacts-update-policy";
+
+    public static final String METADATA_UPDATE_POLICY = "metadata-update-policy";
 
     protected Options options;
 
@@ -269,6 +273,16 @@ public CLIManager() {
                 .longOpt("ignore-transitive-repositories")
                 .desc("If set, Maven will ignore remote repositories introduced by transitive dependencies.")
                 .build());
+        options.addOption(Option.builder()
+                .longOpt(ARTIFACTS_UPDATE_POLICY)
+                .hasArg(true)
+                .desc("The update policy to apply onto artifacts ('always', 'daily', 'never')")
+                .build());
+        options.addOption(Option.builder()
+                .longOpt(METADATA_UPDATE_POLICY)
+                .hasArg(true)
+                .desc("The update policy to apply onto metadata ('always', 'daily', 'never')")
+                .build());
 
         // Adding this back in for compatibility with the verifier that hard codes this option.
         options.addOption(Option.builder("npr")

maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java

@@ -113,6 +113,7 @@
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.eclipse.aether.DefaultRepositoryCache;
+import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.transfer.TransferListener;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
@@ -1316,6 +1317,23 @@ private MavenExecutionRequest populateRequest(CliRequest cliRequest, MavenExecut
             noSnapshotUpdates = true;
         }
 
+        boolean updateSnapshots = false;
+
+        if (commandLine.hasOption(CLIManager.UPDATE_SNAPSHOTS)) {
+            updateSnapshots = true;
+        }
+
+        String artifactsUpdatePolicy = null;
+        String metadataUpdatePolicy = null;
+        if (commandLine.hasOption(CLIManager.ARTIFACTS_UPDATE_POLICY)) {
+            artifactsUpdatePolicy = commandLine.getOptionValue(
+                    CLIManager.ARTIFACTS_UPDATE_POLICY, RepositoryPolicy.UPDATE_POLICY_ALWAYS);
+        }
+        if (commandLine.hasOption(CLIManager.METADATA_UPDATE_POLICY)) {
+            metadataUpdatePolicy = commandLine.getOptionValue(
+                    CLIManager.METADATA_UPDATE_POLICY, RepositoryPolicy.UPDATE_POLICY_ALWAYS);
+        }
+
         // ----------------------------------------------------------------------
         //
         // ----------------------------------------------------------------------
@@ -1343,12 +1361,6 @@ private MavenExecutionRequest populateRequest(CliRequest cliRequest, MavenExecut
             request.setOffline(true);
         }
 
-        boolean updateSnapshots = false;
-
-        if (commandLine.hasOption(CLIManager.UPDATE_SNAPSHOTS)) {
-            updateSnapshots = true;
-        }
-
         String globalChecksumPolicy = null;
 
         if (commandLine.hasOption(CLIManager.CHECKSUM_FAILURE_POLICY)) {
@@ -1425,6 +1437,8 @@ private MavenExecutionRequest populateRequest(CliRequest cliRequest, MavenExecut
                 .setTransferListener(transferListener) // default: batch mode which goes along with interactive
                 .setUpdateSnapshots(updateSnapshots) // default: false
                 .setNoSnapshotUpdates(noSnapshotUpdates) // default: false
+                .setArtifactsUpdatePolicy(artifactsUpdatePolicy) // default: null
+                .setMetadataUpdatePolicy(metadataUpdatePolicy) // default: null
                 .setGlobalChecksumPolicy(globalChecksumPolicy) // default: warn
                 .setMultiModuleProjectDirectory(cliRequest.multiModuleProjectDirectory);