feat(artifacts): Check if default artifact was intended (#1701)

spinnaker · Oct 16, 2017 · 1c632d3 · 1c632d3
1 parent 675bd09
commit 1c632d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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")