From 7b3ea1c73c8d203f557a4777e69445f7bfd05b3f Mon Sep 17 00:00:00 2001 From: Lars Wander Date: Mon, 16 Oct 2017 14:07:23 -0400 Subject: [PATCH] feat(artifacts): Check if default artifact was intended --- build.gradle | 2 +- .../spinnaker/orca/pipeline/util/ArtifactResolver.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c1a50f49e3..b1d5a5a3ae 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ allprojects { group = "com.netflix.spinnaker.orca" ext { - spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.114.0' + spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.116.0' } def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion] diff --git a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolver.groovy b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolver.groovy index 101b256b67..89e3b282d6 100644 --- a/orca-core/src/main/groovy/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolver.groovy +++ b/orca-core/src/main/groovy/com/netflix/spinnaker/orca/pipeline/util/ArtifactResolver.groovy @@ -48,7 +48,7 @@ class ArtifactResolver { for (ExpectedArtifact expectedArtifact : unresolvedExpectedArtifacts) { if (expectedArtifact.usePriorArtifact) { throw new UnsupportedOperationException("'usePriorArtifact' is not supported yet") - } else if (expectedArtifact.defaultArtifact) { + } else if (expectedArtifact.useDefaultArtifact && expectedArtifact.defaultArtifact) { resolvedArtifacts.add(expectedArtifact.defaultArtifact) } else { throw new IllegalStateException("Unmatched expected artifact ${expectedArtifact} with no fallback behavior specified")