diff options
Diffstat (limited to 'vid-app-common')
5 files changed, 5 insertions, 8 deletions
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml index 7f2b27c9f..78d9af771 100755 --- a/vid-app-common/pom.xml +++ b/vid-app-common/pom.xml @@ -9,7 +9,7 @@ inherit from a parent maven module. --> <groupId>org.onap.vid</groupId> <artifactId>vid-app-common</artifactId> - <version>5.0.3-SNAPSHOT</version> + <version>6.0.0-SNAPSHOT</version> <packaging>war</packaging> <name>VID Common</name> <description>VID Common code for opensource version</description> diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt index 2c50e03cd..8c769d68d 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt +++ b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt @@ -222,11 +222,6 @@ abstract class ResourceCommand( else -> InternalState.IN_PROGRESS } - InternalState.REPLACE_MYSELF -> when (jobStatus) { - JobStatus.IN_PROGRESS -> InternalState.REPLACE_MYSELF - else -> InternalState.IN_PROGRESS - } - InternalState.IN_PROGRESS -> { when { jobStatus != JobStatus.COMPLETED -> InternalState.IN_PROGRESS diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java index 00d8424d1..7384c97e2 100644 --- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java +++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java @@ -78,6 +78,7 @@ public enum Features implements Feature { FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG, FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT, FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH, + FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE, ; diff --git a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties index ff542d012..db2ff8e97 100644 --- a/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties +++ b/vid-app-common/src/main/webapp/WEB-INF/conf/dev.features.properties @@ -35,3 +35,4 @@ FLAG_1902_VNF_GROUPING = true FLAG_DISABLE_HOMING = true FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH=false FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG = false +FLAG_1911_INSTANTIATION_ORDER_IN_ASYNC_ALACARTE = false diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties index 70310a855..19ee1fbf4 100755 --- a/vid-app-common/version.properties +++ b/vid-app-common/version.properties @@ -2,9 +2,9 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -major=5 +major=6 minor=0 -patch=3 +patch=0 base_version=${major}.${minor}.${patch} |