OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-10-26 19:15:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into migrate_to_junit5_core_2

Browse Source
This commit is contained in:
Mark Waite authored and GitHub committed 2025-05-18 05:46:54 -08:00
2 parents ea1e0b9568 86a6fd8276
commit 881c73310c
11 files changed
+71 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bom/pom.xml
+1 -1
View File
@@ -63,7 +63,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.2.6</version>
<version>6.2.7</version>
<type>pom</type>
<scope>import</scope>
</dependency>
package.json
+1 -1
View File
@@ -47,7 +47,7 @@
"style-loader": "4.0.0",
"stylelint": "16.19.1",
"stylelint-checkstyle-reporter": "1.0.0",
"stylelint-config-standard-scss": "14.0.0",
"stylelint-config-standard-scss": "15.0.0",
"webpack": "5.99.8",
"webpack-cli": "6.0.1",
"webpack-remove-empty-scripts": "1.0.4"
pom.xml
+1 -1
View File
@@ -98,7 +98,7 @@ THE SOFTWARE.
<spotless.check.skip>false</spotless.check.skip>
<!-- Make sure to keep the jetty-ee9-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
<winstone.version>8.9</winstone.version>
<node.version>22.15.0</node.version>
<node.version>22.15.1</node.version>
</properties>
<!--
src/main/scss/base/_style.scss
+4 -4
View File
@@ -148,7 +148,7 @@ td.tab {
pre {
white-space: pre-wrap;
word-wrap: break-word;
word-wrap: word-break;
margin: 0 0 var(--section-padding);
padding: 0.8rem 1rem;
border-radius: var(--form-input-border-radius);
@@ -160,7 +160,7 @@ pre {
line-height: 1.66;
a {
word-wrap: break-word;
word-wrap: word-break;
}
}
@@ -290,7 +290,7 @@ pre.console {
display: none; /* hidden until loaded */
padding: 1rem;
margin: 1rem 0;
word-break: break-word;
word-break: word-break;
border-radius: var(--form-input-border-radius);
background-color: var(--button-background);
border: var(--jenkins-border--subtle);
@@ -380,7 +380,7 @@ img.icon-help {
overflow-y: scroll;
color: var(--text-color);
border-radius: var(--form-input-border-radius);
box-shadow: 0 10px 20px rgba(black, 0.15);
box-shadow: 0 10px 20px rgb(black, 0.15);
margin-top: 8px;
margin-left: 3px;
max-height: 300px;
src/main/scss/components/_row-selection-controller.scss
+4 -4
View File
@@ -146,10 +146,10 @@
z-index: 999;
padding: 0.4rem;
box-shadow:
inset 0 0 0 2px rgba(white, 0.05),
0 0 0 1px rgba(black, 0.05),
0 5px 10px rgba(black, 0.1),
0 5px 20px rgba(black, 0.3);
inset 0 0 0 2px rgb(white, 0.05),
0 0 0 1px rgb(black, 0.05),
0 5px 10px rgb(black, 0.1),
0 5px 20px rgb(black, 0.3);
min-width: 170px;
opacity: 0;
visibility: collapse;
src/main/scss/components/_side-panel-tasks.scss
+1 -1
View File
@@ -83,7 +83,7 @@ $background-outset: 0.7rem;
.task-link-text {
display: contents;
word-break: break-word;
word-break: word-break;
}
&--active {
src/main/scss/components/_tooltips.scss
+1 -1
View File
@@ -17,7 +17,7 @@
// We style tables as they have additional margin/border radius when in tooltips
.jenkins-tooltip--table-wrapper {
background-color: rgba(black, 0.05);
background-color: rgb(black, 0.05);
margin: -0.45rem -0.8rem;
border-radius: 0.6rem;
}
test/pom.xml
+1 -1
View File
@@ -235,7 +235,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1334.vd3b_b_2094e438</version>
<version>1335.v6b_a_a_e18534e1</version>
<scope>test</scope>
</dependency>
<dependency>
test/src/test/java/hudson/cli/ComputerStateTest.java
+19 -10
View File
@@ -30,6 +30,7 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
@@ -94,15 +95,19 @@ public class ComputerStateTest {
assertTrue(slave.toComputer().isOnline());
Result result = command.authorizedTo(Jenkins.READ, Computer.DISCONNECT)
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message")
;
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message");
assertThat(result, succeededSilently());
assertTrue(slave.toComputer().isOffline());
OfflineCause.UserCause cause = (OfflineCause.UserCause) slave.toComputer().getOfflineCause();
assertThat(cause.toString(), endsWith("Custom cause message"));
assertThat(cause.getUser(), equalTo(command.user()));
OfflineCause cause = slave.toComputer().getOfflineCause();
if (cause instanceof OfflineCause.UserCause userCause) {
assertThat(userCause.toString(), endsWith("Custom cause message"));
assertThat(userCause.getUser(), equalTo(command.user()));
} else {
assertThat("seen occasionally in CI", cause, instanceOf(OfflineCause.ChannelTermination.class));
}
}
@Test
@@ -113,15 +118,19 @@ public class ComputerStateTest {
assertTrue(slave.toComputer().isOnline());
Result result = command.authorizedTo(Jenkins.READ, Computer.DISCONNECT)
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message")
;
.invokeWithArgs(slave.getNodeName(), "-m", "Custom cause message");
assertThat(result, succeededSilently());
assertTrue(slave.toComputer().isOffline());
OfflineCause.UserCause cause = (OfflineCause.UserCause) slave.toComputer().getOfflineCause();
assertThat(cause.toString(), endsWith("Custom cause message"));
assertThat(cause.getUser(), equalTo(command.user()));
OfflineCause cause = slave.toComputer().getOfflineCause();
if (cause instanceof OfflineCause.UserCause userCause) {
assertThat(userCause.toString(), endsWith("Custom cause message"));
assertThat(userCause.getUser(), equalTo(command.user()));
} else {
assertThat("seen occasionally in CI", cause, instanceOf(OfflineCause.ChannelTermination.class));
}
}
@Test
war/pom.xml
+1 -1
View File
@@ -317,7 +317,7 @@ THE SOFTWARE.
<!-- detached after 1.577 -->
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>1334.vd3b_b_2094e438</version>
<version>1335.v6b_a_a_e18534e1</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
yarn.lock
+37 -44
View File
@@ -4709,7 +4709,7 @@ __metadata:
style-loader: "npm:4.0.0"
stylelint: "npm:16.19.1"
stylelint-checkstyle-reporter: "npm:1.0.0"
stylelint-config-standard-scss: "npm:14.0.0"
stylelint-config-standard-scss: "npm:15.0.0"
tippy.js: "npm:6.3.7"
webpack: "npm:5.99.8"
webpack-cli: "npm:6.0.1"
@@ -4906,13 +4906,6 @@ __metadata:
languageName: node
linkType: hard
"known-css-properties@npm:^0.35.0":
version: 0.35.0
resolution: "known-css-properties@npm:0.35.0"
checksum: 10c0/04a4a2859d62670bb25b5b28091a1f03f6f0d3298a5ed3e7476397c5287b98c434f6dd9c004a0c67a53b7f21acc93f83c972e98c122f568d4d0bd21fd2b90fb6
languageName: node
linkType: hard
"known-css-properties@npm:^0.36.0":
version: 0.36.0
resolution: "known-css-properties@npm:0.36.0"
@@ -5102,10 +5095,10 @@ __metadata:
languageName: node
linkType: hard
"mdn-data@npm:^2.14.0":
version: 2.15.0
resolution: "mdn-data@npm:2.15.0"
checksum: 10c0/8a0c83198b013d43c2c43bd19c38d44e397b3fe097d269fa3c093d8c112acf12d0be4d892ba50a4802cccb91dd4f720218a66e675150ea2cc3d8aa0d32247e76
"mdn-data@npm:^2.21.0":
version: 2.21.0
resolution: "mdn-data@npm:2.21.0"
checksum: 10c0/cd26902551af2cc29f06f130893cb04bca9ee278939fce3ffbcb759497cc80d53a6f4abdef2ae2f3ed3c95ac8d651f53fc141defd580ebf4ae2f93aea325957b
languageName: node
linkType: hard
@@ -7175,74 +7168,74 @@ __metadata:
languageName: node
linkType: hard
"stylelint-config-recommended-scss@npm:^14.1.0":
version: 14.1.0
resolution: "stylelint-config-recommended-scss@npm:14.1.0"
"stylelint-config-recommended-scss@npm:^15.0.0":
version: 15.0.0
resolution: "stylelint-config-recommended-scss@npm:15.0.0"
dependencies:
postcss-scss: "npm:^4.0.9"
stylelint-config-recommended: "npm:^14.0.1"
stylelint-scss: "npm:^6.4.0"
stylelint-config-recommended: "npm:^16.0.0"
stylelint-scss: "npm:^6.12.0"
peerDependencies:
postcss: ^8.3.3
stylelint: ^16.6.1
stylelint: ^16.16.0
peerDependenciesMeta:
postcss:
optional: true
checksum: 10c0/0a1c1bb6d9f7a21acea82e12fee1b36a195181ae1dd0d8b59145a56f76232a80d5b706269bc4ca4929680d36f10371bd8a7d0aeeee468fa9119a3b56410b052f
checksum: 10c0/653d6760e26ac8fa11b55ac57617c86554fb77c5537319734dd437b7c8be07560c860fbe4daa5dd7d2d21834efc4ba853c6794207920765c325449d852ac40ce
languageName: node
linkType: hard
"stylelint-config-recommended@npm:^14.0.1":
version: 14.0.1
resolution: "stylelint-config-recommended@npm:14.0.1"
"stylelint-config-recommended@npm:^16.0.0":
version: 16.0.0
resolution: "stylelint-config-recommended@npm:16.0.0"
peerDependencies:
stylelint: ^16.1.0
checksum: 10c0/a0a0ecd91f4d193bbe2cc3408228f8a2d8fcb2b2578d77233f86780c9247c796a04e16aad7a91d97cb918e2de34b6a8062bab66ee017c3835d855081d94f4828
stylelint: ^16.16.0
checksum: 10c0/b2b4ea2633a606a0f686521aa5e8908810c9dd21fd4525c86b34213de1e362b445fd5472b6e5ff251d46f999e2ca2c6c704f2efc1c08d5a532084427f4e1c9d8
languageName: node
linkType: hard
"stylelint-config-standard-scss@npm:14.0.0":
version: 14.0.0
resolution: "stylelint-config-standard-scss@npm:14.0.0"
"stylelint-config-standard-scss@npm:15.0.0":
version: 15.0.0
resolution: "stylelint-config-standard-scss@npm:15.0.0"
dependencies:
stylelint-config-recommended-scss: "npm:^14.1.0"
stylelint-config-standard: "npm:^36.0.1"
stylelint-config-recommended-scss: "npm:^15.0.0"
stylelint-config-standard: "npm:^38.0.0"
peerDependencies:
postcss: ^8.3.3
stylelint: ^16.11.0
stylelint: ^16.18.0
peerDependenciesMeta:
postcss:
optional: true
checksum: 10c0/b885f02d955060a8e0214fd8dc30bfc6d84cbdeb870d34ce0761b258914857bd22d537ac1c8ee9755bf4cd5b1f3b94f4ad0270c2ff4362df7d5eb8d95b35db5e
checksum: 10c0/96c9193b37bef83664829c35dea0a2aeb890ff6984e805146fe9ca8238ca05504e1c29bdc1b1e74a4aa939fa73a98106378f39bc178b8f12d8bdcd90ce1cbb84
languageName: node
linkType: hard
"stylelint-config-standard@npm:^36.0.1":
version: 36.0.1
resolution: "stylelint-config-standard@npm:36.0.1"
"stylelint-config-standard@npm:^38.0.0":
version: 38.0.0
resolution: "stylelint-config-standard@npm:38.0.0"
dependencies:
stylelint-config-recommended: "npm:^14.0.1"
stylelint-config-recommended: "npm:^16.0.0"
peerDependencies:
stylelint: ^16.1.0
checksum: 10c0/7f9b954694358e77be5110418f31335be579ce59dd952bc3c6a9449265297db3170ec520e0905769253b48b99c3109a95c71f5b985bf402e48fd6c89b5364cb2
stylelint: ^16.18.0
checksum: 10c0/8b52c7b7d6287c7495a8fe3a681e07ea9478374e7e66b28d61779072d46cd5b845530b2410df7496a008a8efafe834fb46cf07792f4cf57f996e39f24a801b90
languageName: node
linkType: hard
"stylelint-scss@npm:^6.4.0":
version: 6.10.1
resolution: "stylelint-scss@npm:6.10.1"
"stylelint-scss@npm:^6.12.0":
version: 6.12.0
resolution: "stylelint-scss@npm:6.12.0"
dependencies:
css-tree: "npm:^3.0.1"
is-plain-object: "npm:^5.0.0"
known-css-properties: "npm:^0.35.0"
mdn-data: "npm:^2.14.0"
known-css-properties: "npm:^0.36.0"
mdn-data: "npm:^2.21.0"
postcss-media-query-parser: "npm:^0.2.3"
postcss-resolve-nested-selector: "npm:^0.1.6"
postcss-selector-parser: "npm:^7.0.0"
postcss-selector-parser: "npm:^7.1.0"
postcss-value-parser: "npm:^4.2.0"
peerDependencies:
stylelint: ^16.0.2
checksum: 10c0/3fc9b456bff649840783b92365fc30f5e54539794711744f09df45020d2a3d86164e8e16948a35b3b167f6fc8109837d487253faebd8b1ac29800e67a7f7adc9
checksum: 10c0/c0ba314badd22118047e374febf8dabac56bd351d612ed9c9fc2da5dc760996c2768605aa8d4e483cf0b0fe649c35ae5a003c8a872ee5bec1bbc2d8d45673ff5
languageName: node
linkType: hard