Skip to content

Commit

Permalink
Merge branch 'jenkinsci:master' into JENKINS-36718
Browse files Browse the repository at this point in the history
  • Loading branch information
programbeginnerTW authored Jan 3, 2025
2 parents 58a5fbc + 75410bc commit 2233755
Show file tree
Hide file tree
Showing 6 changed files with 111 additions and 110 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Please\ wait\ while\ Jenkins\ is\ getting\ ready\ to\ work=\
Jenkins is getting ready to work
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=\
Your browser will reload automatically when Jenkins is ready
Your browser will reload automatically when Jenkins is ready.
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Please\ wait\ while\ Jenkins\ is\ restarting=\
Jenkins is restarting
Your\ browser\ will\ reload\ automatically\ when\ Jenkins\ is\ ready=Your browser will reload automatically when Jenkins is ready.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"mini-css-extract-plugin": "2.9.2",
"postcss": "8.4.49",
"postcss-loader": "8.1.1",
"postcss-preset-env": "10.1.2",
"postcss-preset-env": "10.1.3",
"postcss-scss": "4.0.9",
"prettier": "3.4.2",
"sass": "1.83.0",
Expand Down Expand Up @@ -68,5 +68,5 @@
"engines": {
"node": ">=20.0.0"
},
"packageManager": "yarn@4.5.3"
"packageManager": "yarn@4.6.0"
}
2 changes: 1 addition & 1 deletion test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>bouncycastle-api</artifactId>
<version>2.30.1.78.1-248.ve27176eb_46cb_</version>
<version>2.30.1.79-254.vfdb_814e7791e</version>
</dependency>
<dependency>
<!-- RequireUpperBoundDeps via mailer and junit -->
Expand Down
4 changes: 2 additions & 2 deletions war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ THE SOFTWARE.
<!-- detached after 2.16 -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>bouncycastle-api</artifactId>
<version>2.30.1.78.1-248.ve27176eb_46cb_</version>
<version>2.30.1.79-254.vfdb_814e7791e</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
Expand Down Expand Up @@ -551,7 +551,7 @@ THE SOFTWARE.
<!-- dependency of jackson2-api -->
<groupId>io.jenkins.plugins</groupId>
<artifactId>json-api</artifactId>
<version>20240303-101.v7a_8666713110</version>
<version>20241224-119.va_dca_a_b_ea_7da_5</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
Expand Down
Loading

0 comments on commit 2233755

Please sign in to comment.