Skip to content

Commit

Permalink
Merge branch 'master' into flabrie-patch-3
Browse files Browse the repository at this point in the history
* master:
  Bump org.jenkins-ci:jenkins from 1.105 to 1.106 (jenkinsci#8550)
  Bump asm.version from 9.5 to 9.6 (jenkinsci#8545)
  Fix encoding of Brazilian Portuguese localization (jenkinsci#8549)
  Warn users of old Java version 18 months before end of life (jenkinsci#8543)
  Bump org.jenkins-ci.plugins:credentials from 1271.v54b_1c2c6388a_ to 1290.v2e5b_13eb_b_127 (jenkinsci#8548)
  Bump com.puppycrawl.tools:checkstyle from 10.12.3 to 10.12.4 (jenkinsci#8547)
  Bump io.jenkins.plugins:plugin-util-api from 3.3.0 to 3.4.0 (jenkinsci#8538)
  • Loading branch information
Francis Labrie committed Oct 2, 2023
2 parents 651f897 + ab0dbef commit 757891a
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ THE SOFTWARE.
<description>The module contains dependencies that are used by a specific Jenkins version</description>

<properties>
<asm.version>9.5</asm.version>
<asm.version>9.6</asm.version>
<slf4jVersion>2.0.9</slf4jVersion>
<stapler.version>1814.vdc9dd5217ee2</stapler.version>
<groovy.version>2.4.21</groovy.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private static String getId() {

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

@Override
Expand Down Expand Up @@ -156,7 +156,7 @@ private static Period getDeprecationPeriod() {

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

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:f="/lib/form" xmlns:i="jelly:fmt" xmlns:st="jelly:stapler">
${%blurb(it.javaVersion)}
${%blurb}
</j:jelly>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
blurb = Recommends Java {0,number} for running Jenkins if an older version is used.
blurb = Recommends a Java upgrade for Jenkins if an older Java version is used.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

blurb=Recomenda o Java {0,number} para executar o Jenkins se uma versão anterior está em uso.
blurb=Recomenda uma atualização do Java para Jenkins se uma versão anterior do Java estiver em uso.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
blurb = Рекомендует запускать Jenkins на Java {0,number}, если используется более старая версия.
blurb = Рекомендует обновить Java для Jenkins, если используется более старая версия Java.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
blurb=若您使用的 Java 版本低於 {0,number},推薦您改用 Java {0,number} 來執行 Jenkins
blurb=如果使用較舊的 Java 版本,建議對 Jenkins 進行 Java 升級
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci</groupId>
<artifactId>jenkins</artifactId>
<version>1.105</version>
<version>1.106</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -332,7 +332,7 @@ THE SOFTWARE.
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.12.3</version>
<version>10.12.4</version>
</dependency>
</dependencies>
<executions>
Expand Down
10 changes: 8 additions & 2 deletions test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ THE SOFTWARE.
<!-- RequireUpperBoundDeps between checks-api, echarts-api, font-awesome-api, and junit -->
<groupId>io.jenkins.plugins</groupId>
<artifactId>plugin-util-api</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
Expand All @@ -108,6 +108,12 @@ THE SOFTWARE.
<artifactId>script-security</artifactId>
<version>1275.v23895f409fb_d</version>
</dependency>
<dependency>
<!-- Required by plugin-util-api -->
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>865.v43e78cc44e0d</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -196,7 +202,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>1271.v54b_1c2c6388a_</version>
<version>1290.v2e5b_13eb_b_127</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down

0 comments on commit 757891a

Please sign in to comment.