From 3823cbf39e83acae1d15d4cfcf616047eea4e87f Mon Sep 17 00:00:00 2001
From: Baptiste Mathus <batmat@batmat.net>
Date: Sun, 17 Sep 2017 15:26:07 +0200
Subject: [PATCH] Downgrade restriction from DoNotUse to NoExternalUse

There's a failure with accmod using DoNotUse. So taking the
easy path here to move forward. This will already have the intended
effect: clarify that TimeUnit2 is not to be used anymore.
---
 core/src/main/java/hudson/util/TimeUnit2.java | 4 ++--
 pom.xml                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/util/TimeUnit2.java b/core/src/main/java/hudson/util/TimeUnit2.java
index e7b704286d..e90f5ec42a 100644
--- a/core/src/main/java/hudson/util/TimeUnit2.java
+++ b/core/src/main/java/hudson/util/TimeUnit2.java
@@ -31,7 +31,7 @@ package hudson.util;
 
 import hudson.RestrictedSince;
 import org.kohsuke.accmod.Restricted;
-import org.kohsuke.accmod.restrictions.DoNotUse;
+import org.kohsuke.accmod.restrictions.NoExternalUse;
 
 import java.util.concurrent.TimeUnit;
 
@@ -72,7 +72,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Deprecated
 @RestrictedSince("TODO")
-@Restricted(DoNotUse.class)
+@Restricted(NoExternalUse.class)
 public enum TimeUnit2 {
     NANOSECONDS {
         @Override public long toNanos(long d)   { return d; }
diff --git a/pom.xml b/pom.xml
index 14c774a01f..d3b3b41303 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@ THE SOFTWARE.
     <findbugs-maven-plugin.version>3.0.4</findbugs-maven-plugin.version>
     <findbugs.failOnError>true</findbugs.failOnError>
     <test-annotations.version>1.2</test-annotations.version>
-    <access-modifier.version>1.12-PR6-SNAPSHOT</access-modifier.version>
+    <access-modifier.version>1.11</access-modifier.version>
     <access-modifier-annotation.version>${access-modifier.version}</access-modifier-annotation.version> <!-- differing only where needed for timestamped snapshots -->
     <access-modifier-checker.version>${access-modifier.version}</access-modifier-checker.version>
 
-- 
GitLab