From ebb122dea9dcba82c0be2ff9b0da7a87eb679c94 Mon Sep 17 00:00:00 2001 From: Flavio Costa Date: Tue, 13 Sep 2011 17:58:13 -0300 Subject: [PATCH 01/23] [JENKINS-10989] Repeated ids, expandTextArea() and multiple "Invoke Ant" build steps --- war/src/main/webapp/scripts/hudson-behavior.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index 7b98114add..7442a562fd 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1385,16 +1385,19 @@ function scrollIntoView(e) { // used in expandableTextbox.jelly to change a input field into a text area function expandTextArea(button,id) { button.style.display="none"; - var field = document.getElementById(id); + var field = button.parentNode.previousSibling.children[0]; var value = field.value.replace(/ +/g,'\n'); - var n = field; - while(n.tagName!="TABLE") + + var n = button; + while (n.tagName != "TABLE") + { n = n.parentNode; - n.parentNode.innerHTML = + } + + n.parentNode.innerHTML = ""; } - // refresh a part of the HTML specified by the given ID, // by using the contents fetched from the given URL. function refreshPart(id,url) { From da9daae96115e08f70fac9ebec51ac7d7c131429 Mon Sep 17 00:00:00 2001 From: lucinka Date: Fri, 21 Oct 2011 11:01:59 +0200 Subject: [PATCH 02/23] Add headers X-Hudson-Job and X-Hudson-Result to e-mail notification for filtering purposes. --- core/src/main/java/hudson/tasks/MailSender.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index 812a3ef10a..f6526c6f8f 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -305,6 +305,8 @@ public class MailSender { MimeMessage msg = new MimeMessage(Mailer.descriptor().createSession()); // TODO: I'd like to put the URL to the page in here, // but how do I obtain that? + msg.addHeader("X-Hudson-Job", build.getProject().getDisplayName()); + msg.addHeader("X-Hudson-Result", build.getResult().toString()); msg.setContent("", "text/plain"); msg.setFrom(new InternetAddress(Mailer.descriptor().getAdminAddress())); msg.setSentDate(new Date()); From c8c5c13e79533a773f9d94e1724523b4451881e9 Mon Sep 17 00:00:00 2001 From: lucinka Date: Fri, 21 Oct 2011 11:31:27 +0200 Subject: [PATCH 03/23] Replace Hudson with Jenkins, so the headers are X-Jenkins-Job and X-Jenkins-Result --- core/src/main/java/hudson/tasks/MailSender.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/tasks/MailSender.java b/core/src/main/java/hudson/tasks/MailSender.java index f6526c6f8f..8aa79a720d 100644 --- a/core/src/main/java/hudson/tasks/MailSender.java +++ b/core/src/main/java/hudson/tasks/MailSender.java @@ -305,8 +305,8 @@ public class MailSender { MimeMessage msg = new MimeMessage(Mailer.descriptor().createSession()); // TODO: I'd like to put the URL to the page in here, // but how do I obtain that? - msg.addHeader("X-Hudson-Job", build.getProject().getDisplayName()); - msg.addHeader("X-Hudson-Result", build.getResult().toString()); + msg.addHeader("X-Jenkins-Job", build.getProject().getDisplayName()); + msg.addHeader("X-Jenkins-Result", build.getResult().toString()); msg.setContent("", "text/plain"); msg.setFrom(new InternetAddress(Mailer.descriptor().getAdminAddress())); msg.setSentDate(new Date()); From 939ce35eca992ddbfa54b2350ed590ab11601a2a Mon Sep 17 00:00:00 2001 From: Vojtech Juranek Date: Fri, 21 Oct 2011 12:23:54 +0200 Subject: [PATCH 04/23] Updated changelog for pull request #296 (added MIME headers) --- changelog.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog.html b/changelog.html index bdee570678..53e3639887 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,8 @@ Upcoming changes diff --git a/core/src/main/java/hudson/model/UpdateSite.java b/core/src/main/java/hudson/model/UpdateSite.java index c6ac33b719..8389fcbffb 100644 --- a/core/src/main/java/hudson/model/UpdateSite.java +++ b/core/src/main/java/hudson/model/UpdateSite.java @@ -51,6 +51,7 @@ import org.kohsuke.stapler.StaplerResponse; import javax.servlet.ServletContext; import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; @@ -196,12 +197,25 @@ public class UpdateSite { certs.add(c); } - // all default root CAs in JVM are trusted, plus certs bundled in Jenkins + // if we trust default root CAs, we end up trusting anyone who has a valid certificate, + // which isn't useful at all Set anchors = new HashSet(); // CertificateUtil.getDefaultRootCAs(); - ServletContext context = Jenkins.getInstance().servletContext; - for (String cert : (Set) context.getResourcePaths("/WEB-INF/update-center-rootCAs")) { + Jenkins j = Jenkins.getInstance(); + for (String cert : (Set) j.servletContext.getResourcePaths("/WEB-INF/update-center-rootCAs")) { if (cert.endsWith(".txt")) continue; // skip text files that are meant to be documentation - anchors.add(new TrustAnchor((X509Certificate)cf.generateCertificate(context.getResourceAsStream(cert)),null)); + anchors.add(new TrustAnchor((X509Certificate)cf.generateCertificate(j.servletContext.getResourceAsStream(cert)),null)); + } + File[] cas = new File(j.root, "update-center-rootCAs").listFiles(); + if (cas!=null) { + for (File cert : cas) { + if (cert.getName().endsWith(".txt")) continue; // skip text files that are meant to be documentation + FileInputStream in = new FileInputStream(cert); + try { + anchors.add(new TrustAnchor((X509Certificate)cf.generateCertificate(in),null)); + } finally { + in.close(); + } + } } CertificateUtil.validatePath(certs,anchors); } From 2044de524230db521d304afc243f32e32d74f95b Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 23 Oct 2011 11:34:54 +0200 Subject: [PATCH 10/23] - removed unused fields - suppressed/fixed several compiler warnings --- core/src/main/java/hudson/model/AbstractProject.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 93597f6e4d..6723149a06 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -28,7 +28,6 @@ package hudson.model; import hudson.Functions; -import java.util.regex.Pattern; import antlr.ANTLRException; import hudson.AbortException; import hudson.CopyOnWrite; @@ -124,6 +123,7 @@ import static javax.servlet.http.HttpServletResponse.*; * @author Kohsuke Kawaguchi * @see AbstractBuild */ +@SuppressWarnings("rawtypes") public abstract class AbstractProject

,R extends AbstractBuild> extends Job implements BuildableItem { /** @@ -780,6 +780,7 @@ public abstract class AbstractProject

,R extends A * For the convenience of the caller, this collection can contain null, and those will be silently ignored. * @since 1.383 */ + @SuppressWarnings("unchecked") public Future scheduleBuild2(int quietPeriod, Cause c, Collection actions) { if (!isBuildable()) return null; @@ -795,7 +796,7 @@ public abstract class AbstractProject

,R extends A WaitingItem i = Jenkins.getInstance().getQueue().schedule(this, quietPeriod, queueActions); if(i!=null) - return (Future)i.getFuture(); + return (Future)i.getFuture(); return null; } @@ -829,6 +830,7 @@ public abstract class AbstractProject

,R extends A * Production code shouldn't be using this, but for tests this is very convenient, so this isn't marked * as deprecated. */ + @SuppressWarnings("deprecation") public Future scheduleBuild2(int quietPeriod) { return scheduleBuild2(quietPeriod, new LegacyCodeCause()); } @@ -1419,6 +1421,7 @@ public abstract class AbstractProject

,R extends A } } + @SuppressWarnings("unchecked") public synchronized Map getTriggers() { return (Map)Descriptor.toMap(triggers); } @@ -1941,14 +1944,13 @@ public abstract class AbstractProject

,R extends A */ static class AutoCompleteSeeder { private String source; - private Pattern quoteMatcher = Pattern.compile("(\\\"?)(.+?)(\\\"?+)(\\s*)"); AutoCompleteSeeder(String source) { this.source = source; } List getSeeds() { - ArrayList terms = new ArrayList(); + ArrayList terms = new ArrayList(); boolean trailingQuote = source.endsWith("\""); boolean leadingQuote = source.startsWith("\""); boolean trailingSpace = source.endsWith(" "); From 4808f827e178d86996e63a4bff46bbc02862bb23 Mon Sep 17 00:00:00 2001 From: Christoph Kutzinski Date: Sun, 23 Oct 2011 11:46:35 +0200 Subject: [PATCH 11/23] Oops, seems like javac chokes on the - while Eclipse jdt has no problems with it --- core/src/main/java/hudson/model/AbstractProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 6723149a06..a3f3eff44b 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -796,7 +796,7 @@ public abstract class AbstractProject

,R extends A WaitingItem i = Jenkins.getInstance().getQueue().schedule(this, quietPeriod, queueActions); if(i!=null) - return (Future)i.getFuture(); + return (Future)i.getFuture(); return null; } From a321dd0ea2e961b05235bea8982673ad18db2709 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 23 Oct 2011 21:01:02 -0700 Subject: [PATCH 12/23] [maven-release-plugin] prepare release jenkins-1.436 --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 1aafb29c22..47953b304e 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.436-SNAPSHOT + 1.436 cli diff --git a/core/pom.xml b/core/pom.xml index ebbdd6f837..721075003d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436-SNAPSHOT + 1.436 ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index c4a2ef91eb..be683b8381 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436-SNAPSHOT + 1.436 maven-plugin diff --git a/pom.xml b/pom.xml index 52cc877de0..43138d1a14 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436-SNAPSHOT + 1.436 pom Jenkins main module diff --git a/test/pom.xml b/test/pom.xml index 598dec7093..5836cf7ae8 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.436-SNAPSHOT + 1.436 org.jenkins-ci.main jenkins-test-harness diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 0a45a736d5..77d7c2768e 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436-SNAPSHOT + 1.436 ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 86857255b0..fefd596a4b 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436-SNAPSHOT + 1.436 ../pom.xml From 4bd110b6c1783267a8e1792c5b32e6653fc42119 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 23 Oct 2011 21:01:03 -0700 Subject: [PATCH 13/23] [maven-release-plugin] prepare for next development iteration --- cli/pom.xml | 2 +- core/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index 47953b304e..dda1b130d9 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -5,7 +5,7 @@ pom org.jenkins-ci.main - 1.436 + 1.437-SNAPSHOT cli diff --git a/core/pom.xml b/core/pom.xml index 721075003d..1629e4c5aa 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436 + 1.437-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index be683b8381..292f731aa6 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436 + 1.437-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 43138d1a14..227290d6f5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436 + 1.437-SNAPSHOT pom Jenkins main module diff --git a/test/pom.xml b/test/pom.xml index 5836cf7ae8..9a0304b3a5 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. pom org.jenkins-ci.main - 1.436 + 1.437-SNAPSHOT org.jenkins-ci.main jenkins-test-harness diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 77d7c2768e..bb58f0a769 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -29,7 +29,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436 + 1.437-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index fefd596a4b..158dabc058 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci.main pom - 1.436 + 1.437-SNAPSHOT ../pom.xml From e6db93a9288e9eb5b3d55ff36811903a08212a3b Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 23 Oct 2011 21:13:36 -0700 Subject: [PATCH 14/23] updated changelog for release --- changelog.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/changelog.html b/changelog.html index 33b6b76e96..0eaa2d6810 100644 --- a/changelog.html +++ b/changelog.html @@ -61,7 +61,10 @@ Upcoming changes

+

What's new in 1.436 (2011/10/23)

  • Fixed a plugin boot problem that causes Jenkins to startup gracefully when some optional plugin dependencies aren't met (such as ivy to nant) @@ -84,7 +87,6 @@ Upcoming changes Added hyperlinks to build trigger console messages. (pull #291)
-

What's new in 1.435 (2011/10/17)

  • From a7c3e98c7ae17474c0ac9fb3ca5f4419f0706787 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 23 Oct 2011 21:13:36 -0700 Subject: [PATCH 15/23] releasing a new plugin parent POM --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index eb7b89c198..566fdfb35a 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.436-SNAPSHOT + 1.436 pom org.jenkins-ci.main maven-plugin - 1.436-SNAPSHOT + 1.436 @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.436-SNAPSHOT + 1.436 test org.jenkins-ci.main jenkins-core - 1.436-SNAPSHOT + 1.436 provided org.jenkins-ci.main jenkins-test-harness - 1.436-SNAPSHOT + 1.436 test org.jenkins-ci.main ui-samples-plugin - 1.436-SNAPSHOT + 1.436 test From 4375ffacc5eaad35bf7c13ca10b528c90a21b768 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 23 Oct 2011 21:13:43 -0700 Subject: [PATCH 16/23] toward the next release --- plugins/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 566fdfb35a..8847054fa7 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -10,7 +10,7 @@ org.jenkins-ci.plugins plugin Jenkins plugin POM - 1.436 + 1.437-SNAPSHOT pom org.jenkins-ci.main maven-plugin - 1.436 + 1.437-SNAPSHOT @@ -43,25 +43,25 @@ org.jenkins-ci.main jenkins-war war - 1.436 + 1.437-SNAPSHOT test org.jenkins-ci.main jenkins-core - 1.436 + 1.437-SNAPSHOT provided org.jenkins-ci.main jenkins-test-harness - 1.436 + 1.437-SNAPSHOT test org.jenkins-ci.main ui-samples-plugin - 1.436 + 1.437-SNAPSHOT test From bac65b50f34b893b4a7b877e357b6d70325d55a2 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 23 Oct 2011 22:42:29 -0700 Subject: [PATCH 17/23] updated changelog as a part of the release --- debian/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/debian/changelog b/debian/debian/changelog index b81ff183b4..90f1a66a23 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +jenkins (1.436) unstable; urgency=low + + * See http://jenkins-ci.org/changelog for more details. + + -- Kohsuke Kawaguchi Sun, 23 Oct 2011 22:30:51 -0700 + jenkins (1.435) unstable; urgency=low * See http://jenkins-ci.org/changelog for more details. From 64b953d13c3cc2ab6388045a111967320f34f050 Mon Sep 17 00:00:00 2001 From: Seiji Sogabe Date: Mon, 24 Oct 2011 22:38:40 +0900 Subject: [PATCH 18/23] [FIXED JENKINS-11444] Jenkins logo headless when server is starting. workaround. --- changelog.html | 3 +++ core/src/main/resources/lib/layout/layout.jelly | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index dccb455c19..36f6011b5a 100644 --- a/changelog.html +++ b/changelog.html @@ -63,6 +63,9 @@ Upcoming changes
  • GET request to configSubmit wipes some configuration (issue 11397, issue 7847) +
  • + Jenkins logo headless when server is starting. + (issue 11444)
  • Allow update center CA certificates to be placed in $JENKINS_HOME/update-center-rootCAs
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index a2ca15b360..9836ffe247 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -235,7 +235,7 @@ THE SOFTWARE.
-