From 4bbf611a7c69cb927804140ae576dd15d2ff89fc Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 16 Nov 2016 07:50:00 -0800 Subject: [PATCH 1/6] [maven-release-plugin] prepare release jenkins-2.19.3 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 3695688a20..d50b46e31f 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main pom - 2.19.3-SNAPSHOT + 2.19.3 cli diff --git a/core/pom.xml b/core/pom.xml index 2682c8b485..6f6e6ea8d7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3-SNAPSHOT + 2.19.3 jenkins-core diff --git a/pom.xml b/pom.xml index fee4b39e0c..5da8f267ac 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3-SNAPSHOT + 2.19.3 pom Jenkins main module @@ -58,7 +58,7 @@ THE SOFTWARE. scm:git:git://github.com/jenkinsci/jenkins.git scm:git:ssh://git@github.com/jenkinsci/jenkins.git https://github.com/jenkinsci/jenkins - jenkins-2.19.1 + jenkins-2.19.3 diff --git a/test/pom.xml b/test/pom.xml index 69c8c3982f..d8bda55377 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3-SNAPSHOT + 2.19.3 test diff --git a/war/pom.xml b/war/pom.xml index 2ba8582ee2..5c49329e99 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3-SNAPSHOT + 2.19.3 jenkins-war From b1d7e0ee3ce13b504129f78d4f7d0fbddcc632e8 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 16 Nov 2016 07:50:00 -0800 Subject: [PATCH 2/6] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index d50b46e31f..89774ab5e0 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main pom - 2.19.3 + 2.19.4-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index 6f6e6ea8d7..a6614a3b0e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3 + 2.19.4-SNAPSHOT jenkins-core diff --git a/pom.xml b/pom.xml index 5da8f267ac..7db82638ed 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3 + 2.19.4-SNAPSHOT pom Jenkins main module @@ -58,7 +58,7 @@ THE SOFTWARE. scm:git:git://github.com/jenkinsci/jenkins.git scm:git:ssh://git@github.com/jenkinsci/jenkins.git https://github.com/jenkinsci/jenkins - jenkins-2.19.3 + jenkins-2.19.1 diff --git a/test/pom.xml b/test/pom.xml index d8bda55377..f1d12f39d3 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3 + 2.19.4-SNAPSHOT test diff --git a/war/pom.xml b/war/pom.xml index 5c49329e99..4a3896734a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.3 + 2.19.4-SNAPSHOT jenkins-war From b4b0815300cc07a87449f0bc199ebb67ec415ff1 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 16 Nov 2016 07:56:52 -0800 Subject: [PATCH 3/6] updated changelog for release --- changelog.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 728fcf8d4c..fc7a6c2f51 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,11 @@ Upcoming changes +

What's new in 2.19.3 (2016/11/16)

  • Prevent File descriptor leaks when reading plugin manifests. @@ -82,7 +87,6 @@ Upcoming changes from INFO to FINE. (PR #2510)
-

What's new in 2.18 (2016/08/15)

  • From 0399037f842d1c9c4fbbc970421fafa3ecdac7eb Mon Sep 17 00:00:00 2001 From: Oleg Nenashev Date: Sun, 13 Nov 2016 22:39:04 +0100 Subject: [PATCH 4/6] [FIXED JENKINS-38721, JENKINS-37282] - NPE in "CauseOfInterruption.UserInterruption" when user is missing (#2630) * [FIXED JENKINS-38721] - Prevent NPE during rendering of "CauseOfInterruption.UserInterruption" when user is missing It is a regression introduced in JENKINS-36594 * [JENKINS-38721] - Fix typo (cherry picked from commit 91ad59214234e7724d586f64f8fb6db35104857b) --- .../jenkins/model/CauseOfInterruption.java | 35 +++++++++++++++++-- .../UserInterruption/summary.groovy | 7 +++- .../UserInterruption/summary.properties | 3 +- .../UserInterruption/summary_ja.properties | 3 +- .../UserInterruption/summary_pl.properties | 3 +- .../UserInterruption/summary_sr.properties | 4 +++ .../UserInterruption/summary_zh_TW.properties | 1 + 7 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_sr.properties diff --git a/core/src/main/java/jenkins/model/CauseOfInterruption.java b/core/src/main/java/jenkins/model/CauseOfInterruption.java index 81dd16111d..557110f239 100644 --- a/core/src/main/java/jenkins/model/CauseOfInterruption.java +++ b/core/src/main/java/jenkins/model/CauseOfInterruption.java @@ -33,6 +33,7 @@ import org.kohsuke.stapler.export.ExportedBean; import java.io.Serializable; import java.util.Collections; import javax.annotation.CheckForNull; +import javax.annotation.Nonnull; /** * Records why an {@linkplain Executor#interrupt() executor is interrupted}. @@ -74,18 +75,46 @@ public abstract class CauseOfInterruption implements Serializable { * Indicates that the build was interrupted from UI. */ public static final class UserInterruption extends CauseOfInterruption { + + @Nonnull private final String user; - public UserInterruption(User user) { + public UserInterruption(@Nonnull User user) { this.user = user.getId(); } - public UserInterruption(String userId) { + public UserInterruption(@Nonnull String userId) { this.user = userId; } - @CheckForNull + /** + * Gets ID of the user, who interrupted the build. + * @return User ID + * @since TODO + */ + @Nonnull + public String getUserId() { + return user; + } + + /** + * Gets user, who caused the interruption. + * @return User instance if it can be located. + * Result of {@link User#getUnknown()} otherwise + */ + @Nonnull public User getUser() { + final User userInstance = getUserOrNull(); + return userInstance != null ? userInstance : User.getUnknown(); + } + + /** + * Gets user, who caused the interruption. + * @return User or {@code null} if it has not been found + * @since TODO + */ + @CheckForNull + public User getUserOrNull() { return User.get(user, false, Collections.emptyMap()); } diff --git a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.groovy b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.groovy index ec48cb9efa..b75b2386f9 100644 --- a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.groovy +++ b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.groovy @@ -1,4 +1,9 @@ package jenkins.model.CauseOfInterruption.UserInterruption; // by default we just print the short description. -raw(_("blurb",my.user.fullName, rootURL+'/'+my.user.url)) \ No newline at end of file +def user = my.userOrNull +if (user != null) { + raw(_("blurb", user.fullName, rootURL+'/'+user.url)) +} else { + raw(_("userNotFound", my.userId)) +} diff --git a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.properties b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.properties index 1f1f63c2bc..1ada7d261b 100644 --- a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.properties +++ b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary.properties @@ -1 +1,2 @@ -blurb=Aborted by user {0} \ No newline at end of file +blurb=Aborted by user {0} +userNotFound=Aborted by user {0} diff --git a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_ja.properties b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_ja.properties index e2d2051a6e..3cd254db98 100644 --- a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_ja.properties +++ b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_ja.properties @@ -1 +1,2 @@ -blurb=\u30e6\u30fc\u30b6\u30fc {0} \u306b\u3088\u308a\u4e2d\u65ad \ No newline at end of file +blurb=\u30e6\u30fc\u30b6\u30fc {0} \u306b\u3088\u308a\u4e2d\u65ad +userNotFound=\u30e6\u30fc\u30b6\u30fc {0} \u306b\u3088\u308a\u4e2d\u65ad diff --git a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_pl.properties b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_pl.properties index 0095ece665..d2c91f76b0 100644 --- a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_pl.properties +++ b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_pl.properties @@ -1 +1,2 @@ -blurb=Przerwane przez u\u017Cytkownika {0} \ No newline at end of file +blurb=Przerwane przez u\u017cytkownika {0} +userNotFound=Przerwane przez u\u017cytkownika {0} diff --git a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_sr.properties b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_sr.properties new file mode 100644 index 0000000000..a88ce0631c --- /dev/null +++ b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_sr.properties @@ -0,0 +1,4 @@ +# This file is under the MIT License by authors + +blurb=\u041e\u0442\u043a\u0430\u0437\u0430\u043d\u043e \u043a\u043e\u0440\u0438\u0441\u043d\u0438\u043a\u043e\u043c {0} +userNotFound=\u041e\u0442\u043a\u0430\u0437\u0430\u043d\u043e \u043a\u043e\u0440\u0438\u0441\u043d\u0438\u043a\u043e\u043c {0} diff --git a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_zh_TW.properties b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_zh_TW.properties index db91795756..3b2ac62c06 100644 --- a/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_zh_TW.properties +++ b/core/src/main/resources/jenkins/model/CauseOfInterruption/UserInterruption/summary_zh_TW.properties @@ -22,3 +22,4 @@ # THE SOFTWARE. blurb=\u7531\u4f7f\u7528\u8005 {0} \u4e2d\u6b62 +userNotFound=\u7531\u4f7f\u7528\u8005 {0} \u4e2d\u6b62 From a7520ef4dad014dd681cfe0b519e62ba9747231e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Nov 2016 09:58:56 -0800 Subject: [PATCH 5/6] [maven-release-plugin] prepare release jenkins-2.19.4 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 89774ab5e0..4e40860332 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main pom - 2.19.4-SNAPSHOT + 2.19.4 cli diff --git a/core/pom.xml b/core/pom.xml index a6614a3b0e..ce9ba637cd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4-SNAPSHOT + 2.19.4 jenkins-core diff --git a/pom.xml b/pom.xml index 7db82638ed..5a6b02470f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4-SNAPSHOT + 2.19.4 pom Jenkins main module @@ -58,7 +58,7 @@ THE SOFTWARE. scm:git:git://github.com/jenkinsci/jenkins.git scm:git:ssh://git@github.com/jenkinsci/jenkins.git https://github.com/jenkinsci/jenkins - jenkins-2.19.1 + jenkins-2.19.4 diff --git a/test/pom.xml b/test/pom.xml index f1d12f39d3..26f694f591 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4-SNAPSHOT + 2.19.4 test diff --git a/war/pom.xml b/war/pom.xml index 4a3896734a..0c8ce0e04a 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4-SNAPSHOT + 2.19.4 jenkins-war From 52a3a77a757b8d111160b7bbd97d7045abfc1e2d Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Mon, 28 Nov 2016 09:58:56 -0800 Subject: [PATCH 6/6] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- pom.xml | 4 ++-- test/pom.xml | 2 +- war/pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 4e40860332..540a52bee5 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ org.jenkins-ci.main pom - 2.19.4 + 2.19.5-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index ce9ba637cd..d469bcadab 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4 + 2.19.5-SNAPSHOT jenkins-core diff --git a/pom.xml b/pom.xml index 5a6b02470f..983d72ec5d 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4 + 2.19.5-SNAPSHOT pom Jenkins main module @@ -58,7 +58,7 @@ THE SOFTWARE. scm:git:git://github.com/jenkinsci/jenkins.git scm:git:ssh://git@github.com/jenkinsci/jenkins.git https://github.com/jenkinsci/jenkins - jenkins-2.19.4 + jenkins-2.19.1 diff --git a/test/pom.xml b/test/pom.xml index 26f694f591..4f0b97d41e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4 + 2.19.5-SNAPSHOT test diff --git a/war/pom.xml b/war/pom.xml index 0c8ce0e04a..5ca2d49111 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 2.19.4 + 2.19.5-SNAPSHOT jenkins-war