From f0846d9797b85fa3369a267cd8045211314640b7 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 4 Nov 2023 08:47:17 -0700
Subject: [PATCH 1/2] [JENKINS-72266] Upgrade Winstone from 6.14 to 6.16
 (upgrade Jetty from 10.0.17 to 10.0.18 (#8666)

[JENKINS-72266] Upgrade Winstone from 6.14 to 6.16 (upgrade Jetty from 10.0.17 to 10.0.18)

(cherry picked from commit d3295776738cb4675161e71c992777b4605991e8)
---
 pom.xml     | 2 +-
 war/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a5fdb9bc0071..6dd1632a2ea7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>6.14</winstone.version>
+    <winstone.version>6.16</winstone.version>
   </properties>
 
   <!--
diff --git a/war/pom.xml b/war/pom.xml
index ad3a5007eee1..a4ab93e98b2f 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -636,7 +636,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>10.0.17</version>
+        <version>10.0.18</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)

From a190edf08212d87fc1ed238e96ed64f529abdefa Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Sat, 4 Nov 2023 21:22:05 -0600
Subject: [PATCH 2/2] [JENKINS-72252] Warn 12 months and 3 months before end of
 Java support (#8661)

Show Java version admin monitor at 12 months and 3 months

Daniel Beck described his recommendation to alert users at 12 months
and at 3 months prior to the end of support of a Java version.

He wrote:

> The second warning in particular needs to strike a balance between
> being shown late enough so it's actually relevant for whoever hasn't
> acted yet, while being shown early enough that slightly more elaborate
> environments (difficult to schedule maintenance windows) are informed
> in time. 3 months aligns rather nicely with the LTS schedule where
> we kinda expect folks to do that anyway.
>
> 18/9, or even 12/6 errs too far on the side of those for whom this is
> extreme effort (and who dismissed the first message more appropriate for
> their environment!), while showing everyone else completely irrelevant
> notices they won't care about for many months to come.

https://github.com/jenkinsci/jep/pull/400#discussion_r1371510566 provides
more details.

The Java 8 to Java 11 transition saw a significant change in adoption of
Java 11 once the admin monitor was visible to users.  That was shown
slightly over 12 months before the release that required Java 11.
This change continues that pattern of 12 months warning before end
of support.

https://github.com/jenkinsci/jep/pull/400#discussion_r1375623888 has a
graph that shows the adoption curves for Java 8, Java 11, and Java 17.

(cherry picked from commit aeb64c0c3d097131b3f59d7fe9d1cce1f41de336)
---
 .../monitor/JavaVersionRecommendationAdminMonitor.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
index 830f36c47297..86093a634617 100644
--- a/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
+++ b/core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
@@ -115,7 +115,7 @@ private static String getId() {
 
     @Override
     public boolean isActivated() {
-        return !disabled && getDeprecationPeriod().toTotalMonths() < 18;
+        return !disabled && getDeprecationPeriod().toTotalMonths() < 12;
     }
 
     @Override
@@ -156,7 +156,7 @@ private static Period getDeprecationPeriod() {
 
     @NonNull
     private static Severity getSeverity() {
-        return getDeprecationPeriod().toTotalMonths() < 9 ? Severity.DANGER : Severity.WARNING;
+        return getDeprecationPeriod().toTotalMonths() < 3 ? Severity.DANGER : Severity.WARNING;
     }
 
     /**