Skip to content

Commit b14a594

Browse files
timjatimja
authored
Merge branch 'master' into refine-script-console
2 parents 8b7aaac + 4df1ecc commit b14a594

File tree

9 files changed

+56
-45
lines changed

9 files changed

+56
-45
lines changed

‎core/src/main/java/hudson/diagnosis/OldDataMonitor.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import jenkins.model.Jenkins;
6262
import org.jenkinsci.Symbol;
6363
import org.kohsuke.accmod.Restricted;
64+
import org.kohsuke.accmod.restrictions.DoNotUse;
6465
import org.kohsuke.accmod.restrictions.NoExternalUse;
6566
import org.kohsuke.stapler.HttpRedirect;
6667
import org.kohsuke.stapler.HttpResponse;
@@ -107,6 +108,12 @@ public boolean isActivated() {
107108
return !data.isEmpty();
108109
}
109110

111+
@SuppressWarnings("unused")
112+
@Restricted(DoNotUse.class) // used by jelly
113+
public ManagementLink getManagementLink() {
114+
return ExtensionList.lookupSingleton(ManagementLinkImpl.class);
115+
}
116+
110117
public Map<Saveable, VersionRange> getData() {
111118
Map<Saveable, VersionRange> r = new HashMap<>();
112119
for (Map.Entry<SaveableReference, VersionRange> entry : this.data.entrySet()) {

‎core/src/main/java/hudson/logging/LogRecorderManager.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828
import static java.util.stream.Collectors.toMap;
2929

3030
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
31+
import hudson.ExtensionList;
3132
import hudson.FeedAdapter;
3233
import hudson.Functions;
3334
import hudson.RestrictedSince;
3435
import hudson.Util;
3536
import hudson.init.Initializer;
3637
import hudson.model.AbstractModelObject;
3738
import hudson.model.Failure;
39+
import hudson.model.ManagementLink;
3840
import hudson.model.RSS;
3941
import hudson.util.CopyOnWriteMap;
4042
import hudson.util.FormValidation;
@@ -54,13 +56,15 @@
5456
import java.util.logging.LogManager;
5557
import java.util.logging.LogRecord;
5658
import java.util.logging.Logger;
59+
import jenkins.management.SystemLogLink;
5760
import jenkins.model.Jenkins;
5861
import jenkins.model.JenkinsLocationConfiguration;
5962
import jenkins.model.ModelObjectWithChildren;
6063
import jenkins.model.ModelObjectWithContextMenu.ContextMenu;
6164
import jenkins.util.SystemProperties;
6265
import org.apache.commons.io.filefilter.WildcardFileFilter;
6366
import org.kohsuke.accmod.Restricted;
67+
import org.kohsuke.accmod.restrictions.DoNotUse;
6468
import org.kohsuke.accmod.restrictions.NoExternalUse;
6569
import org.kohsuke.stapler.DataBoundConstructor;
6670
import org.kohsuke.stapler.DataBoundSetter;
@@ -295,6 +299,12 @@ public Object getTarget() {
295299
return this;
296300
}
297301

302+
@SuppressWarnings("unused")
303+
@Restricted(DoNotUse.class) // used by jelly
304+
public ManagementLink getManagementLink() {
305+
return ExtensionList.lookupSingleton(SystemLogLink.class);
306+
}
307+
298308
/**
299309
* Escape hatch for StaplerProxy-based access control
300310
*/

‎core/src/main/java/jenkins/agents/CloudSet.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@
2525
package jenkins.agents;
2626

2727
import hudson.Extension;
28+
import hudson.ExtensionList;
2829
import hudson.Functions;
2930
import hudson.Util;
3031
import hudson.model.AbstractModelObject;
3132
import hudson.model.AutoCompletionCandidates;
3233
import hudson.model.Describable;
3334
import hudson.model.Descriptor;
3435
import hudson.model.Failure;
36+
import hudson.model.ManagementLink;
3537
import hudson.model.RootAction;
3638
import hudson.model.UpdateCenter;
3739
import hudson.slaves.Cloud;
@@ -101,6 +103,12 @@ public String getSearchUrl() {
101103
return "/cloud/";
102104
}
103105

106+
@SuppressWarnings("unused")
107+
@Restricted(DoNotUse.class) // used by jelly
108+
public ManagementLink getManagementLink() {
109+
return ExtensionList.lookupSingleton(CloudsLink.class);
110+
}
111+
104112
@SuppressWarnings("unused") // stapler
105113
@Restricted(DoNotUse.class) // stapler
106114
public String getCloudUrl(StaplerRequest2 request, Jenkins jenkins, Cloud cloud) {

‎core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ THE SOFTWARE.
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
27-
<j:set var="previousIt" value="${it}" />
28-
<j:new var="it" className="hudson.diagnosis.OldDataMonitor$ManagementLinkImpl" />
29-
30-
<l:settings-subpage>
31-
<j:set var="it" value="${previousIt}" />
32-
27+
<l:settings-subpage managementLink="${it.managementLink}">
3328
<p class="jenkins-!-margin-top-0">${%blurb.1}</p>
3429
<p>${%blurb.2}</p>
3530

‎core/src/main/resources/hudson/logging/LogRecorderManager/index.jelly‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ THE SOFTWARE.
2828
<?jelly escape-by-default='true'?>
2929
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
3030
<j:set var="header">
31-
<j:set var="previousIt" value="${it}" />
32-
<j:new var="it" className="jenkins.management.SystemLogLink" />
33-
3431
<l:view>
35-
<l:app-bar title="${it.displayName}">
32+
<l:app-bar title="${it.managementLink.displayName}">
3633
<l:isAdmin>
3734
<a href="new" class="jenkins-button jenkins-button--primary">
3835
<l:icon src="symbol-add" />
@@ -46,13 +43,12 @@ THE SOFTWARE.
4643
</l:app-bar>
4744

4845
<div class="jenkins-page-description">
49-
<j:out value="${it.description}" />
46+
<j:out value="${it.managementLink.description}" />
5047
</div>
5148
</l:view>
5249
</j:set>
5350

54-
<l:settings-subpage header="${header}" xmlns:local="local">
55-
<j:set var="it" value="${previousIt}" />
51+
<l:settings-subpage header="${header}" managementLink="${it.managementLink}" xmlns:local="local">
5652
<d:taglib uri="local">
5753
<d:tag name="row">
5854
<tr>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +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-
<j:set var="previousIt" value="${it}" />
31-
<j:new var="it" className="jenkins.agents.CloudsLink" />
32-
33-
<l:settings-subpage header="${null}">
34-
<j:set var="it" value="${previousIt}" />
35-
30+
<l:settings-subpage managementLink="${it.managementLink}" header="${null}">
3631
<l:isAdmin>
3732
<script src="${resURL}/jsbundles/pages/cloud-set.js" type="text/javascript" />
3833
<link rel="stylesheet" href="${resURL}/jsbundles/pages/cloud-set.css" type="text/css" />

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"@babel/cli": "7.28.3",
2727
"@babel/core": "7.28.5",
2828
"@babel/preset-env": "7.28.5",
29-
"@eslint/js": "9.39.1",
29+
"@eslint/js": "9.39.2",
3030
"babel-loader": "10.0.0",
3131
"clean-webpack-plugin": "4.0.0",
3232
"css-loader": "7.1.2",
33-
"css-minimizer-webpack-plugin": "7.0.3",
34-
"eslint": "9.39.1",
33+
"css-minimizer-webpack-plugin": "7.0.4",
34+
"eslint": "9.39.2",
3535
"eslint-config-prettier": "10.1.8",
3636
"eslint-formatter-checkstyle": "9.0.1",
3737
"globals": "16.5.0",
@@ -42,7 +42,7 @@
4242
"postcss-preset-env": "10.5.0",
4343
"postcss-scss": "4.0.9",
4444
"prettier": "3.7.4",
45-
"sass": "1.95.1",
45+
"sass": "1.96.0",
4646
"sass-loader": "16.0.6",
4747
"style-loader": "4.0.0",
4848
"stylelint": "16.26.1",

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ THE SOFTWARE.
281281
<dependency>
282282
<groupId>com.puppycrawl.tools</groupId>
283283
<artifactId>checkstyle</artifactId>
284-
<version>12.2.0</version>
284+
<version>12.3.0</version>
285285
</dependency>
286286
</dependencies>
287287
<executions>

‎yarn.lock‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,10 +1808,10 @@ __metadata:
18081808
languageName: node
18091809
linkType: hard
18101810

1811-
"@eslint/js@npm:9.39.1":
1812-
version: 9.39.1
1813-
resolution: "@eslint/js@npm:9.39.1"
1814-
checksum: 10c0/6f7f26f8cdb7ad6327bbf9741973b6278eb946f18f70e35406e88194b0d5c522d0547a34a02f2a208eec95c5d1388cdf7ccb20039efd2e4cb6655615247a50f1
1811+
"@eslint/js@npm:9.39.2":
1812+
version: 9.39.2
1813+
resolution: "@eslint/js@npm:9.39.2"
1814+
checksum: 10c0/00f51c52b04ac79faebfaa65a9652b2093b9c924e945479f1f3945473f78aee83cbc76c8d70bbffbf06f7024626575b16d97b66eab16182e1d0d39daff2f26f5
18151815
languageName: node
18161816
linkType: hard
18171817

@@ -3234,9 +3234,9 @@ __metadata:
32343234
languageName: node
32353235
linkType: hard
32363236

3237-
"css-minimizer-webpack-plugin@npm:7.0.3":
3238-
version: 7.0.3
3239-
resolution: "css-minimizer-webpack-plugin@npm:7.0.3"
3237+
"css-minimizer-webpack-plugin@npm:7.0.4":
3238+
version: 7.0.4
3239+
resolution: "css-minimizer-webpack-plugin@npm:7.0.4"
32403240
dependencies:
32413241
"@jridgewell/trace-mapping": "npm:^0.3.25"
32423242
cssnano: "npm:^7.0.4"
@@ -3259,7 +3259,7 @@ __metadata:
32593259
optional: true
32603260
lightningcss:
32613261
optional: true
3262-
checksum: 10c0/5b8a5cdcac0a47df80158d3890bdb4f9efdf4416d651298eae0d280fba500504d4acd2c605ed25c3fbe022486043c6f8429d200d85973631c411e8e111df5206
3262+
checksum: 10c0/02a5b706e7aa27ebcbb431c9800d2c126e73ae7b130776459b2e4bb4c1747969642b35f90d26d0d76522a1697683e9f1176054f324e5f7ca22640f2fcb9a3770
32633263
languageName: node
32643264
linkType: hard
32653265

@@ -3664,17 +3664,17 @@ __metadata:
36643664
languageName: node
36653665
linkType: hard
36663666

3667-
"eslint@npm:9.39.1":
3668-
version: 9.39.1
3669-
resolution: "eslint@npm:9.39.1"
3667+
"eslint@npm:9.39.2":
3668+
version: 9.39.2
3669+
resolution: "eslint@npm:9.39.2"
36703670
dependencies:
36713671
"@eslint-community/eslint-utils": "npm:^4.8.0"
36723672
"@eslint-community/regexpp": "npm:^4.12.1"
36733673
"@eslint/config-array": "npm:^0.21.1"
36743674
"@eslint/config-helpers": "npm:^0.4.2"
36753675
"@eslint/core": "npm:^0.17.0"
36763676
"@eslint/eslintrc": "npm:^3.3.1"
3677-
"@eslint/js": "npm:9.39.1"
3677+
"@eslint/js": "npm:9.39.2"
36783678
"@eslint/plugin-kit": "npm:^0.4.1"
36793679
"@humanfs/node": "npm:^0.16.6"
36803680
"@humanwhocodes/module-importer": "npm:^1.0.1"
@@ -3709,7 +3709,7 @@ __metadata:
37093709
optional: true
37103710
bin:
37113711
eslint: bin/eslint.js
3712-
checksum: 10c0/59b2480639404ba24578ca480f973683b87b7aac8aa7e349240474a39067804fd13cd8b9cb22fee074170b8c7c563b57bab703ec0f0d3f81ea017e5d2cad299d
3712+
checksum: 10c0/bb88ca8fd16bb7e1ac3e13804c54d41c583214460c0faa7b3e7c574e69c5600c7122295500fb4b0c06067831111db740931e98da1340329527658e1cf80073d3
37133713
languageName: node
37143714
linkType: hard
37153715

@@ -4496,12 +4496,12 @@ __metadata:
44964496
"@babel/cli": "npm:7.28.3"
44974497
"@babel/core": "npm:7.28.5"
44984498
"@babel/preset-env": "npm:7.28.5"
4499-
"@eslint/js": "npm:9.39.1"
4499+
"@eslint/js": "npm:9.39.2"
45004500
babel-loader: "npm:10.0.0"
45014501
clean-webpack-plugin: "npm:4.0.0"
45024502
css-loader: "npm:7.1.2"
4503-
css-minimizer-webpack-plugin: "npm:7.0.3"
4504-
eslint: "npm:9.39.1"
4503+
css-minimizer-webpack-plugin: "npm:7.0.4"
4504+
eslint: "npm:9.39.2"
45054505
eslint-config-prettier: "npm:10.1.8"
45064506
eslint-formatter-checkstyle: "npm:9.0.1"
45074507
globals: "npm:16.5.0"
@@ -4516,7 +4516,7 @@ __metadata:
45164516
postcss-preset-env: "npm:10.5.0"
45174517
postcss-scss: "npm:4.0.9"
45184518
prettier: "npm:3.7.4"
4519-
sass: "npm:1.95.1"
4519+
sass: "npm:1.96.0"
45204520
sass-loader: "npm:16.0.6"
45214521
sortablejs: "npm:1.15.6"
45224522
style-loader: "npm:4.0.0"
@@ -6516,9 +6516,9 @@ __metadata:
65166516
languageName: node
65176517
linkType: hard
65186518

6519-
"sass@npm:1.95.1":
6520-
version: 1.95.1
6521-
resolution: "sass@npm:1.95.1"
6519+
"sass@npm:1.96.0":
6520+
version: 1.96.0
6521+
resolution: "sass@npm:1.96.0"
65226522
dependencies:
65236523
"@parcel/watcher": "npm:^2.4.1"
65246524
chokidar: "npm:^4.0.0"
@@ -6529,7 +6529,7 @@ __metadata:
65296529
optional: true
65306530
bin:
65316531
sass: sass.js
6532-
checksum: 10c0/458c65e961eb67a64b15c9e78897543f5af98b40ecd3a6a4f10d12fcf8fc17af029602ce9897ad48b1a4404083969575db28b78249e11ecdf54dbe9ea7fda594
6532+
checksum: 10c0/a932054bcee6935757417af6072d31b65ce3557798a53351b3e1369d7f06e24b0ec211e1617bdaaee998b429a44bf0f52acd240fd47f88422d5bc241eeb71672
65336533
languageName: node
65346534
linkType: hard
65356535

0 commit comments

Comments
 (0)