Merge branch 'master' into whitelist-JENKINS-47736

This commit is contained in:
Jesse Glick committed 2018-01-04 14:03:26 -05:00
commit ba5516aa7c
5 files changed
+5 -5

No files matched your search

+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>2.100-SNAPSHOT</version>
<version>2.101-SNAPSHOT</version>
</parent>
<artifactId>cli</artifactId>
+1 -1
View File
@@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>2.100-SNAPSHOT</version>
<version>2.101-SNAPSHOT</version>
</parent>
<artifactId>jenkins-core</artifactId>
+1 -1
View File
@@ -33,7 +33,7 @@ THE SOFTWARE.
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>2.100-SNAPSHOT</version>
<version>2.101-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Jenkins main module</name>
+1 -1
View File
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>2.100-SNAPSHOT</version>
<version>2.101-SNAPSHOT</version>
</parent>
<artifactId>test</artifactId>
+1 -1
View File
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>pom</artifactId>
<version>2.100-SNAPSHOT</version>
<version>2.101-SNAPSHOT</version>
</parent>
<artifactId>jenkins-war</artifactId>