Permalink
Browse files

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

…on-plugin into JENKINS-37781
  • Loading branch information...
rsandell committed Nov 3, 2016
2 parents d65d3dc + eb197a9 commit b8463d5ab69d6ae10871d80892150fa04d323d82
@@ -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>
@@ -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>
@@ -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>
@@ -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.")
}
}
}
@@ -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>

0 comments on commit b8463d5

Please sign in to comment.