diff --git a/documentation/src/main/markdown/currentreleasenotes.md b/documentation/src/main/markdown/currentreleasenotes.md index 227ac70740..d63ac1efea 100644 --- a/documentation/src/main/markdown/currentreleasenotes.md +++ b/documentation/src/main/markdown/currentreleasenotes.md @@ -17,6 +17,7 @@ ### Changed features * npm version 1 package-lock.json and npm-shrinkwrap.json file parsing has been restored. +* The `detect.project.codelocation.unmap` property has been deprecated. ### Resolved issues diff --git a/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java b/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java index 2636a93ee7..c125edaf3c 100644 --- a/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java +++ b/src/main/java/com/blackduck/integration/detect/configuration/DetectProperties.java @@ -1404,14 +1404,6 @@ private DetectProperties() { .setCategory(DetectCategory.Advanced) .build(); - public static final BooleanProperty DETECT_PROJECT_CODELOCATION_UNMAP = - BooleanProperty.newBuilder("detect.project.codelocation.unmap", false) - .setInfo("Unmap All Other Scans for Project", DetectPropertyFromVersion.VERSION_4_0_0) - .setHelp("If set to true, unmaps all other scans mapped to the project version produced by the current run of Detect.") - .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) - .setCategory(DetectCategory.Advanced) - .build(); - public static final NullableStringProperty DETECT_PROJECT_DESCRIPTION = NullableStringProperty.newBuilder("detect.project.description") .setInfo("Project Description", DetectPropertyFromVersion.VERSION_4_0_0) @@ -1855,6 +1847,18 @@ private DetectProperties() { //#region Deprecated Properties + public static final BooleanProperty DETECT_PROJECT_CODELOCATION_UNMAP = + BooleanProperty.newBuilder("detect.project.codelocation.unmap", false) + .setInfo("Unmap All Other Scans for Project", DetectPropertyFromVersion.VERSION_4_0_0) + .setHelp("If set to true, unmaps all other scans mapped to the project version produced by the current run of Detect.") + .setGroups(DetectGroup.PROJECT, DetectGroup.PROJECT_SETTING) + .setCategory(DetectCategory.Advanced) + .setDeprecated( + "This property has been deprecated.", + DetectMajorVersion.ELEVEN + ) + .build(); + // Can't take in the DetectProperty due to an illegal forward reference :( private static String createTypeFilterHelpText(String exclusionTypePlural) { return String.format("Set this value to indicate which %s Detect should exclude from the BOM.", exclusionTypePlural); diff --git a/src/main/java/com/blackduck/integration/detect/configuration/enumeration/DetectMajorVersion.java b/src/main/java/com/blackduck/integration/detect/configuration/enumeration/DetectMajorVersion.java index 0a90627848..16d90fe8aa 100644 --- a/src/main/java/com/blackduck/integration/detect/configuration/enumeration/DetectMajorVersion.java +++ b/src/main/java/com/blackduck/integration/detect/configuration/enumeration/DetectMajorVersion.java @@ -13,6 +13,7 @@ public class DetectMajorVersion extends ProductMajorVersion { public static final DetectMajorVersion EIGHT = new DetectMajorVersion(8); public static final DetectMajorVersion NINE = new DetectMajorVersion(9); public static final DetectMajorVersion TEN = new DetectMajorVersion(10); + public static final DetectMajorVersion ELEVEN = new DetectMajorVersion(11); public DetectMajorVersion(Integer intValue) { super(intValue);