Skip to content

Commit 67b8576

Browse files
authored
Merge branch 'master' into chore/remove-commons-lang-2.6
2 parents 62b195f + 94834cb commit 67b8576

File tree

7 files changed

+585
-529
lines changed

7 files changed

+585
-529
lines changed

core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ THE SOFTWARE.
646646
<!-- Version specified in grandparent POM -->
647647
<configuration>
648648
<!-- Make sure to keep the directives in test/pom.xml and war/pom.xml in sync with these. -->
649-
<argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:${org.mockito:mockito-core:jar}</argLine>
649+
<argLine>@{jacocoSurefireArgs} --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED -javaagent:"${org.mockito:mockito-core:jar}"</argLine>
650650
<reuseForks>false</reuseForks>
651651
</configuration>
652652
</plugin>

core/src/main/resources/jenkins/agents/CloudSet/index.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ THE SOFTWARE.
2727
-->
2828
<?jelly escape-by-default='true'?>
2929
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout" xmlns:f="/lib/form">
30-
<l:settings-subpage managementLink="${it.managementLink}" header="${null}">
30+
<l:settings-subpage managementLink="${it.managementLink}" header="${null}" noDefer="true">
3131
<l:isAdmin>
3232
<script src="${resURL}/jsbundles/pages/cloud-set.js" type="text/javascript" />
3333
<link rel="stylesheet" href="${resURL}/jsbundles/pages/cloud-set.css" type="text/css" />

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
"lint": "yarn lint:js && yarn lint:css"
2424
},
2525
"devDependencies": {
26-
"@babel/cli": "7.28.3",
27-
"@babel/core": "7.28.5",
28-
"@babel/preset-env": "7.28.5",
26+
"@babel/cli": "7.28.6",
27+
"@babel/core": "7.28.6",
28+
"@babel/preset-env": "7.28.6",
2929
"@eslint/js": "9.39.2",
3030
"babel-loader": "10.0.0",
3131
"clean-webpack-plugin": "4.0.0",
@@ -39,15 +39,15 @@
3939
"mini-css-extract-plugin": "2.9.4",
4040
"postcss": "8.5.6",
4141
"postcss-loader": "8.2.0",
42-
"postcss-preset-env": "10.6.0",
42+
"postcss-preset-env": "10.6.1",
4343
"postcss-scss": "4.0.9",
44-
"prettier": "3.7.4",
44+
"prettier": "3.8.0",
4545
"sass": "1.97.2",
4646
"sass-loader": "16.0.6",
4747
"style-loader": "4.0.0",
48-
"stylelint": "16.26.1",
48+
"stylelint": "17.0.0",
4949
"stylelint-checkstyle-reporter": "1.1.1",
50-
"stylelint-config-standard-scss": "16.0.0",
50+
"stylelint-config-standard-scss": "17.0.0",
5151
"webpack": "5.104.1",
5252
"webpack-cli": "6.0.1",
5353
"webpack-remove-empty-scripts": "1.1.1"

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ THE SOFTWARE.
9999
<ban-junit4-imports.skip>false</ban-junit4-imports.skip>
100100
<!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
101101
<winstone.version>8.1029.vd3071f6b_5988</winstone.version>
102-
<node.version>24.12.0</node.version>
102+
<node.version>24.13.0</node.version>
103103
</properties>
104104

105105
<!--

test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ THE SOFTWARE.
238238
<dependency>
239239
<groupId>org.jenkins-ci.plugins</groupId>
240240
<artifactId>credentials</artifactId>
241-
<version>1460.v48765a_c7d849</version>
241+
<version>1480.v2246fd131e83</version>
242242
<scope>test</scope>
243243
</dependency>
244244
<dependency>

war/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ THE SOFTWARE.
383383
<!-- dependency of trilead-api -->
384384
<groupId>io.jenkins.plugins</groupId>
385385
<artifactId>eddsa-api</artifactId>
386-
<version>0.3.0.1-19.vc432d923e5ee</version>
386+
<version>0.3.0.1-27.v6ea_07b_e90d1a_</version>
387387
<type>hpi</type>
388388
</artifactItem>
389389
<artifactItem>
@@ -606,7 +606,7 @@ THE SOFTWARE.
606606
<artifactItem>
607607
<groupId>io.jenkins.lib</groupId>
608608
<artifactId>support-log-formatter</artifactId>
609-
<version>122.vb_e396a_69dc84</version>
609+
<version>123.v72513b_f61500</version>
610610
</artifactItem>
611611
</artifactItems>
612612
<outputDirectory>${project.build.directory}</outputDirectory>

0 commit comments

Comments
 (0)