diff --git a/.run/ComponentRegistryService (dev-fs).run.xml b/.run/ComponentRegistryService (dev-fs).run.xml index cd4e3dc..136f527 100644 --- a/.run/ComponentRegistryService (dev-fs).run.xml +++ b/.run/ComponentRegistryService (dev-fs).run.xml @@ -2,11 +2,6 @@ - + \ No newline at end of file diff --git a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/loader/EscrowConfigurationLoader.groovy b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/loader/EscrowConfigurationLoader.groovy index 8af7781..20e4143 100644 --- a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/loader/EscrowConfigurationLoader.groovy +++ b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/loader/EscrowConfigurationLoader.groovy @@ -271,6 +271,7 @@ class EscrowConfigurationLoader { final String clientCode = loadComponentClientCode(moduleConfigSection, componentDefaultConfiguration.clientCode) final String parentComponent = loadComponentParentComponent(moduleConfigSection, componentDefaultConfiguration.parentComponent) final Boolean releasesInDefaultBranch = loadReleasesInDefaultBranch(moduleConfigSection, componentDefaultConfiguration.releasesInDefaultBranch) + final Boolean solution = loadSolution(moduleConfigSection, componentDefaultConfiguration.solution) final String componentDisplayName = loadComponentDisplayName(moduleConfigSection, componentDefaultConfiguration.componentDisplayName) final String octopusVersion = loadVersion(moduleConfigSection, componentDefaultConfiguration.octopusVersion, LoaderInheritanceType.VERSION_RANGE.octopusVersionInherit) @@ -292,6 +293,7 @@ class EscrowConfigurationLoader { system: system, clientCode: clientCode, releasesInDefaultBranch: releasesInDefaultBranch, + solution: solution, parentComponent: parentComponent, jiraConfiguration: jiraConfiguration, buildConfiguration: buildConfiguration?.clone(), @@ -315,6 +317,7 @@ class EscrowConfigurationLoader { system: componentDefaultConfiguration.system, clientCode: componentDefaultConfiguration.clientCode, releasesInDefaultBranch: componentDefaultConfiguration.releasesInDefaultBranch, + solution: componentDefaultConfiguration.solution, parentComponent: componentDefaultConfiguration.parentComponent, buildFilePath: componentDefaultConfiguration.getBuildFilePath(), jiraConfiguration: componentDefaultConfiguration.jiraComponent, @@ -657,6 +660,11 @@ class EscrowConfigurationLoader { } } + @TypeChecked(TypeCheckingMode.SKIP) + private static boolean loadSolution(ConfigObject parentConfigObject, Boolean defaultSolution) { + return parentConfigObject.getOrDefault("solution", defaultSolution) + } + @TypeChecked(TypeCheckingMode.SKIP) private static loadComponentParentComponent(ConfigObject parentConfigObject, String defaultParentComponent){ if (parentConfigObject.containsKey("parentComponent")) { @@ -896,6 +904,7 @@ class EscrowConfigurationLoader { final String system = loadComponentSystem(componentConfigObject, defaultConfiguration.system) final String clientCode = loadComponentClientCode(componentConfigObject, defaultConfiguration.clientCode) final Boolean releasesInDefaultBranch = loadReleasesInDefaultBranch(componentConfigObject, defaultConfiguration.releasesInDefaultBranch) + final Boolean solution = loadSolution(componentConfigObject, defaultConfiguration.solution) final String parentComponent = loadComponentParentComponent(componentConfigObject, defaultConfiguration.parentComponent) final String octopusVersion = loadVersion(componentConfigObject, defaultConfiguration.octopusVersion, inheritanceType.octopusVersionInherit) @@ -909,6 +918,7 @@ class EscrowConfigurationLoader { system: system, clientCode: clientCode, releasesInDefaultBranch: releasesInDefaultBranch, + solution: solution, parentComponent: parentComponent, jiraComponent: jiraComponent, buildParameters: buildParameters, diff --git a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/DefaultConfigParameters.groovy b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/DefaultConfigParameters.groovy index d3fdcb6..5463cea 100644 --- a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/DefaultConfigParameters.groovy +++ b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/DefaultConfigParameters.groovy @@ -53,5 +53,7 @@ class DefaultConfigParameters { String octopusVersion Boolean releasesInDefaultBranch + + Boolean solution } diff --git a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/EscrowModuleConfig.groovy b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/EscrowModuleConfig.groovy index 91ae090..b5d84c0 100644 --- a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/EscrowModuleConfig.groovy +++ b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/model/EscrowModuleConfig.groovy @@ -22,7 +22,7 @@ import org.octopusden.octopus.releng.dto.JiraComponent @EqualsAndHashCode(includeFields = true, includes = ["buildSystem", "artifactIdPattern", "groupIdPattern",// "versionRange", "buildFilePath", "jiraConfiguration", "buildConfiguration", "deprecated", "vcsSettings", "distribution", "componentDisplayName", "componentOwner", "releaseManager", "securityChampion", "system", - "clientCode", "releasesInDefaultBranch", "parentComponent", "octopusVersion", "escrow", "productType"]) + "clientCode", "releasesInDefaultBranch", "solution", "parentComponent", "octopusVersion", "escrow", "productType"]) @ToString(includeFields = true) class EscrowModuleConfig { private BuildSystem buildSystem @@ -59,6 +59,8 @@ class EscrowModuleConfig { private Boolean releasesInDefaultBranch + private Boolean solution + private String parentComponent private String octopusVersion @@ -135,6 +137,14 @@ class EscrowModuleConfig { this.releasesInDefaultBranch = releasesInDefaultBranch } + Boolean getSolution() { + return solution + } + + void setSolution(Boolean solution) { + this.solution = solution + } + String getParentComponent() { return parentComponent } diff --git a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/EscrowConfigValidator.groovy b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/EscrowConfigValidator.groovy index 5c525ee..ae92bfa 100644 --- a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/EscrowConfigValidator.groovy +++ b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/EscrowConfigValidator.groovy @@ -98,6 +98,7 @@ class EscrowConfigValidator { validateSystem(moduleConfig, componentName) validateClientCode(moduleConfig, componentName) validateReleasesInDefaultBranch(moduleConfig, componentName) + validateSolution(moduleConfig, componentName) } } if (!hasErrors()) { @@ -403,6 +404,14 @@ class EscrowConfigValidator { } } + def validateSolution(EscrowModuleConfig moduleConfig, String component) { + def solution = moduleConfig.getSolution() + if (solution == null) { + // ToDo uncomment after default value is set +// registerError("solution is not specified in component '$component'") + } + } + /** * Validate component name. * @param componentName component name diff --git a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/GroovySlurperConfigValidator.groovy b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/GroovySlurperConfigValidator.groovy index 9190c82..c6a2213 100644 --- a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/GroovySlurperConfigValidator.groovy +++ b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/configuration/validation/GroovySlurperConfigValidator.groovy @@ -39,7 +39,7 @@ class GroovySlurperConfigValidator { 'teamcityReleaseConfigId', 'jiraProjectKey', 'jiraMajorVersionFormat', 'jiraReleaseVersionFormat', 'buildFilePath', 'deprecated', BRANCH, 'componentDisplayName', 'componentOwner', 'releaseManager', 'securityChampion', 'system', - 'clientCode', 'releasesInDefaultBranch', 'parentComponent', 'octopusVersion'] + 'clientCode', 'releasesInDefaultBranch', 'solution', 'parentComponent', 'octopusVersion'] static SUPPORTED_JIRA_ATTRIBUTES = ['projectKey', 'lineVersionFormat', 'majorVersionFormat', 'releaseVersionFormat', 'buildVersionFormat', "displayName", 'technical'] static SUPPORTED_BUILD_ATTRIBUTES = ['dependencies', 'javaVersion', 'mavenVersion', 'gradleVersion', 'requiredProject', 'systemProperties', 'projectVersion', 'requiredTools', 'buildTasks'] diff --git a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/resolvers/JiraParametersResolver.groovy b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/resolvers/JiraParametersResolver.groovy index 3c1d3f1..b9ca7e2 100644 --- a/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/resolvers/JiraParametersResolver.groovy +++ b/component-resolver-core/src/main/groovy/org.octopusden/octopus/escrow/resolvers/JiraParametersResolver.groovy @@ -178,6 +178,7 @@ class JiraParametersResolver implements IJiraParametersResolver { system: escrowModuleConfig.system, clientCode: escrowModuleConfig.clientCode, releasesInDefaultBranch: escrowModuleConfig.releasesInDefaultBranch, + solution: escrowModuleConfig.solution, parentComponent: escrowModuleConfig.parentComponent ) addJiraComponentVersionRange(projectKey, projectKeyToJiraComponentVersionRangeMap, enrichedModuleConfig, projectKey, componentName, versionNames) diff --git a/component-resolver-core/src/test/groovy/org/octopusden/octopus/escrow/resolvers/EscrowConfigurationLoaderTest.groovy b/component-resolver-core/src/test/groovy/org/octopusden/octopus/escrow/resolvers/EscrowConfigurationLoaderTest.groovy index 28d50b5..bc9df22 100644 --- a/component-resolver-core/src/test/groovy/org/octopusden/octopus/escrow/resolvers/EscrowConfigurationLoaderTest.groovy +++ b/component-resolver-core/src/test/groovy/org/octopusden/octopus/escrow/resolvers/EscrowConfigurationLoaderTest.groovy @@ -60,6 +60,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { securityChampion: "user", system: "CLASSIC", releasesInDefaultBranch: true, + solution: false, buildSystem: BuildSystem.MAVEN, artifactIdPattern: "builder", groupIdPattern: "io.bcomponent", @@ -161,6 +162,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { buildSystem: MAVEN, system: "NONE", releasesInDefaultBranch: true, + solution: false, artifactIdPattern: /[\w-]+/, groupIdPattern: "org.octopusden.octopus.bcomponent", versionRange: "[1.12.1-150,)", @@ -175,6 +177,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { buildSystem: BuildSystem.BS2_0, system: "NONE", releasesInDefaultBranch: true, + solution: false, groupIdPattern: "org.octopusden.octopus.bcomponent", artifactIdPattern: /[\w-]+/, versionRange: "(,1.12.1-150)", @@ -202,6 +205,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { buildSystem: MAVEN, system: "NONE", releasesInDefaultBranch: true, + solution: false, artifactIdPattern: /[\w-]+/, groupIdPattern: "org.octopusden.octopus.bcomponent", versionRange: "[1.12.1-151,)", @@ -227,6 +231,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { buildSystem: MAVEN, system: "NONE", releasesInDefaultBranch: true, + solution: false, artifactIdPattern: "test-cvs-maven-parent,test-cvs-maven-module1", groupIdPattern: "org.octopusden.octopus.bcomponent", versionRange: "(,0),[0,)", @@ -254,6 +259,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { buildSystem: BuildSystem.MAVEN, system: "NONE", releasesInDefaultBranch: true, + solution: false, artifactIdPattern: "test-cvs-maven-parent,test-cvs-maven-module1", groupIdPattern: "org.octopusden.octopus.bcomponent", versionRange: "(,0),[0,)", @@ -315,7 +321,8 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { releaseManager: "somereleasemanager", securityChampion: "somesecuritychampion", system: "CLASSIC", - releasesInDefaultBranch: false + releasesInDefaultBranch: false, + solution: true, ) assert expectedModuleConfig == modelConfiguration @@ -341,6 +348,7 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { securityChampion: "somesecuritychampion", system: "CLASSIC", releasesInDefaultBranch: false, + solution: true ) assert expectedModuleConfig == modelConfiguration @@ -361,7 +369,8 @@ class EscrowConfigurationLoaderTest extends GroovyTestCase { releaseManager: "anotherreleasemanager", securityChampion: "anothersecuritychampion", system: "CLASSIC,ALFA", - releasesInDefaultBranch: true + releasesInDefaultBranch: true, + solution: false ) assert expectedModuleConfig == modelConfiguration } diff --git a/component-resolver-core/src/test/resources/CREG-153/Defaults.groovy b/component-resolver-core/src/test/resources/CREG-153/Defaults.groovy index 9ae1fab..49a2e44 100644 --- a/component-resolver-core/src/test/resources/CREG-153/Defaults.groovy +++ b/component-resolver-core/src/test/resources/CREG-153/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/CREG-182/Defaults.groovy b/component-resolver-core/src/test/resources/CREG-182/Defaults.groovy index 9ae1fab..49a2e44 100644 --- a/component-resolver-core/src/test/resources/CREG-182/Defaults.groovy +++ b/component-resolver-core/src/test/resources/CREG-182/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/VersionInheritance.groovy b/component-resolver-core/src/test/resources/VersionInheritance.groovy index bb130ef..ca67b48 100644 --- a/component-resolver-core/src/test/resources/VersionInheritance.groovy +++ b/component-resolver-core/src/test/resources/VersionInheritance.groovy @@ -7,6 +7,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/allSettingsAreDefault.groovy b/component-resolver-core/src/test/resources/allSettingsAreDefault.groovy index b735b91..d3367f0 100644 --- a/component-resolver-core/src/test/resources/allSettingsAreDefault.groovy +++ b/component-resolver-core/src/test/resources/allSettingsAreDefault.groovy @@ -4,6 +4,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.CVS Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false } bcomponent { diff --git a/component-resolver-core/src/test/resources/allSettingsWithTcReleaseConfigId.groovy b/component-resolver-core/src/test/resources/allSettingsWithTcReleaseConfigId.groovy index b159399..8bc8654 100644 --- a/component-resolver-core/src/test/resources/allSettingsWithTcReleaseConfigId.groovy +++ b/component-resolver-core/src/test/resources/allSettingsWithTcReleaseConfigId.groovy @@ -4,6 +4,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.CVS Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false } bcomponent { diff --git a/component-resolver-core/src/test/resources/ambiguousJiraConfig.groovy b/component-resolver-core/src/test/resources/ambiguousJiraConfig.groovy index a8d687d..3d50baf 100644 --- a/component-resolver-core/src/test/resources/ambiguousJiraConfig.groovy +++ b/component-resolver-core/src/test/resources/ambiguousJiraConfig.groovy @@ -9,6 +9,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/ambiguousVCSConfig.groovy b/component-resolver-core/src/test/resources/ambiguousVCSConfig.groovy index 30eaebd..c102ca1 100644 --- a/component-resolver-core/src/test/resources/ambiguousVCSConfig.groovy +++ b/component-resolver-core/src/test/resources/ambiguousVCSConfig.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/app.groovy b/component-resolver-core/src/test/resources/app.groovy index 811f8be..d09a6ea 100644 --- a/component-resolver-core/src/test/resources/app.groovy +++ b/component-resolver-core/src/test/resources/app.groovy @@ -14,6 +14,7 @@ Tools { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/artifactIdWithWhitespace.groovy b/component-resolver-core/src/test/resources/artifactIdWithWhitespace.groovy index 6d4f6a4..1f713ac 100644 --- a/component-resolver-core/src/test/resources/artifactIdWithWhitespace.groovy +++ b/component-resolver-core/src/test/resources/artifactIdWithWhitespace.groovy @@ -17,6 +17,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/artifactNameConflictConfig.groovy b/component-resolver-core/src/test/resources/artifactNameConflictConfig.groovy index f7a814e..275db4f 100644 --- a/component-resolver-core/src/test/resources/artifactNameConflictConfig.groovy +++ b/component-resolver-core/src/test/resources/artifactNameConflictConfig.groovy @@ -16,6 +16,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; versionRange = "(,)" diff --git a/component-resolver-core/src/test/resources/artifactVersionConflictConfig.groovy b/component-resolver-core/src/test/resources/artifactVersionConflictConfig.groovy index 3d17d5a..58ed3d2 100644 --- a/component-resolver-core/src/test/resources/artifactVersionConflictConfig.groovy +++ b/component-resolver-core/src/test/resources/artifactVersionConflictConfig.groovy @@ -10,6 +10,7 @@ DEFAULT_TAG = '$module-$version' Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false // repositoryType = MERCURIAL // buildSystem = MAVEN; // versionRange = "(,)" diff --git a/component-resolver-core/src/test/resources/bcomponent.groovy b/component-resolver-core/src/test/resources/bcomponent.groovy index 89de3cf..1dcf6e3 100644 --- a/component-resolver-core/src/test/resources/bcomponent.groovy +++ b/component-resolver-core/src/test/resources/bcomponent.groovy @@ -30,6 +30,7 @@ Tools { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/componentConfig.groovy b/component-resolver-core/src/test/resources/componentConfig.groovy index 686ec60..8a02964 100644 --- a/component-resolver-core/src/test/resources/componentConfig.groovy +++ b/component-resolver-core/src/test/resources/componentConfig.groovy @@ -9,6 +9,7 @@ final ALL_VERSIONS = "(,0),[0,)" Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/componentVersionFormatConfig.groovy b/component-resolver-core/src/test/resources/componentVersionFormatConfig.groovy index faa1604..e3c098f 100644 --- a/component-resolver-core/src/test/resources/componentVersionFormatConfig.groovy +++ b/component-resolver-core/src/test/resources/componentVersionFormatConfig.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/component_23.groovy b/component-resolver-core/src/test/resources/component_23.groovy index 076a471..4737d09 100644 --- a/component-resolver-core/src/test/resources/component_23.groovy +++ b/component-resolver-core/src/test/resources/component_23.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/config/componentConfig.groovy b/component-resolver-core/src/test/resources/config/componentConfig.groovy index 225df16..004328e 100644 --- a/component-resolver-core/src/test/resources/config/componentConfig.groovy +++ b/component-resolver-core/src/test/resources/config/componentConfig.groovy @@ -10,6 +10,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/deb-rpm/Defaults.groovy b/component-resolver-core/src/test/resources/deb-rpm/Defaults.groovy index 83f7aab..1f1a751 100644 --- a/component-resolver-core/src/test/resources/deb-rpm/Defaults.groovy +++ b/component-resolver-core/src/test/resources/deb-rpm/Defaults.groovy @@ -10,6 +10,7 @@ Defaults { buildSystem = MAVEN; system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = GIT tag = '$module-$version'; artifactId = ANY_ARTIFACT diff --git a/component-resolver-core/src/test/resources/defaultSettingsOfComponent.groovy b/component-resolver-core/src/test/resources/defaultSettingsOfComponent.groovy index 6eee717..dae6305 100644 --- a/component-resolver-core/src/test/resources/defaultSettingsOfComponent.groovy +++ b/component-resolver-core/src/test/resources/defaultSettingsOfComponent.groovy @@ -9,6 +9,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false tag = '$module-$version' artifactId = ANY_ARTIFACT } diff --git a/component-resolver-core/src/test/resources/experimental/Defaults.groovy b/component-resolver-core/src/test/resources/experimental/Defaults.groovy index 485a9dc..756a0e6 100644 --- a/component-resolver-core/src/test/resources/experimental/Defaults.groovy +++ b/component-resolver-core/src/test/resources/experimental/Defaults.groovy @@ -4,6 +4,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.MERCURIAL Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN tag = DEFAULT_TAG diff --git a/component-resolver-core/src/test/resources/ft-test-data/gradle/config/Defaults.groovy b/component-resolver-core/src/test/resources/ft-test-data/gradle/config/Defaults.groovy index 6238383..f5b5d81 100644 --- a/component-resolver-core/src/test/resources/ft-test-data/gradle/config/Defaults.groovy +++ b/component-resolver-core/src/test/resources/ft-test-data/gradle/config/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/ft-test-data/java8-test/config/Defaults.groovy b/component-resolver-core/src/test/resources/ft-test-data/java8-test/config/Defaults.groovy index d54962d..e8d1748 100644 --- a/component-resolver-core/src/test/resources/ft-test-data/java8-test/config/Defaults.groovy +++ b/component-resolver-core/src/test/resources/ft-test-data/java8-test/config/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/ft-test-data/legacy/moduleConfig.groovy b/component-resolver-core/src/test/resources/ft-test-data/legacy/moduleConfig.groovy index 30d3ace..1b7c4ed 100644 --- a/component-resolver-core/src/test/resources/ft-test-data/legacy/moduleConfig.groovy +++ b/component-resolver-core/src/test/resources/ft-test-data/legacy/moduleConfig.groovy @@ -21,6 +21,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/ft-test-data/multi-vcs/config/Defaults.groovy b/component-resolver-core/src/test/resources/ft-test-data/multi-vcs/config/Defaults.groovy index 908c202..d8b424d 100644 --- a/component-resolver-core/src/test/resources/ft-test-data/multi-vcs/config/Defaults.groovy +++ b/component-resolver-core/src/test/resources/ft-test-data/multi-vcs/config/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/ft-test-data/new/Defaults.groovy b/component-resolver-core/src/test/resources/ft-test-data/new/Defaults.groovy index 359d73d..3e75541 100644 --- a/component-resolver-core/src/test/resources/ft-test-data/new/Defaults.groovy +++ b/component-resolver-core/src/test/resources/ft-test-data/new/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/ft-test-data/system-config-test/config/Defaults.groovy b/component-resolver-core/src/test/resources/ft-test-data/system-config-test/config/Defaults.groovy index 6996d7e..9a20df6 100644 --- a/component-resolver-core/src/test/resources/ft-test-data/system-config-test/config/Defaults.groovy +++ b/component-resolver-core/src/test/resources/ft-test-data/system-config-test/config/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/invalid/invalidBS2_0VCSSettings.groovy b/component-resolver-core/src/test/resources/invalid/invalidBS2_0VCSSettings.groovy index 2487ee2..f97b8c3 100644 --- a/component-resolver-core/src/test/resources/invalid/invalidBS2_0VCSSettings.groovy +++ b/component-resolver-core/src/test/resources/invalid/invalidBS2_0VCSSettings.groovy @@ -13,6 +13,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/invalid/invalidSystem.groovy b/component-resolver-core/src/test/resources/invalid/invalidSystem.groovy index 2f0cfed..887bbd2 100644 --- a/component-resolver-core/src/test/resources/invalid/invalidSystem.groovy +++ b/component-resolver-core/src/test/resources/invalid/invalidSystem.groovy @@ -5,6 +5,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/invalid/invalidVersionRange.groovy b/component-resolver-core/src/test/resources/invalid/invalidVersionRange.groovy index 6aa3ab8..7c7135b 100644 --- a/component-resolver-core/src/test/resources/invalid/invalidVersionRange.groovy +++ b/component-resolver-core/src/test/resources/invalid/invalidVersionRange.groovy @@ -14,6 +14,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/invalid/mavenArtifactIntersection.groovy b/component-resolver-core/src/test/resources/invalid/mavenArtifactIntersection.groovy index 9a2bce7..5eaaf4c 100644 --- a/component-resolver-core/src/test/resources/invalid/mavenArtifactIntersection.groovy +++ b/component-resolver-core/src/test/resources/invalid/mavenArtifactIntersection.groovy @@ -17,6 +17,7 @@ ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = "$module-$version"; diff --git a/component-resolver-core/src/test/resources/invalid/noComponentOwnerInExplictDistributed.groovy b/component-resolver-core/src/test/resources/invalid/noComponentOwnerInExplictDistributed.groovy index fbbb17d..14ef6bc 100644 --- a/component-resolver-core/src/test/resources/invalid/noComponentOwnerInExplictDistributed.groovy +++ b/component-resolver-core/src/test/resources/invalid/noComponentOwnerInExplictDistributed.groovy @@ -6,6 +6,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/invalid/noProjectKey.groovy b/component-resolver-core/src/test/resources/invalid/noProjectKey.groovy index 7218b2b..833d321 100644 --- a/component-resolver-core/src/test/resources/invalid/noProjectKey.groovy +++ b/component-resolver-core/src/test/resources/invalid/noProjectKey.groovy @@ -6,6 +6,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/invalid/noReleaseManagerInExplicitDistributed.groovy b/component-resolver-core/src/test/resources/invalid/noReleaseManagerInExplicitDistributed.groovy index 2e58fd7..2dc8af1 100644 --- a/component-resolver-core/src/test/resources/invalid/noReleaseManagerInExplicitDistributed.groovy +++ b/component-resolver-core/src/test/resources/invalid/noReleaseManagerInExplicitDistributed.groovy @@ -6,6 +6,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/invalid/noSecurityChampionInExplicitDistributed.groovy b/component-resolver-core/src/test/resources/invalid/noSecurityChampionInExplicitDistributed.groovy index 66a8324..ca2db34 100644 --- a/component-resolver-core/src/test/resources/invalid/noSecurityChampionInExplicitDistributed.groovy +++ b/component-resolver-core/src/test/resources/invalid/noSecurityChampionInExplicitDistributed.groovy @@ -6,6 +6,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/invalid/sameMajorAndReleaseVersionFormat.groovy b/component-resolver-core/src/test/resources/invalid/sameMajorAndReleaseVersionFormat.groovy index 7bf2e34..e0b2e8f 100644 --- a/component-resolver-core/src/test/resources/invalid/sameMajorAndReleaseVersionFormat.groovy +++ b/component-resolver-core/src/test/resources/invalid/sameMajorAndReleaseVersionFormat.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.BuildSystem.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false } Tools { diff --git a/component-resolver-core/src/test/resources/invalid/unknownAttributeInVCSRoot.groovy b/component-resolver-core/src/test/resources/invalid/unknownAttributeInVCSRoot.groovy index c79d5b0..38c10a5 100644 --- a/component-resolver-core/src/test/resources/invalid/unknownAttributeInVCSRoot.groovy +++ b/component-resolver-core/src/test/resources/invalid/unknownAttributeInVCSRoot.groovy @@ -10,6 +10,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/invalid/wrongFormattedSystem.groovy b/component-resolver-core/src/test/resources/invalid/wrongFormattedSystem.groovy index 51815f2..2c95659 100644 --- a/component-resolver-core/src/test/resources/invalid/wrongFormattedSystem.groovy +++ b/component-resolver-core/src/test/resources/invalid/wrongFormattedSystem.groovy @@ -6,6 +6,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' diff --git a/component-resolver-core/src/test/resources/invalidJiraConfigAttribute.groovy b/component-resolver-core/src/test/resources/invalidJiraConfigAttribute.groovy index 2f21dbe..d6231e8 100644 --- a/component-resolver-core/src/test/resources/invalidJiraConfigAttribute.groovy +++ b/component-resolver-core/src/test/resources/invalidJiraConfigAttribute.groovy @@ -19,6 +19,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/invalidModuleConfig.groovy b/component-resolver-core/src/test/resources/invalidModuleConfig.groovy index 3710ef2..83a60de 100644 --- a/component-resolver-core/src/test/resources/invalidModuleConfig.groovy +++ b/component-resolver-core/src/test/resources/invalidModuleConfig.groovy @@ -17,6 +17,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; versionRange = "(,)" diff --git a/component-resolver-core/src/test/resources/invalidVcsPathConfig.groovy b/component-resolver-core/src/test/resources/invalidVcsPathConfig.groovy index dec658e..7a534a8 100644 --- a/component-resolver-core/src/test/resources/invalidVcsPathConfig.groovy +++ b/component-resolver-core/src/test/resources/invalidVcsPathConfig.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.MERCURIAL Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; } diff --git a/component-resolver-core/src/test/resources/moduleConfigWithParameters.groovy b/component-resolver-core/src/test/resources/moduleConfigWithParameters.groovy index 8252bf1..89b09ab 100644 --- a/component-resolver-core/src/test/resources/moduleConfigWithParameters.groovy +++ b/component-resolver-core/src/test/resources/moduleConfigWithParameters.groovy @@ -17,6 +17,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/moduleConfigWithParams.groovy b/component-resolver-core/src/test/resources/moduleConfigWithParams.groovy index dba6745..8d11374 100644 --- a/component-resolver-core/src/test/resources/moduleConfigWithParams.groovy +++ b/component-resolver-core/src/test/resources/moduleConfigWithParams.groovy @@ -19,6 +19,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/moduleConfigWithoutEnums.groovy b/component-resolver-core/src/test/resources/moduleConfigWithoutEnums.groovy index 46ab257..fdcdce9 100644 --- a/component-resolver-core/src/test/resources/moduleConfigWithoutEnums.groovy +++ b/component-resolver-core/src/test/resources/moduleConfigWithoutEnums.groovy @@ -9,6 +9,7 @@ final String ALL_VERSIONS = "(,0),[0,)" Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/new-vcs/defaultBranchByRepositoryType.groovy b/component-resolver-core/src/test/resources/new-vcs/defaultBranchByRepositoryType.groovy index de1ee03..104faa2 100644 --- a/component-resolver-core/src/test/resources/new-vcs/defaultBranchByRepositoryType.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/defaultBranchByRepositoryType.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false buildSystem = MAVEN repositoryType = CVS tag = DEFAULT_TAG diff --git a/component-resolver-core/src/test/resources/new-vcs/emptyVersionRangeSection.groovy b/component-resolver-core/src/test/resources/new-vcs/emptyVersionRangeSection.groovy index 5da0a1d..b089071 100644 --- a/component-resolver-core/src/test/resources/new-vcs/emptyVersionRangeSection.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/emptyVersionRangeSection.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN tag = DEFAULT_TAG diff --git a/component-resolver-core/src/test/resources/new-vcs/severalVCSRoots.groovy b/component-resolver-core/src/test/resources/new-vcs/severalVCSRoots.groovy index f2e3691..14cee58 100644 --- a/component-resolver-core/src/test/resources/new-vcs/severalVCSRoots.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/severalVCSRoots.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN tag = DEFAULT_TAG diff --git a/component-resolver-core/src/test/resources/new-vcs/severalVCSRootsInVersionRangeSection.groovy b/component-resolver-core/src/test/resources/new-vcs/severalVCSRootsInVersionRangeSection.groovy index 5b377c7..3fe3154 100644 --- a/component-resolver-core/src/test/resources/new-vcs/severalVCSRootsInVersionRangeSection.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/severalVCSRootsInVersionRangeSection.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN tag = DEFAULT_TAG diff --git a/component-resolver-core/src/test/resources/new-vcs/singleVCSRootInVCSSettings.groovy b/component-resolver-core/src/test/resources/new-vcs/singleVCSRootInVCSSettings.groovy index 89a6bc6..dd279e1 100644 --- a/component-resolver-core/src/test/resources/new-vcs/singleVCSRootInVCSSettings.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/singleVCSRootInVCSSettings.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/new-vcs/tagInComponentsDefault.groovy b/component-resolver-core/src/test/resources/new-vcs/tagInComponentsDefault.groovy index 49868aa..4006da9 100644 --- a/component-resolver-core/src/test/resources/new-vcs/tagInComponentsDefault.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/tagInComponentsDefault.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL tag = '$module-$version'; artifactId = ANY_ARTIFACT diff --git a/component-resolver-core/src/test/resources/new-vcs/vcsSettingsInheritanceInSection.groovy b/component-resolver-core/src/test/resources/new-vcs/vcsSettingsInheritanceInSection.groovy index f7d771c..2a3d980 100644 --- a/component-resolver-core/src/test/resources/new-vcs/vcsSettingsInheritanceInSection.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/vcsSettingsInheritanceInSection.groovy @@ -10,6 +10,7 @@ final ALL_VERSIONS = "(,0),[0,)" Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN tag = DEFAULT_TAG diff --git a/component-resolver-core/src/test/resources/new-vcs/vcsSettingsOnlyWithDefaults.groovy b/component-resolver-core/src/test/resources/new-vcs/vcsSettingsOnlyWithDefaults.groovy index 75f80b1..50843d9 100644 --- a/component-resolver-core/src/test/resources/new-vcs/vcsSettingsOnlyWithDefaults.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/vcsSettingsOnlyWithDefaults.groovy @@ -7,6 +7,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false artifactId = ANY_ARTIFACT jira { majorVersionFormat = '$major.$minor' diff --git a/component-resolver-core/src/test/resources/new-vcs/vcsSettingsWithDifferentNames.groovy b/component-resolver-core/src/test/resources/new-vcs/vcsSettingsWithDifferentNames.groovy index ed7197a..afd3a45 100644 --- a/component-resolver-core/src/test/resources/new-vcs/vcsSettingsWithDifferentNames.groovy +++ b/component-resolver-core/src/test/resources/new-vcs/vcsSettingsWithDifferentNames.groovy @@ -9,6 +9,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false tag = '$module-$version'; artifactId = ANY_ARTIFACT jira { diff --git a/component-resolver-core/src/test/resources/newComponentConfig.groovy b/component-resolver-core/src/test/resources/newComponentConfig.groovy index 48eebc9..daa3936 100644 --- a/component-resolver-core/src/test/resources/newComponentConfig.groovy +++ b/component-resolver-core/src/test/resources/newComponentConfig.groovy @@ -19,6 +19,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/production/Defaults.groovy b/component-resolver-core/src/test/resources/production/Defaults.groovy index 9ae1fab..49a2e44 100644 --- a/component-resolver-core/src/test/resources/production/Defaults.groovy +++ b/component-resolver-core/src/test/resources/production/Defaults.groovy @@ -5,6 +5,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = '$module-$version'; diff --git a/component-resolver-core/src/test/resources/severalGroupIds.groovy b/component-resolver-core/src/test/resources/severalGroupIds.groovy index f6f89ad..eb2b21f 100644 --- a/component-resolver-core/src/test/resources/severalGroupIds.groovy +++ b/component-resolver-core/src/test/resources/severalGroupIds.groovy @@ -17,6 +17,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/sharedGroupId.groovy b/component-resolver-core/src/test/resources/sharedGroupId.groovy index f5c8054..7322013 100644 --- a/component-resolver-core/src/test/resources/sharedGroupId.groovy +++ b/component-resolver-core/src/test/resources/sharedGroupId.groovy @@ -7,6 +7,7 @@ final ANY_ARTIFACT = /[\w-\.]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false artifactId = ANY_ARTIFACT tag = DEFAULT_TAG jira { diff --git a/component-resolver-core/src/test/resources/single-module/2configurations.groovy b/component-resolver-core/src/test/resources/single-module/2configurations.groovy index 9d84aad..176e751 100644 --- a/component-resolver-core/src/test/resources/single-module/2configurations.groovy +++ b/component-resolver-core/src/test/resources/single-module/2configurations.groovy @@ -8,6 +8,7 @@ final ANY_ARTIFACT = /[\w-]+/ Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/single-module/defaults.groovy b/component-resolver-core/src/test/resources/single-module/defaults.groovy index 2b44bc5..f219e96 100644 --- a/component-resolver-core/src/test/resources/single-module/defaults.groovy +++ b/component-resolver-core/src/test/resources/single-module/defaults.groovy @@ -18,6 +18,7 @@ final SOME_VERSION_RANGE = "[1.12.1-151,)" Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false buildSystem = MAVEN repositoryType = CVS artifactId = ANY_ARTIFACT diff --git a/component-resolver-core/src/test/resources/single-module/dotSign.groovy b/component-resolver-core/src/test/resources/single-module/dotSign.groovy index f2983fd..9e2a9db 100644 --- a/component-resolver-core/src/test/resources/single-module/dotSign.groovy +++ b/component-resolver-core/src/test/resources/single-module/dotSign.groovy @@ -14,6 +14,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/single-module/noVersionRange.groovy b/component-resolver-core/src/test/resources/single-module/noVersionRange.groovy index 95e1a58..41394e0 100644 --- a/component-resolver-core/src/test/resources/single-module/noVersionRange.groovy +++ b/component-resolver-core/src/test/resources/single-module/noVersionRange.groovy @@ -14,6 +14,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/single-module/overridenPathToPomXml.groovy b/component-resolver-core/src/test/resources/single-module/overridenPathToPomXml.groovy index 0435b59..ced1e57 100644 --- a/component-resolver-core/src/test/resources/single-module/overridenPathToPomXml.groovy +++ b/component-resolver-core/src/test/resources/single-module/overridenPathToPomXml.groovy @@ -14,6 +14,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/single-module/sameComponentNameAndKey.groovy b/component-resolver-core/src/test/resources/single-module/sameComponentNameAndKey.groovy index be92eb5..e8c66b8 100644 --- a/component-resolver-core/src/test/resources/single-module/sameComponentNameAndKey.groovy +++ b/component-resolver-core/src/test/resources/single-module/sameComponentNameAndKey.groovy @@ -3,6 +3,7 @@ import static org.octopusden.octopus.escrow.BuildSystem.* Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false } Tools { diff --git a/component-resolver-core/src/test/resources/single-module/simpleConfig.groovy b/component-resolver-core/src/test/resources/single-module/simpleConfig.groovy index f55d6a6..df7f763 100644 --- a/component-resolver-core/src/test/resources/single-module/simpleConfig.groovy +++ b/component-resolver-core/src/test/resources/single-module/simpleConfig.groovy @@ -4,6 +4,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.MERCURIAL Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/subComponents.groovy b/component-resolver-core/src/test/resources/subComponents.groovy index 186731c..e889a31 100644 --- a/component-resolver-core/src/test/resources/subComponents.groovy +++ b/component-resolver-core/src/test/resources/subComponents.groovy @@ -22,6 +22,7 @@ Tools { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = CVS buildSystem = GRADLE tag = '$module-$version' @@ -61,6 +62,7 @@ bcomponent { securityChampion = "somesecuritychampion" system = "CLASSIC" releasesInDefaultBranch = false + solution = true distribution { explicit = true @@ -166,6 +168,7 @@ bcomponent { securityChampion = "anothersecuritychampion" system = "CLASSIC,ALFA" releasesInDefaultBranch = true + solution = false componentDisplayName = "Human readable sub-component-with-defaults name" componentOwner = "Another Owner" groupId = "org.octopusden.octopus.buildsystem.sub5" diff --git a/component-resolver-core/src/test/resources/testModuleConfig.groovy b/component-resolver-core/src/test/resources/testModuleConfig.groovy index a658431..1dd56a8 100644 --- a/component-resolver-core/src/test/resources/testModuleConfig.groovy +++ b/component-resolver-core/src/test/resources/testModuleConfig.groovy @@ -18,6 +18,7 @@ enum VCS { Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false repositoryType = MERCURIAL buildSystem = MAVEN; tag = DEFAULT_TAG; diff --git a/component-resolver-core/src/test/resources/testSecurityGroupLoading.groovy b/component-resolver-core/src/test/resources/testSecurityGroupLoading.groovy index 3109e4e..74e3504 100644 --- a/component-resolver-core/src/test/resources/testSecurityGroupLoading.groovy +++ b/component-resolver-core/src/test/resources/testSecurityGroupLoading.groovy @@ -3,6 +3,7 @@ import static org.octopusden.octopus.escrow.BuildSystem.PROVIDED Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false jira { majorVersionFormat = '$major.$minor' releaseVersionFormat = '$major.$minor.$service' diff --git a/component-resolver-core/src/test/resources/testSecurityGroupsValidation.groovy b/component-resolver-core/src/test/resources/testSecurityGroupsValidation.groovy index 0ac6e61..893b440 100644 --- a/component-resolver-core/src/test/resources/testSecurityGroupsValidation.groovy +++ b/component-resolver-core/src/test/resources/testSecurityGroupsValidation.groovy @@ -3,6 +3,7 @@ import static org.octopusden.octopus.escrow.BuildSystem.PROVIDED Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false } diff --git a/component-resolver-core/src/test/resources/vcsRootValidation.groovy b/component-resolver-core/src/test/resources/vcsRootValidation.groovy index 392c52b..5fcb0c3 100644 --- a/component-resolver-core/src/test/resources/vcsRootValidation.groovy +++ b/component-resolver-core/src/test/resources/vcsRootValidation.groovy @@ -4,6 +4,7 @@ import static org.octopusden.octopus.escrow.RepositoryType.CVS Defaults { system = "NONE" releasesInDefaultBranch = true + solution = false } "mudule-dbModel" { diff --git a/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/ComponentsRegistryServiceClient.kt b/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/ComponentsRegistryServiceClient.kt index ccace40..e9aaa6c 100644 --- a/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/ComponentsRegistryServiceClient.kt +++ b/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/ComponentsRegistryServiceClient.kt @@ -45,10 +45,11 @@ interface ComponentsRegistryServiceClient { @Throws(NotFoundException::class) fun getDetailedComponent(@Param("componentKey") componentKey: String, @Param("version") version: String): DetailedComponent - @RequestLine("GET /rest/api/2/components?vcs-path={vcsPath}&build-system={buildSystem}&systems={systems}", collectionFormat = CollectionFormat.CSV) + @RequestLine("GET /rest/api/2/components?vcs-path={vcsPath}&build-system={buildSystem}&systems={systems}&solution={solution}", collectionFormat = CollectionFormat.CSV) fun getAllComponents( @Param("vcsPath") vcsPath: String? = null, @Param("buildSystem") buildSystem: BuildSystem? = null, + @Param("solution") solution: Boolean? = null, @Param("systems") @QueryMap systems: List = emptyList() ): ComponentsDTO diff --git a/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/impl/ClassicComponentsRegistryServiceClient.kt b/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/impl/ClassicComponentsRegistryServiceClient.kt index 2fb5063..d840c7c 100644 --- a/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/impl/ClassicComponentsRegistryServiceClient.kt +++ b/components-registry-service-client/src/main/kotlin/org/octopusden/octopus/components/registry/client/impl/ClassicComponentsRegistryServiceClient.kt @@ -2,6 +2,12 @@ package org.octopusden.octopus.components.registry.client.impl import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.module.SimpleModule +import feign.Feign +import feign.Logger +import feign.httpclient.ApacheHttpClient +import feign.jackson.JacksonDecoder +import feign.jackson.JacksonEncoder +import feign.slf4j.Slf4jLogger import org.octopusden.octopus.components.registry.api.VersionedComponentConfiguration import org.octopusden.octopus.components.registry.api.beans.VersionedComponentConfigurationBean import org.octopusden.octopus.components.registry.client.ComponentsRegistryServiceClient @@ -13,15 +19,9 @@ import org.octopusden.octopus.components.registry.core.dto.DistributionDTO import org.octopusden.octopus.components.registry.core.dto.JiraComponentVersionDTO import org.octopusden.octopus.components.registry.core.dto.JiraComponentVersionRangeDTO import org.octopusden.octopus.components.registry.core.dto.ServiceStatusDTO +import org.octopusden.octopus.components.registry.core.dto.VersionNamesDTO import org.octopusden.octopus.components.registry.core.dto.VersionRequest import org.octopusden.octopus.components.registry.core.dto.VersionedComponent -import feign.Feign -import feign.Logger -import feign.httpclient.ApacheHttpClient -import feign.jackson.JacksonDecoder -import feign.jackson.JacksonEncoder -import feign.slf4j.Slf4jLogger -import org.octopusden.octopus.components.registry.core.dto.VersionNamesDTO class ClassicComponentsRegistryServiceClient( apiUrlProvider: ClassicComponentsRegistryServiceClientUrlProvider, @@ -45,8 +45,12 @@ class ClassicComponentsRegistryServiceClient( override fun getDetailedComponent(componentKey: String, version: String) = client.getDetailedComponent(componentKey, version) - override fun getAllComponents(vcsPath: String?, buildSystem: BuildSystem?, systems: List) = - client.getAllComponents(vcsPath, buildSystem, systems) + override fun getAllComponents( + vcsPath: String?, + buildSystem: BuildSystem?, + solution: Boolean?, + systems: List + ) = client.getAllComponents(vcsPath, buildSystem, solution, systems) override fun getComponentDistribution(componentKey: String, version: String) = client.getComponentDistribution(componentKey, version) diff --git a/components-registry-service-core/src/main/kotlin/org/octopusden/octopus/components/registry/core/dto/Component.kt b/components-registry-service-core/src/main/kotlin/org/octopusden/octopus/components/registry/core/dto/Component.kt index c14f7bb..c86d835 100644 --- a/components-registry-service-core/src/main/kotlin/org/octopusden/octopus/components/registry/core/dto/Component.kt +++ b/components-registry-service-core/src/main/kotlin/org/octopusden/octopus/components/registry/core/dto/Component.kt @@ -4,6 +4,7 @@ abstract class Component(val id: String, val name: String?, val componentOwner: var system: List? = null var clientCode: String? = null var releasesInDefaultBranch: Boolean? = null + var solution: Boolean? = null var parentComponent: String? = null var securityChampion: String? = null var releaseManager: String? = null @@ -20,6 +21,7 @@ abstract class Component(val id: String, val name: String?, val componentOwner: if (system != other.system) return false if (clientCode != other.clientCode) return false if (releasesInDefaultBranch != other.releasesInDefaultBranch) return false + if (solution != other.solution) return false if (parentComponent != other.parentComponent) return false if (securityChampion != other.securityChampion) return false if (releaseManager != other.releaseManager) return false @@ -35,6 +37,7 @@ abstract class Component(val id: String, val name: String?, val componentOwner: result = 31 * result + (system?.hashCode() ?: 0) result = 31 * result + (clientCode?.hashCode() ?: 0) result = 31 * result + (releasesInDefaultBranch?.hashCode() ?: 0) + result = 31 * result + (solution?.hashCode() ?: 0) result = 31 * result + (parentComponent?.hashCode() ?: 0) result = 31 * result + (securityChampion?.hashCode() ?: 0) result = 31 * result + (releaseManager?.hashCode() ?: 0) @@ -43,6 +46,6 @@ abstract class Component(val id: String, val name: String?, val componentOwner: } override fun toString(): String { - return "Component(id='$id', name=$name, componentOwner='$componentOwner', system=$system, clientCode=$clientCode, releasesInDefaultBranch=$releasesInDefaultBranch, parentComponent=$parentComponent, securityChampion=$securityChampion, releaseManager=$releaseManager, distribution=$distribution)" + return "Component(id='$id', name=$name, componentOwner='$componentOwner', system=$system, clientCode=$clientCode, releasesInDefaultBranch=$releasesInDefaultBranch, solution=$solution, parentComponent=$parentComponent, securityChampion=$securityChampion, releaseManager=$releaseManager, distribution=$distribution)" } } diff --git a/components-registry-service-server/src/main/kotlin/org/octopusden/octopus/components/registry/server/controller/BaseComponentController.kt b/components-registry-service-server/src/main/kotlin/org/octopusden/octopus/components/registry/server/controller/BaseComponentController.kt index 3b3fc5e..4cc5f4a 100644 --- a/components-registry-service-server/src/main/kotlin/org/octopusden/octopus/components/registry/server/controller/BaseComponentController.kt +++ b/components-registry-service-server/src/main/kotlin/org/octopusden/octopus/components/registry/server/controller/BaseComponentController.kt @@ -31,7 +31,8 @@ abstract class BaseComponentController { fun getAllComponents( @RequestParam("vcs-path", required = false) vcsPath: String?, @RequestParam("build-system", required = false) buildSystem: BuildSystem?, - @RequestParam("systems", required = false, defaultValue = "") systems: List + @RequestParam("systems", required = false, defaultValue = "") systems: List, + @RequestParam("solution", required = false) solution: Boolean? ): ComponentsDTO { val components = componentRegistryResolver.getComponents().filter { module -> @@ -46,7 +47,12 @@ abstract class BaseComponentController { val buildSystemEquals = buildSystem?.let { buildSystemValue -> config.buildSystem == org.octopusden.octopus.escrow.BuildSystem.valueOf(buildSystemValue.name) } ?: true - vcsPathEquals && buildSystemEquals + + val solutionEquals = solution?.let { solutionValue -> + config.solution == solutionValue + } ?: true + + vcsPathEquals && buildSystemEquals && solutionEquals } } .map { @@ -96,6 +102,7 @@ abstract class BaseComponentController { system = escrowModuleConfig.system?.split(EscrowConfigValidator.SPLIT_PATTERN) clientCode = escrowModuleConfig.clientCode releasesInDefaultBranch = escrowModuleConfig.releasesInDefaultBranch + solution = escrowModuleConfig.solution parentComponent = escrowModuleConfig.parentComponent this } diff --git a/components-registry-service-server/src/test/kotlin/org/octopusden/octopus/components/registry/server/ComponentsRegistryServiceControllerTest.kt b/components-registry-service-server/src/test/kotlin/org/octopusden/octopus/components/registry/server/ComponentsRegistryServiceControllerTest.kt index b76e7e0..443ad41 100644 --- a/components-registry-service-server/src/test/kotlin/org/octopusden/octopus/components/registry/server/ComponentsRegistryServiceControllerTest.kt +++ b/components-registry-service-server/src/test/kotlin/org/octopusden/octopus/components/registry/server/ComponentsRegistryServiceControllerTest.kt @@ -327,6 +327,7 @@ class ComponentsRegistryServiceControllerTest : BaseComponentsRegistryServiceTes expectedComponent.system = listOf("NONE") expectedComponent.clientCode = "CLIENT_CODE" expectedComponent.releasesInDefaultBranch = false + expectedComponent.solution = true Assertions.assertEquals(38, components.components.size) Assertions.assertTrue(expectedComponent in components.components) { @@ -412,6 +413,7 @@ class ComponentsRegistryServiceControllerTest : BaseComponentsRegistryServiceTes expectedComponent.system = listOf("NONE") expectedComponent.clientCode = "CLIENT_CODE" expectedComponent.releasesInDefaultBranch = false + expectedComponent.solution = true Assertions.assertEquals(expectedComponent, actualComponent) } diff --git a/test-common/src/test/resources/components-registry/common/TestComponents.groovy b/test-common/src/test/resources/components-registry/common/TestComponents.groovy index 00114c9..82f38ef 100644 --- a/test-common/src/test/resources/components-registry/common/TestComponents.groovy +++ b/test-common/src/test/resources/components-registry/common/TestComponents.groovy @@ -5,6 +5,7 @@ Defaults { system = "NONE" tag = '$module-$version' releasesInDefaultBranch = true + solution = false distribution { securityGroups { read = "vfiler1-default#group" @@ -175,6 +176,7 @@ Defaults { componentDisplayName = "Test ONE display name" clientCode = "CLIENT_CODE" releasesInDefaultBranch = false + solution = true jira { projectKey = "TESTONE" majorVersionFormat = '$major' diff --git a/test-common/src/testFixtures/kotlin/org/octopusden/octopus/components/registry/test/BaseComponentsRegistryServiceTest.kt b/test-common/src/testFixtures/kotlin/org/octopusden/octopus/components/registry/test/BaseComponentsRegistryServiceTest.kt index a838c0e..04a716b 100644 --- a/test-common/src/testFixtures/kotlin/org/octopusden/octopus/components/registry/test/BaseComponentsRegistryServiceTest.kt +++ b/test-common/src/testFixtures/kotlin/org/octopusden/octopus/components/registry/test/BaseComponentsRegistryServiceTest.kt @@ -160,6 +160,7 @@ abstract class BaseComponentsRegistryServiceTest { expectedComponent.system = listOf("NONE") expectedComponent.clientCode = "CLIENT_CODE" expectedComponent.releasesInDefaultBranch = false + expectedComponent.solution = true Assertions.assertEquals(expectedComponent, actualComponent) } @@ -175,6 +176,7 @@ abstract class BaseComponentsRegistryServiceTest { expectedComponent.system = listOf("NONE") expectedComponent.clientCode = "CLIENT_CODE" expectedComponent.releasesInDefaultBranch = false + expectedComponent.solution = true expectedComponent.parentComponent = "TESTONE" Assertions.assertEquals(expectedComponent, actualComponent) }