[JENKINS-43536] - Pick changes for JENKINS-43845

jenkinsci · Apr 26, 2017 · af113cf · af113cf
1 parent 6ec719d
commit af113cf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.24</version>
+        <version>2.26</version>
     </parent>
 
     <artifactId>envinject</artifactId>
@@ -54,14 +54,11 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.6</maven.compiler.source>
-        <maven.compiler.target>1.6</maven.compiler.target>
-        <envinject.lib.version>1.25-SNAPSHOT</envinject.lib.version>
+        <envinject.api.version>1.0-SNAPSHOT</envinject.api.version>
         <ivy.plugin.version>1.21</ivy.plugin.version>
         <mockito.version>1.10.19</mockito.version>
-        <jenkins.version>1.609.3</jenkins.version>
-        <java.level>6</java.level>
-        <java.level.test>${java.level}</java.level.test>
+        <jenkins.version>1.625.3</jenkins.version>
+        <java.level>7</java.level>
         <findbugs.failOnError>false</findbugs.failOnError>
     </properties>
 
@@ -98,9 +95,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.jenkins-ci.lib</groupId>
-            <artifactId>envinject-lib</artifactId>
-            <version>${envinject.lib.version}</version>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>envinject-api</artifactId>
+            <version>${envinject.api.version}</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectAction.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectAction.java
@@ -5,13 +5,13 @@
 import hudson.model.Action;
 import org.apache.commons.collections.map.UnmodifiableMap;
 import org.jenkinsci.lib.envinject.EnvInjectException;
-import org.jenkinsci.lib.envinject.service.EnvInjectSavable;
 import org.kohsuke.stapler.StaplerProxy;
 
 import java.io.File;
 import java.io.ObjectStreamException;
 import java.util.Map;
 import java.util.Set;
+import org.jenkinsci.plugins.envinjectapi.util.EnvInjectVarsIO;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
 
@@ -109,12 +109,11 @@ private Object writeReplace() throws ObjectStreamException {
         }
 
         try {
-            EnvInjectSavable dao = new EnvInjectSavable();
             if (rootDir == null) {
-                dao.saveEnvironment(build.getRootDir(), envMap);
+                EnvInjectVarsIO.saveEnvironment(build.getRootDir(), envMap);
                 return this;
             }
-            dao.saveEnvironment(rootDir, envMap);
+            EnvInjectVarsIO.saveEnvironment(rootDir, envMap);
         } catch (EnvInjectException e) {
             e.printStackTrace();
         }
@@ -129,13 +128,12 @@ private Object readResolve() throws ObjectStreamException {
             return this;
         }
 
-        EnvInjectSavable dao = new EnvInjectSavable();
         Map<String, String> resultMap = null;
         try {
             if (build != null) {
-                resultMap = dao.getEnvironment(build.getRootDir());
+                resultMap = EnvInjectVarsIO.getEnvironment(build.getRootDir());
             } else if (rootDir != null) {
-                resultMap = dao.getEnvironment(rootDir);
+                resultMap = EnvInjectVarsIO.getEnvironment(rootDir);
             }
             if (resultMap != null) {
                 envMap = resultMap;

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectBuildVariableContributor.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectBuildVariableContributor.java
@@ -3,13 +3,13 @@
 import hudson.Extension;
 import hudson.model.*;
 import org.jenkinsci.lib.envinject.EnvInjectException;
-import org.jenkinsci.lib.envinject.EnvInjectLogger;
 import org.jenkinsci.plugins.envinject.service.EnvInjectVariableGetter;
 import org.jenkinsci.plugins.envinject.service.EnvironmentVariablesNodeLoader;
 
 import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Nonnull;
+import org.jenkinsci.lib.envinject.EnvInjectLogger;
 
 /**
  * Overriding job parameters with environment variables populated by EnvInject plugin

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/model/EnvInjectJobPropertyContributor.java b/src/main/java/org/jenkinsci/plugins/envinject/model/EnvInjectJobPropertyContributor.java
@@ -22,7 +22,7 @@ public abstract class EnvInjectJobPropertyContributor implements ExtensionPoint,
     public abstract void init();
 
     /**
-     * @deprecated Use {@link #contributeToRun(hudson.model.Run, hudson.model.TaskListener, java.util.Map)}
+     * @deprecated Use {@link #contributeEnvVarsToRun(hudson.model.Run, hudson.model.TaskListener, java.util.Map)}
      */
     @Deprecated
     public Map<String, String> getEnvVars(