Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backporting for 2.426.2 #8721

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Backporting for 2.426.2 #8721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0846d9
[JENKINS-72266] Upgrade Winstone from 6.14 to 6.16 (upgrade Jetty fro…
basil Nov 4, 2023
a190edf
[JENKINS-72252] Warn 12 months and 3 months before end of Java suppor…
MarkEWaite Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

@Override
public boolean isActivated() {
return !disabled && getDeprecationPeriod().toTotalMonths() < 18;
return !disabled && getDeprecationPeriod().toTotalMonths() < 12;

Check warning on line 118 in core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 118 is only partially covered, 2 branches are missing
}

@Override
Expand Down Expand Up @@ -156,7 +156,7 @@

@NonNull
private static Severity getSeverity() {
return getDeprecationPeriod().toTotalMonths() < 9 ? Severity.DANGER : Severity.WARNING;
return getDeprecationPeriod().toTotalMonths() < 3 ? Severity.DANGER : Severity.WARNING;

Check warning on line 159 in core/src/main/java/jenkins/monitor/JavaVersionRecommendationAdminMonitor.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Partially covered line 

Line 159 is only partially covered, one branch is missing
}

/**
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!--
Expand Down
2 changes: 1 addition & 1 deletion war/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading