From 5479432ee769f7fb8596dc274ef3751dc38263bc Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Sat, 17 Apr 2021 23:25:36 +0200 Subject: [PATCH] Update Jira references from HUDSON to JENKINS --- bom/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/hudson/Functions.java | 2 +- core/src/main/java/hudson/WebAppMain.java | 2 +- core/src/main/java/hudson/lifecycle/UnixLifecycle.java | 2 +- core/src/main/java/hudson/model/AbstractBuild.java | 2 +- core/src/main/java/hudson/model/Computer.java | 2 +- core/src/main/java/hudson/model/Job.java | 2 +- core/src/main/java/hudson/model/Run.java | 2 +- core/src/main/java/hudson/scm/SCM.java | 2 +- core/src/main/java/hudson/scm/SCMDescriptor.java | 2 +- core/src/main/java/hudson/scm/SCMRevisionState.java | 2 +- .../src/main/java/hudson/security/AuthorizationStrategy.java | 2 +- .../main/java/hudson/security/ContainerAuthentication.java | 2 +- core/src/main/java/hudson/security/HudsonFilter.java | 2 +- core/src/main/java/hudson/security/csrf/CrumbFilter.java | 2 +- core/src/main/java/hudson/slaves/SlaveComputer.java | 2 +- core/src/main/java/hudson/util/QueryParameterMap.java | 2 +- core/src/main/java/hudson/util/XStream2.java | 2 +- core/src/main/java/hudson/util/jna/GNUCLibrary.java | 2 +- core/src/test/java/hudson/UtilTest.java | 2 +- .../java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java | 5 ++--- core/src/test/java/hudson/scheduler/CronTabTest.java | 5 ++--- core/src/test/java/hudson/util/XStream2Test.java | 4 ++-- war/src/main/webapp/WEB-INF/web.xml | 2 +- war/src/main/webapp/scripts/prototype.js | 2 +- 26 files changed, 29 insertions(+), 31 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index b8893737d5..8d41b801d5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -279,7 +279,7 @@ THE SOFTWARE. memory-monitor 1.9 - + org.codehaus.woodstox wstx-asl 3.2.9 diff --git a/core/pom.xml b/core/pom.xml index bc8a4a1c82..8cab2e7f03 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -477,7 +477,7 @@ THE SOFTWARE. org.jenkins-ci memory-monitor - + org.codehaus.woodstox wstx-asl diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 3fca0f0afd..b61017aea9 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -1947,7 +1947,7 @@ public class Functions { * Gets all the {@link PageDecorator}s. */ public static List getPageDecorators() { - // this method may be called to render start up errors, at which point Hudson doesn't exist yet. see HUDSON-3608 + // this method may be called to render start up errors, at which point Hudson doesn't exist yet. see JENKINS-3608 if(Jenkins.getInstanceOrNull()==null) return Collections.emptyList(); return PageDecorator.all(); } diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java index d96fce2e5f..56db9963a4 100644 --- a/core/src/main/java/hudson/WebAppMain.java +++ b/core/src/main/java/hudson/WebAppMain.java @@ -199,7 +199,7 @@ public class WebAppMain implements ServletContextListener { throw new IncompatibleVMDetected(); // nope } -// JNA is no longer a hard requirement. It's just nice to have. See HUDSON-4820 for more context. +// JNA is no longer a hard requirement. It's just nice to have. See JENKINS-4820 for more context. // // make sure JNA works. this can fail if // // - platform is unsupported // // - JNA is already loaded in another classloader diff --git a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java index a17c898ab3..72adf5f870 100644 --- a/core/src/main/java/hudson/lifecycle/UnixLifecycle.java +++ b/core/src/main/java/hudson/lifecycle/UnixLifecycle.java @@ -57,7 +57,7 @@ public class UnixLifecycle extends Lifecycle { // if we are running as daemon, don't fork into background one more time during restart args.remove("--daemon"); } catch (UnsupportedOperationException | LinkageError e) { - // can't restart / see HUDSON-3875 + // can't restart / see JENKINS-3875 failedToObtainArgs = e; } } diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index 111384e705..a3f81ba7ef 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -939,7 +939,7 @@ public abstract class AbstractBuild

,R extends Abs public EnvVars getEnvironment(TaskListener log) throws IOException, InterruptedException { EnvVars env = super.getEnvironment(log); FilePath ws = getWorkspace(); - if (ws != null) { // if this is done very early on in the build, workspace may not be decided yet. see HUDSON-3997 + if (ws != null) { // if this is done very early on in the build, workspace may not be decided yet. see JENKINS-3997 env.put("WORKSPACE", ws.getRemote()); FilePath tempDir = WorkspaceList.tempDir(ws); if (tempDir != null) { diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java index c93735b0a9..93a4ffa4fc 100644 --- a/core/src/main/java/hudson/model/Computer.java +++ b/core/src/main/java/hudson/model/Computer.java @@ -1287,7 +1287,7 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces } } - // allow the administrator to manually specify the host name as a fallback. HUDSON-5373 + // allow the administrator to manually specify the host name as a fallback. JENKINS-5373 cachedHostName = channel.call(new GetFallbackName()); hostNameCached = true; return cachedHostName; diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index dc3d4edd8a..3280b7b5bd 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -1415,7 +1415,7 @@ public abstract class Job, RunT extends Run,RunT extends Run, ExtensionPoint { */ public final PollingResult poll(AbstractProject project, Launcher launcher, FilePath workspace, TaskListener listener, SCMRevisionState baseline) throws IOException, InterruptedException { if (is1_346OrLater()) { - // This is to work around HUDSON-5827 in a general way. + // This is to work around JENKINS-5827 in a general way. // don't let the SCM.compareRemoteRevisionWith(...) see SCMRevisionState that it didn't produce. SCMRevisionState baseline2; if (baseline!=SCMRevisionState.NONE) { diff --git a/core/src/main/java/hudson/scm/SCMDescriptor.java b/core/src/main/java/hudson/scm/SCMDescriptor.java index d6ace3af53..1c55525202 100644 --- a/core/src/main/java/hudson/scm/SCMDescriptor.java +++ b/core/src/main/java/hudson/scm/SCMDescriptor.java @@ -95,7 +95,7 @@ public abstract class SCMDescriptor extends Descriptor { atomicGeneration.incrementAndGet(); } - // work around HUDSON-4514. The repositoryBrowser field was marked as non-transient until 1.325, + // work around JENKINS-4514. The repositoryBrowser field was marked as non-transient until 1.325, // causing the field to be persisted and overwritten on the load method. @SuppressWarnings({"ConstantConditions"}) @Override diff --git a/core/src/main/java/hudson/scm/SCMRevisionState.java b/core/src/main/java/hudson/scm/SCMRevisionState.java index cd6ddeb93b..c6f9258850 100644 --- a/core/src/main/java/hudson/scm/SCMRevisionState.java +++ b/core/src/main/java/hudson/scm/SCMRevisionState.java @@ -16,7 +16,7 @@ import hudson.model.TaskListener; *

* This object is used so that the successive polling can compare the tip of the repository now vs * what it was when it was last polled. (Before 1.345, Hudson was only able to compare the tip - * of the repository vs the state of the workspace, which resulted in a problem like HUDSON-2180. + * of the repository vs the state of the workspace, which resulted in a problem like JENKINS-2180. * *

* {@link SCMRevisionState} is persisted as an action to {@link AbstractBuild}. diff --git a/core/src/main/java/hudson/security/AuthorizationStrategy.java b/core/src/main/java/hudson/security/AuthorizationStrategy.java index 66cab7d0b7..41d246e243 100644 --- a/core/src/main/java/hudson/security/AuthorizationStrategy.java +++ b/core/src/main/java/hudson/security/AuthorizationStrategy.java @@ -171,7 +171,7 @@ public abstract class AuthorizationStrategy extends AbstractDescribableImpl * If such enumeration is impossible, do the best to list as many as possible, then * return it. In the worst case, just return an empty list. Doing so would prevent - * users from using role names as group names (see HUDSON-2716 for such one such report.) + * users from using role names as group names (see JENKINS-2716 for such one such report.) * * @return * never null. diff --git a/core/src/main/java/hudson/security/ContainerAuthentication.java b/core/src/main/java/hudson/security/ContainerAuthentication.java index 16b6952b61..8ca0ec7fcb 100644 --- a/core/src/main/java/hudson/security/ContainerAuthentication.java +++ b/core/src/main/java/hudson/security/ContainerAuthentication.java @@ -55,7 +55,7 @@ public final class ContainerAuthentication implements Authentication { /** * Servlet container can tie a {@link ServletRequest} to the request handling thread, * so we need to capture all the information upfront to allow {@link Authentication} - * to be passed to other threads, like update center does. See HUDSON-5382. + * to be passed to other threads, like update center does. See JENKINS-5382. */ public ContainerAuthentication(HttpServletRequest request) { this.principal = request.getUserPrincipal(); diff --git a/core/src/main/java/hudson/security/HudsonFilter.java b/core/src/main/java/hudson/security/HudsonFilter.java index d7e0cc2043..9c33e45069 100644 --- a/core/src/main/java/hudson/security/HudsonFilter.java +++ b/core/src/main/java/hudson/security/HudsonFilter.java @@ -111,7 +111,7 @@ public class HudsonFilter implements Filter { LOGGER.fine("Security initialized"); } } catch (ExceptionInInitializerError e) { - // see HUDSON-4592. In some containers this happens before + // see JENKINS-4592. In some containers this happens before // WebAppMain.contextInitialized kicks in, which makes // the whole thing fail hard before a nicer error check // in WebAppMain.contextInitialized. So for now, diff --git a/core/src/main/java/hudson/security/csrf/CrumbFilter.java b/core/src/main/java/hudson/security/csrf/CrumbFilter.java index b920f0c0c2..a32edf5ed5 100644 --- a/core/src/main/java/hudson/security/csrf/CrumbFilter.java +++ b/core/src/main/java/hudson/security/csrf/CrumbFilter.java @@ -42,7 +42,7 @@ import org.springframework.security.authentication.AnonymousAuthenticationToken; public class CrumbFilter implements Filter { /** * Because servlet containers generally don't specify the ordering of the initialization - * (and different implementations indeed do this differently --- See HUDSON-3878), + * (and different implementations indeed do this differently --- See JENKINS-3878), * we cannot use Hudson to the CrumbIssuer into CrumbFilter eagerly. */ public CrumbIssuer getCrumbIssuer() { diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 0b0769a901..74fdb5d90c 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -692,7 +692,7 @@ public class SlaveComputer extends Computer { // if CommandLauncher is used, and that cannot be interrupted because it blocks at InputStream. // so if the process hangs, it hangs the thread in a lock, and since Hudson will try to relaunch, // we'll end up queuing the lot of threads in a pseudo deadlock. - // This implementation prevents that by avoiding a lock. HUDSON-1705 is likely a manifestation of this. + // This implementation prevents that by avoiding a lock. JENKINS-1705 is likely a manifestation of this. channel.close(); throw new IllegalStateException("Already connected"); } diff --git a/core/src/main/java/hudson/util/QueryParameterMap.java b/core/src/main/java/hudson/util/QueryParameterMap.java index cce7b5fc1d..97c6ee2aed 100644 --- a/core/src/main/java/hudson/util/QueryParameterMap.java +++ b/core/src/main/java/hudson/util/QueryParameterMap.java @@ -38,7 +38,7 @@ import java.util.Map; *

* This class is even useful on the server side, as {@link HttpServletRequest#getParameter(String)} * can try to parse into the payload (and that can cause an exception if the payload is already consumed. - * See HUDSON-8056.) + * See JENKINS-8056.) * *

* So if you are handling the payload yourself and only want to access the query parameters, diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index 01a68dffa7..4b03352a02 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/core/src/main/java/hudson/util/XStream2.java @@ -361,7 +361,7 @@ public class XStream2 extends XStream { * Prior to Hudson 1.106, XStream 1.1.x was used which encoded "$" in class names * as "-" instead of "_-" that is used now. Up through Hudson 1.348 compatibility * for old serialized data was maintained via {@link com.thoughtworks.xstream.mapper.XStream11XmlFriendlyMapper}. - * However, it was found (HUDSON-5768) that this caused fields with "__" to fail + * However, it was found (JENKINS-5768) that this caused fields with "__" to fail * deserialization due to double decoding. Now this class is used for compatibility. */ private class CompatibilityMapper extends MapperWrapper { diff --git a/core/src/main/java/hudson/util/jna/GNUCLibrary.java b/core/src/main/java/hudson/util/jna/GNUCLibrary.java index 6768228d21..96b8231d9b 100644 --- a/core/src/main/java/hudson/util/jna/GNUCLibrary.java +++ b/core/src/main/java/hudson/util/jna/GNUCLibrary.java @@ -40,7 +40,7 @@ import org.jvnet.libpam.impl.CLibrary.passwd; * *

* Not available on all platforms (such as Linux/PPC, IBM mainframe, etc.), so the caller should recover gracefully - * in case of {@link LinkageError}. See HUDSON-4820. + * in case of {@link LinkageError}. See JENKINS-4820. *

Consider deprecating all methods present also in {@link POSIX} (as obtained by {@link PosixAPI#jnr}). * @author Kohsuke Kawaguchi */ diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java index 958bdc84cb..baff9d42ba 100644 --- a/core/src/test/java/hudson/UtilTest.java +++ b/core/src/test/java/hudson/UtilTest.java @@ -129,7 +129,7 @@ public class UtilTest { assertEquals(Messages.Util_millisecond(17), Util.getTimeSpanString(17L)); // 1ms assertEquals(Messages.Util_millisecond(1), Util.getTimeSpanString(1L)); - // Test HUDSON-2843 (locale with comma as fraction separator got exception for <10 sec) + // Test JENKINS-2843 (locale with comma as fraction separator got exception for <10 sec) Locale saveLocale = Locale.getDefault(); Locale.setDefault(Locale.GERMANY); try { diff --git a/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java b/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java index 288c5b8dca..7b819dc068 100644 --- a/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabDayOfWeekLocaleTest.java @@ -15,7 +15,6 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.For; -import org.jvnet.hudson.test.Url; /** * A collection of unit tests focused around crontabs restricted to particular @@ -50,8 +49,8 @@ public class CronTabDayOfWeekLocaleTest { * HUDSON-8656. */ @Test - @Url("http://issues.hudson-ci.org/browse/HUDSON-8656") - public void hudson8658() throws Exception { + @Issue("HUDSON-8656") // This is _not_ JENKINS-8656 + public void hudson8656() throws Exception { final Calendar cal = Calendar.getInstance(locale); cal.set(2011, 0, 16, 0, 0, 0); // Sunday, Jan 16th 2011, 00:00 final String cronStr = "0 23 * * 1-5"; // execute on weekdays @23:00 diff --git a/core/src/test/java/hudson/scheduler/CronTabTest.java b/core/src/test/java/hudson/scheduler/CronTabTest.java index 77ed1f0b7e..de4bfa66c2 100644 --- a/core/src/test/java/hudson/scheduler/CronTabTest.java +++ b/core/src/test/java/hudson/scheduler/CronTabTest.java @@ -36,7 +36,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.junit.Test; import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.Url; import static java.util.Calendar.MONDAY; import java.util.List; @@ -96,7 +95,7 @@ public class CronTabTest { /** * Verifies that HUDSON-8656 never crops up again. */ - @Url("http://issues.hudson-ci.org/browse/HUDSON-8656") + @Issue("HUDSON-8656") // This is _not_ JENKINS-8656 @Test public void testCeil4() throws ANTLRException { final Calendar cal = Calendar.getInstance(new Locale("de", "de")); @@ -118,7 +117,7 @@ public class CronTabTest { /** * Verifies that HUDSON-8656 never crops up again. */ - @Url("http://issues.hudson-ci.org/browse/HUDSON-8656") + @Issue("HUDSON-8656") // This is _not_ JENKINS-8656 @Test public void testCeil5() throws ANTLRException { final Calendar cal = Calendar.getInstance(new Locale("de", "at")); diff --git a/core/src/test/java/hudson/util/XStream2Test.java b/core/src/test/java/hudson/util/XStream2Test.java index e6d7253486..4d12691e1d 100644 --- a/core/src/test/java/hudson/util/XStream2Test.java +++ b/core/src/test/java/hudson/util/XStream2Test.java @@ -93,7 +93,7 @@ public class XStream2Test { /** * Test marshal/unmarshal round trip for class/field names with _ and $ characters. */ - @Issue("HUDSON-5768") + @Issue("JENKINS-5768") @Test public void xmlRoundTrip() { XStream2 xs = new XStream2(); @@ -119,7 +119,7 @@ public class XStream2Test { * Throwable/Exception (default ThrowableConverter registered by XStream calls * ReflectionConverter directly, rather than our RobustReflectionConverter replacement). */ - @Issue("HUDSON-5769") + @Issue("JENKINS-5769") @Test public void unmarshalThrowableMissingField() { Level oldLevel = disableLogging(); diff --git a/war/src/main/webapp/WEB-INF/web.xml b/war/src/main/webapp/WEB-INF/web.xml index 5423860493..8417c0252c 100644 --- a/war/src/main/webapp/WEB-INF/web.xml +++ b/war/src/main/webapp/WEB-INF/web.xml @@ -172,7 +172,7 @@ THE SOFTWARE. diff --git a/war/src/main/webapp/scripts/prototype.js b/war/src/main/webapp/scripts/prototype.js index 63644c0a5c..90bf7b0427 100644 --- a/war/src/main/webapp/scripts/prototype.js +++ b/war/src/main/webapp/scripts/prototype.js @@ -358,7 +358,7 @@ var Class = (function() { case 'boolean': return object.toString(); } if (object === null) return 'null'; - // "|| object.toJSON" below is workaround for Opera 10.52/53 bug, see HUDSON-6424 + // "|| object.toJSON" below is workaround for Opera 10.52/53 bug, see JENKINS-6424 if (object.toJSON || object.toJSON) return object.toJSON(); if (object.ownerDocument === document) return; var results = [];