Branch: refs/heads/master
Home: https://github.com/jenkinsci/envinject-plugin
Commit: eac6c25d15978d4c9e9921efed8418b8ef34418e
https://github.com/jenkinsci/envinject-plugin/commit/eac6c25d15978d4c9e9921efed8418b8ef34418e
Author: Robert Sandell <[email protected]>
Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths:
M .gitignore
M src/main/java/hudson/plugins/envfile/EnvFileBuildWrapper.java
M src/main/java/hudson/plugins/setenv/SetEnvBuildWrapper.java
M
src/main/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapper.java
M
src/main/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationListener.java
A
src/test/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapperTest.java
A
src/test/resources/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapperTest/testSetEnvAndEnvInject.zip
Log Message:
-----------
Fix JENKINS-22169
If setenv and envinject are both configured for a job the
EnvInjectMigrationBuildWrapper will overwrite existing envinject config.
This fix introduces the migration in SetEnvBuildWrapper to the original project
so it can check if there is any existing config and transfer that over before
returning the replacement. It currently only looks at the propertiesContent
and any other config will still be overwritten.
Change-Id: Ief68f06d714f0a31f8fc8461aaa4cd893c64599b
Commit: c68558aba60280ea1d56978d827e91da5a5118e2
https://github.com/jenkinsci/envinject-plugin/commit/c68558aba60280ea1d56978d827e91da5a5118e2
Author: Gregory Boissinot <[email protected]>
Date: 2014-04-26 (Sat, 26 Apr 2014)
Changed paths:
M .gitignore
M src/main/java/hudson/plugins/envfile/EnvFileBuildWrapper.java
M src/main/java/hudson/plugins/setenv/SetEnvBuildWrapper.java
M
src/main/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapper.java
M
src/main/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationListener.java
A
src/test/java/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapperTest.java
A
src/test/resources/org/jenkinsci/plugins/envinject/migration/EnvInjectMigrationBuildWrapperTest/testSetEnvAndEnvInject.zip
Log Message:
-----------
Merge pull request #28 from rsandell/jenkins-22169
Fix JENKINS-22169
Compare:
https://github.com/jenkinsci/envinject-plugin/compare/0287bec62dd8...c68558aba602
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
