From 9b8e3ca937c2fafc1273f75e667981fea23213df Mon Sep 17 00:00:00 2001 From: Daniel Beck <1831569+daniel-beck@users.noreply.github.com> Date: Tue, 23 Feb 2021 09:13:46 +0100 Subject: [PATCH] Update RestrictedSince annotations with version numbers (#5277) Co-authored-by: Daniel Beck --- core/src/main/java/hudson/Util.java | 2 +- .../java/hudson/diagnosis/ReverseProxySetupMonitor.java | 6 +++--- core/src/main/java/hudson/model/Slave.java | 4 ++-- .../java/hudson/model/queue/AbstractQueueSorterImpl.java | 4 ++-- core/src/main/java/hudson/scm/SCMDescriptor.java | 4 ++-- .../java/hudson/security/GlobalSecurityConfiguration.java | 2 +- core/src/main/java/hudson/slaves/SlaveComputer.java | 2 +- core/src/main/java/hudson/util/Protector.java | 2 +- .../main/java/jenkins/model/GlobalCloudConfiguration.java | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 4308cdbc03..e66ad6e9d9 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -1564,7 +1564,7 @@ public class Util { * @deprecated Use {@code isAbsoluteOrSchemeRelativeUri} instead if your goal is to prevent open redirects */ @Deprecated - @RestrictedSince("1.651.2 / 2.TODO") + @RestrictedSince("1.651.2 / 2.3") @Restricted(NoExternalUse.class) public static boolean isAbsoluteUri(@NonNull String uri) { int idx = uri.indexOf(':'); diff --git a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java index 58d40bdea5..8d64deddd8 100644 --- a/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java +++ b/core/src/main/java/hudson/diagnosis/ReverseProxySetupMonitor.java @@ -67,7 +67,7 @@ public class ReverseProxySetupMonitor extends AdministrativeMonitor { } @Restricted(DoNotUse.class) // WebOnly - @RestrictedSince("TODO since") + @RestrictedSince("2.235") public HttpResponse doTest(StaplerRequest request, @QueryParameter boolean testWithContext) { String referer = request.getReferer(); Jenkins j = Jenkins.get(); @@ -90,7 +90,7 @@ public class ReverseProxySetupMonitor extends AdministrativeMonitor { } @Restricted(DoNotUse.class) // WebOnly - @RestrictedSince("TODO since") + @RestrictedSince("2.235") @StaplerDispatchable public void getTestForReverseProxySetup(String rest) { Jenkins j = Jenkins.get(); @@ -113,7 +113,7 @@ public class ReverseProxySetupMonitor extends AdministrativeMonitor { * Depending on whether the user said "yes" or "no", send him to the right place. */ @Restricted(DoNotUse.class) // WebOnly - @RestrictedSince("TODO since") + @RestrictedSince("2.235") @RequirePOST public HttpResponse doAct(@QueryParameter String no) throws IOException { if(no!=null) { // dismiss diff --git a/core/src/main/java/hudson/model/Slave.java b/core/src/main/java/hudson/model/Slave.java index ecc8981c50..b0da0e129b 100644 --- a/core/src/main/java/hudson/model/Slave.java +++ b/core/src/main/java/hudson/model/Slave.java @@ -220,7 +220,7 @@ public abstract class Slave extends Node implements Serializable { */ @Deprecated @Restricted(DoNotUse.class) - @RestrictedSince("TODO") + @RestrictedSince("2.220") public String getUserId() { return userId; } @@ -232,7 +232,7 @@ public abstract class Slave extends Node implements Serializable { */ @Deprecated @Restricted(DoNotUse.class) - @RestrictedSince("TODO") + @RestrictedSince("2.220") public void setUserId(String userId){ } diff --git a/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java b/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java index b0d6ce25ab..b81b099a0f 100644 --- a/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java +++ b/core/src/main/java/hudson/model/queue/AbstractQueueSorterImpl.java @@ -40,7 +40,7 @@ public abstract class AbstractQueueSorterImpl extends QueueSorter implements Com */ @Deprecated @Restricted(NoExternalUse.class) - @RestrictedSince("TODO") + @RestrictedSince("2.211") protected static int compare(long a, long b) { return Long.compare(a, b); } @@ -51,7 +51,7 @@ public abstract class AbstractQueueSorterImpl extends QueueSorter implements Com */ @Deprecated @Restricted(NoExternalUse.class) - @RestrictedSince("TODO") + @RestrictedSince("2.211") protected static int compare(int a, int b) { return Integer.compare(a, b); } diff --git a/core/src/main/java/hudson/scm/SCMDescriptor.java b/core/src/main/java/hudson/scm/SCMDescriptor.java index f156aabeaf..40168bd0f2 100644 --- a/core/src/main/java/hudson/scm/SCMDescriptor.java +++ b/core/src/main/java/hudson/scm/SCMDescriptor.java @@ -80,7 +80,7 @@ public abstract class SCMDescriptor extends Descriptor { * @deprecated No longer used by default. */ @Deprecated - @Restricted(NoExternalUse.class) @RestrictedSince("TODO") + @Restricted(NoExternalUse.class) @RestrictedSince("2.209") public int getGeneration() { return atomicGeneration.get(); } @@ -90,7 +90,7 @@ public abstract class SCMDescriptor extends Descriptor { * @deprecated No longer used by default. */ @Deprecated - @Restricted(NoExternalUse.class) @RestrictedSince("TODO") + @Restricted(NoExternalUse.class) @RestrictedSince("2.209") public void incrementGeneration() { atomicGeneration.incrementAndGet(); } diff --git a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java index 8befb0a77f..c8bb6f4afb 100644 --- a/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java +++ b/core/src/main/java/hudson/security/GlobalSecurityConfiguration.java @@ -193,7 +193,7 @@ public class GlobalSecurityConfiguration extends ManagementLink implements Descr } @Restricted(NoExternalUse.class) - @RestrictedSince("TODO") + @RestrictedSince("2.222") public static Predicate FILTER = input -> input.getCategory() instanceof GlobalConfigurationCategory.Security; /** diff --git a/core/src/main/java/hudson/slaves/SlaveComputer.java b/core/src/main/java/hudson/slaves/SlaveComputer.java index 2cfd5b947b..8c8b5d43ec 100644 --- a/core/src/main/java/hudson/slaves/SlaveComputer.java +++ b/core/src/main/java/hudson/slaves/SlaveComputer.java @@ -1080,7 +1080,7 @@ public class SlaveComputer extends Computer { * Helper method for Jelly. */ @Restricted(DoNotUse.class) - @RestrictedSince("TODO") + @RestrictedSince("2.163") public static List getSystemInfoExtensions() { return SlaveSystemInfo.all(); } diff --git a/core/src/main/java/hudson/util/Protector.java b/core/src/main/java/hudson/util/Protector.java index 471621b838..b2ccc180db 100644 --- a/core/src/main/java/hudson/util/Protector.java +++ b/core/src/main/java/hudson/util/Protector.java @@ -49,7 +49,7 @@ import java.util.Base64; * @since 1.162 and restricted since TODO */ @Restricted(NoExternalUse.class) -@RestrictedSince("TODO") +@RestrictedSince("2.236") public class Protector { private static final String ALGORITHM_MODE = "AES/CBC/PKCS5Padding"; private static final String ALGORITHM = "AES"; diff --git a/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java b/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java index 4ba11f5c0c..30b541f5d9 100644 --- a/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java +++ b/core/src/main/java/jenkins/model/GlobalCloudConfiguration.java @@ -26,7 +26,7 @@ import java.io.IOException; @Extension @Symbol("cloud") @Restricted(NoExternalUse.class) -@RestrictedSince("TODO") +@RestrictedSince("2.205") public class GlobalCloudConfiguration implements RootAction { @CheckForNull