Merge branch 'master' of github.com:jenkinsci/pipeline-model-definiti…

…on-plugin into JENKINS-37781
jenkinsci · Nov 3, 2016 · b8463d5 · b8463d5
2 parents d65d3dc + eb197a9
commit b8463d5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/pipeline-model-api/pom.xml b/pipeline-model-api/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.jenkinsci.plugins</groupId>
     <artifactId>pipeline-model-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.jenkinsci.plugins</groupId>

diff --git a/pipeline-model-declarative-agent/pom.xml b/pipeline-model-declarative-agent/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.jenkinsci.plugins</groupId>
     <artifactId>pipeline-model-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.jenkinsci.plugins</groupId>

diff --git a/pipeline-model-definition/pom.xml b/pipeline-model-definition/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.jenkinsci.plugins</groupId>
     <artifactId>pipeline-model-parent</artifactId>
-    <version>0.5-SNAPSHOT</version>
+    <version>0.6-SNAPSHOT</version>
   </parent>
 
   <groupId>org.jenkinsci.plugins</groupId>

diff --git a/.../src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy b/.../src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy
@@ -345,7 +345,7 @@ class ModelParser {
                             stage.environment = parseEnvironment(s)
                             break
                         default:
-                            errorCollector.error(stage, "Unknown stage section '${name}'")
+                            errorCollector.error(stage, "Unknown stage section '${name}'. Starting with version 0.5, steps in a stage must be in a 'steps' block.")
                     }
                 }
             }

diff --git a/pom.xml b/pom.xml
@@ -27,13 +27,13 @@
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
     <version>2.17</version>
-    <relativePath/>
+    <relativePath />
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jenkinsci.plugins</groupId>
   <artifactId>pipeline-model-parent</artifactId>
-  <version>0.5-SNAPSHOT</version>
+  <version>0.6-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Pipeline: Model Parent POM</name>
   <description>An opinionated, declarative Pipeline</description>