fixing errors with merge
@@ -671,7 +671,7 @@ public class DetectConfiguration {
@DefaultValue("External")
@HelpGroup(primary = GROUP_PROJECT_INFO, additional = { SEARCH_GROUP_PROJECT })
@HelpDescription("An override for the Project Version distribution")
- @AcceptableValues(value = { "EXTERNAL", "SAAS", "INTERNAL", "OPENSOURCE" }, caseSensitive = false, strict = false, isCommaSeparatedList = true)
+ @AcceptableValues(value = { "EXTERNAL", "SAAS", "INTERNAL", "OPENSOURCE" }, caseSensitive = false, strict = false)
private String projectVersionDistribution;
@Value("${detect.project.version.update:}")
@@ -684,7 +684,7 @@ public class DetectConfiguration {
@Value("${detect.policy.check.fail.on.severities:}")
@HelpGroup(primary = GROUP_POLICY_CHECK, additional = { SEARCH_GROUP_POLICY })
@HelpDescription("A comma-separated list of policy violation severities that will fail detect. If this is not set, detect will not fail due to policy violations.")
- @AcceptableValues(value = { "ALL", "BLOCKER", "CRITICAL", "MAJOR", "MINOR", "TRIVIAL" }, caseSensitive = false, strict = false)
+ @AcceptableValues(value = { "ALL", "BLOCKER", "CRITICAL", "MAJOR", "MINOR", "TRIVIAL" }, caseSensitive = false, strict = false, isCommaSeparatedList = true)
private String policyCheckFailOnSeverities;
@Value("${detect.gradle.inspector.version:}")
