Extended support for snapshot policy for resolver in Maven Projects

Author: fluxxBot

common/build/buildinfoproperties.go

@@ -45,6 +45,9 @@ const Repo = "repo"
 const SnapshotRepo = "snapshotRepo"
 const ReleaseRepo = "releaseRepo"
 
+const EnableSnapshots = "enableSnapshots"
+const SnapshotsUpdatePolicy = "snapshotsUpdatePolicy"
+
 const ServerId = "serverId"
 const Url = "url"
 const Username = "username"
@@ -123,6 +126,8 @@ var mavenConfigMapping = map[string]string{
 	"buildInfoConfig.artifactoryResolutionEnabled":      "buildInfoConfig.artifactoryResolutionEnabled",
 	"resolve.repoKey":                          ResolverPrefix + ReleaseRepo,
 	"resolve.downSnapshotRepoKey":              ResolverPrefix + SnapshotRepo,
+	"resolve.snapshots.enabled":                ResolverPrefix + EnableSnapshots,
+	"resolve.snapshots.updatePolicy":           ResolverPrefix + SnapshotsUpdatePolicy,
 	"publish.repoKey":                          DeployerPrefix + ReleaseRepo,
 	"publish.snapshot.repoKey":                 DeployerPrefix + SnapshotRepo,
 	"publish.includePatterns":                  DeployerPrefix + IncludePatterns,

common/commands/configfile.go

@@ -39,6 +39,8 @@ const (
 	deploymentSnapshotsRepo = "repo-deploy-snapshots"
 	includePatterns         = "include-patterns"
 	excludePatterns         = "exclude-patterns"
+	enableSnapshots         = "enable-snapshots"
+	snapshotsUpdatePolicy   = "snapshots-update-policy"
 
 	// Gradle flags
 	usesPlugin          = "uses-plugin"
@@ -251,14 +253,20 @@ func WithDeployerRepo(repoId string) ConfigOption {
 // Populate Maven related configuration from cli flags
 func (configFile *ConfigFile) populateMavenConfigFromFlags(c *cli.Context) {
 	configFile.Resolver.SnapshotRepo = c.String(resolutionSnapshotsRepo)
+	// set to false only when user explicitly sets it
+	configFile.Resolver.EnableSnapshots = true
+	if c.IsSet(enableSnapshots) {
+		configFile.Resolver.EnableSnapshots = c.Bool(enableSnapshots)
+	}
+	configFile.Resolver.SnapshotsUpdatePolicy = c.String(snapshotsUpdatePolicy)
 	configFile.Resolver.ReleaseRepo = c.String(resolutionReleasesRepo)
 	configFile.Deployer.SnapshotRepo = c.String(deploymentSnapshotsRepo)
 	configFile.Deployer.ReleaseRepo = c.String(deploymentReleasesRepo)
 	configFile.Deployer.IncludePatterns = c.String(includePatterns)
 	configFile.Deployer.ExcludePatterns = c.String(excludePatterns)
 	configFile.UseWrapper = c.Bool(useWrapper)
 	configFile.Interactive = configFile.Interactive && !isAnyFlagSet(c, resolutionSnapshotsRepo, resolutionReleasesRepo,
-		deploymentSnapshotsRepo, deploymentReleasesRepo, includePatterns, excludePatterns)
+		enableSnapshots, snapshotsUpdatePolicy, deploymentSnapshotsRepo, deploymentReleasesRepo, includePatterns, excludePatterns)
 }
 
 func WithResolverSnapshotRepo(repoId string) ConfigOption {

common/project/projectconfig.go

@@ -96,17 +96,19 @@ func (mre *MissingResolverErr) Error() string {
 }
 
 type Repository struct {
-	Repo             string `yaml:"repo,omitempty"`
-	ServerId         string `yaml:"serverId,omitempty"`
-	SnapshotRepo     string `yaml:"snapshotRepo,omitempty"`
-	ReleaseRepo      string `yaml:"releaseRepo,omitempty"`
-	DeployMavenDesc  bool   `yaml:"deployMavenDescriptors,omitempty"`
-	DeployIvyDesc    bool   `yaml:"deployIvyDescriptors,omitempty"`
-	IvyPattern       string `yaml:"ivyPattern,omitempty"`
-	ArtifactsPattern string `yaml:"artifactPattern,omitempty"`
-	NugetV2          bool   `yaml:"nugetV2,omitempty"`
-	IncludePatterns  string `yaml:"includePatterns,omitempty"`
-	ExcludePatterns  string `yaml:"excludePatterns,omitempty"`
+	Repo                  string `yaml:"repo,omitempty"`
+	ServerId              string `yaml:"serverId,omitempty"`
+	SnapshotRepo          string `yaml:"snapshotRepo,omitempty"`
+	EnableSnapshots       bool   `yaml:"enableSnapshots"`
+	SnapshotsUpdatePolicy string `yaml:"snapshotsUpdatePolicy,omitempty"`
+	ReleaseRepo           string `yaml:"releaseRepo,omitempty"`
+	DeployMavenDesc       bool   `yaml:"deployMavenDescriptors,omitempty"`
+	DeployIvyDesc         bool   `yaml:"deployIvyDescriptors,omitempty"`
+	IvyPattern            string `yaml:"ivyPattern,omitempty"`
+	ArtifactsPattern      string `yaml:"artifactPattern,omitempty"`
+	NugetV2               bool   `yaml:"nugetV2,omitempty"`
+	IncludePatterns       string `yaml:"includePatterns,omitempty"`
+	ExcludePatterns       string `yaml:"excludePatterns,omitempty"`
 }
 
 type RepositoryConfig struct {