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

…on-plugin into JENKINS-37781

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>

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>

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>

pipeline-model-definition/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.")
                    }
                }
            }

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>