Merge pull request #74 from jglick/incrementals

Incrementalified

Author: svanoort

.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>

.mvn/maven.config

@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals

pom.xml

@@ -28,12 +28,12 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.2</version>
+        <version>3.14</version>
         <relativePath />
     </parent>
     <groupId>org.jenkins-ci.plugins.workflow</groupId>
     <artifactId>workflow-api</artifactId>
-    <version>2.28-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <packaging>hpi</packaging>
     <name>Pipeline: API</name>
     <url>https://wiki.jenkins.io/display/JENKINS/Pipeline+API+Plugin</url>
@@ -47,7 +47,7 @@
         <connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
         <developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
-        <tag>HEAD</tag>
+        <tag>${scmTag}</tag>
     </scm>
     <repositories>
         <repository>
@@ -62,6 +62,8 @@
         </pluginRepository>
     </pluginRepositories>
     <properties>
+        <revision>2.28</revision>
+        <changelist>-SNAPSHOT</changelist>
         <jenkins.version>2.60.3</jenkins.version>
         <java.level>8</java.level>
         <no-test-jar>false</no-test-jar>

src/main/java/org/jenkinsci/plugins/workflow/flow/FlowCopier.java

@@ -35,7 +35,7 @@
 import java.io.IOException;
 import jenkins.scm.api.SCMRevisionAction;
 import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.DoNotUse;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
  * A way for plugins to copy metadata and associated files from one flow execution to another.
@@ -71,7 +71,7 @@ public static abstract class ByRun extends FlowCopier {
 
     }
 
-    @Restricted(DoNotUse.class) // impl
+    @Restricted(NoExternalUse.class) // impl
     @Extension public static class StandardActions extends FlowCopier.ByRun {
 
         // TODO cloned from ReplayAction; consider whether it is appropriate to share these (related but not identical case)

src/main/java/org/jenkinsci/plugins/workflow/flow/StashManager.java

@@ -58,6 +58,7 @@
 import org.apache.tools.tar.TarEntry;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.DoNotUse;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 /**
  * Manages per-build stashes of files.
@@ -228,7 +229,7 @@ public boolean shouldClearAll(@Nonnull Run<?,?> build) {
 
     }
 
-    @Restricted(DoNotUse.class)
+    @Restricted(NoExternalUse.class)
     @Extension public static class CopyStashesAndArtifacts extends FlowCopier.ByRun {
 
         @Override public void copy(Run<?,?> original, Run<?,?> copy, TaskListener listener) throws IOException, InterruptedException {