Merge pull request #656 from batmat/bump-to-latest-and-incrementalify

[JENKINS-51599] Incrementalify the Docker plugin (JEP 305)
jenkinsci · May 30, 2018 · 6d0e5c2 · 6d0e5c2
2 parents 394d30d + 87da1a8
commit 6d0e5c2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@ target
 work
 *.iml
 /target
-.*
 *~
 
 dependency-reduced-pom.xml
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.0-beta-3</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.36</version>
+        <version>3.12</version>
     </parent>
 
     <groupId>io.jenkins.docker</groupId>
     <artifactId>docker-plugin</artifactId>
-    <version>1.1.5-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <packaging>hpi</packaging>
 
     <name>Docker plugin</name>
@@ -25,6 +25,8 @@
     </developers>
 
     <properties>
+        <revision>1.1.5</revision>
+        <changelist>-SNAPSHOT</changelist>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.level>8</java.level>
         <groovy.version>2.4.7</groovy.version>
@@ -121,12 +123,6 @@
             <version>1.36</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-step-api</artifactId>
-            <version>2.14</version>
-            <optional>true</optional>
-        </dependency>
 
         <dependency>
             <groupId>com.kohlschutter.junixsocket</groupId>
@@ -185,12 +181,6 @@
             <version>2.6</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-job</artifactId>
-            <version>2.11.2</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -271,7 +261,7 @@
         <connection>scm:git:ssh://github.com/jenkinsci/docker-plugin.git</connection>
         <developerConnection>scm:git:ssh://git@github.com/jenkinsci/docker-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/docker-plugin</url>
-        <tag>HEAD</tag>
+        <tag>${scmTag}</tag>
     </scm>
 
     <repositories>

diff --git a/src/main/java/com/nirima/jenkins/plugins/docker/DockerDisabled.java b/src/main/java/com/nirima/jenkins/plugins/docker/DockerDisabled.java
@@ -18,7 +18,6 @@
 import hudson.model.AbstractDescribableImpl;
 import hudson.model.Descriptor;
 import hudson.util.FormValidation;
-import hudson.util.Messages;
 
 /**
  * Records that the user has disabled something "until further notice", or the
@@ -181,7 +180,7 @@ public FormValidation doCheckEnabledByChoice(@QueryParameter boolean enabledByCh
                     html.append(Util.escape(reason));
                     if (!exception.isEmpty()) {
                         html.append(" <a href='#' class='showDetails'>");
-                        html.append(Messages.FormValidation_Error_Details());
+                        html.append(Messages.ShowDetails());
                         html.append("</a><pre style='display:none'>");
                         html.append(Util.escape(exception));
                         html.append("</pre>");

diff --git a/src/main/resources/com/nirima/jenkins/plugins/docker/Messages.properties b/src/main/resources/com/nirima/jenkins/plugins/docker/Messages.properties
@@ -2,3 +2,4 @@ PluginDescription=\
   Plugin for launching build Agents as Docker containers
 DisplayName=\
   Docker
+ShowDetails=(show details)