diff --git a/.mvn/jvm.config b/.mvn/jvm.config index f0106d148540..1d72cb7d8d93 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1100m +-Xmx1400m diff --git a/bom/pom.xml b/bom/pom.xml index 4ecb6251acea..29f77e1f7202 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -39,7 +39,7 @@ THE SOFTWARE. 9.6 - 2.0.10 + 2.0.11 1822.v120278426e1c 2.4.21 diff --git a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly index df10b841083c..14740e7cddf9 100644 --- a/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly +++ b/core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly @@ -23,29 +23,32 @@ THE SOFTWARE. --> - - - - - -
- - - - - - - - - - - - - - - - -
-
- + + + + jenkins-table__cell--tight + + + + +
+ + + + + + + + + + + + + + + + +
+
+
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly index c7fdba3a542f..de8d4a9316b1 100644 --- a/core/src/main/resources/lib/hudson/projectView.jelly +++ b/core/src/main/resources/lib/hudson/projectView.jelly @@ -88,6 +88,7 @@ THE SOFTWARE.
+ @@ -121,7 +122,7 @@ THE SOFTWARE.
- +
diff --git a/core/src/main/resources/lib/hudson/scriptConsole.jelly b/core/src/main/resources/lib/hudson/scriptConsole.jelly index f6d21d6fcda9..89998ca88001 100644 --- a/core/src/main/resources/lib/hudson/scriptConsole.jelly +++ b/core/src/main/resources/lib/hudson/scriptConsole.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + diff --git a/core/src/site/site.xml b/core/src/site/site.xml index 76faf2e946cc..b8bbef941204 100644 --- a/core/src/site/site.xml +++ b/core/src/site/site.xml @@ -6,7 +6,7 @@ + diff --git a/pom.xml b/pom.xml index 2bd70b413a36..979c049535ce 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jenkins-ci jenkins - 1.108 + 1.109 @@ -73,7 +73,7 @@ THE SOFTWARE. - 2.440 + 2.441 -SNAPSHOT @@ -86,15 +86,11 @@ THE SOFTWARE. https://www.jenkins.io/changelog - 3203.v94ce994fdb_31 + 3206.vb_15dcf73f6a_9 4.13 - - - 4.8.2.0 Max - FindReturnRef,ConstructorThrow Medium 1.33 diff --git a/test/pom.xml b/test/pom.xml index 489e08dac486..d0c3f586df8d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -105,7 +105,7 @@ THE SOFTWARE. org.jenkins-ci.plugins script-security - 1305.v487433146192 + 1313.v7a_6067dc7087 org.jenkins-ci.plugins.workflow @@ -131,7 +131,7 @@ THE SOFTWARE. ${project.groupId} jenkins-test-harness - 2140.ve736dc2b_b_d2c + 2148.v80482520b_d2c test diff --git a/test/src/test/resources/lib/layout/SvgIconTest/TestRootAction/index.jelly b/test/src/test/resources/lib/layout/SvgIconTest/TestRootAction/index.jelly index 40d7b5b19c1e..163a2059b285 100644 --- a/test/src/test/resources/lib/layout/SvgIconTest/TestRootAction/index.jelly +++ b/test/src/test/resources/lib/layout/SvgIconTest/TestRootAction/index.jelly @@ -26,7 +26,7 @@ THE SOFTWARE.
- +
diff --git a/war/package.json b/war/package.json index a80238545ce3..f0afba81ba0a 100644 --- a/war/package.json +++ b/war/package.json @@ -25,23 +25,23 @@ "devDependencies": { "@babel/cli": "7.23.4", "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", + "@babel/preset-env": "7.23.8", "babel-loader": "9.1.3", "clean-webpack-plugin": "4.0.0", - "css-loader": "6.8.1", + "css-loader": "6.9.0", "css-minimizer-webpack-plugin": "5.0.1", "eslint": "8.56.0", "eslint-config-prettier": "9.1.0", "handlebars-loader": "1.7.3", "mini-css-extract-plugin": "2.7.6", - "postcss": "8.4.32", + "postcss": "8.4.33", "postcss-loader": "7.3.4", "postcss-preset-env": "9.3.0", "postcss-scss": "4.0.9", "prettier": "3.1.1", "sass": "1.69.7", "sass-loader": "13.3.3", - "style-loader": "3.3.3", + "style-loader": "3.3.4", "stylelint": "16.1.0", "stylelint-checkstyle-reporter": "0.2.0", "stylelint-config-standard": "33.0.0", diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js index 99b251d690c3..62244731adde 100644 --- a/war/src/main/js/add-item.js +++ b/war/src/main/js/add-item.js @@ -334,7 +334,15 @@ $.when(getItems()).done(function (data) { if (!getFieldValidationStatus("name")) { activateValidationMessage("#itemname-required", ".add-item-name"); setTimeout(function () { - $('input[name="name"][type="text"]', "#createItem").focus(); + var parentName = $('input[name="from"]', "#createItem").val(); + $.get("job/" + parentName + "/api/json?tree=name").done( + function (data) { + if (data.name === parentName) { + //if "name" is invalid, but "from" is a valid job, then switch focus to "name" + $('input[name="name"][type="text"]', "#createItem").focus(); + } + }, + ); }, 400); } else { if (getFormValidationStatus()) { diff --git a/war/src/main/webapp/images/material-icons/computer-24px.svg b/war/src/main/webapp/images/material-icons/computer-24px.svg deleted file mode 100644 index ea9e5a0b7706..000000000000 --- a/war/src/main/webapp/images/material-icons/computer-24px.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/war/src/main/webapp/images/material-icons/edit.svg b/war/src/main/webapp/images/material-icons/edit.svg deleted file mode 100644 index 62889329055d..000000000000 --- a/war/src/main/webapp/images/material-icons/edit.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/war/src/main/webapp/images/material-icons/feed.svg b/war/src/main/webapp/images/material-icons/feed.svg deleted file mode 100644 index 42d72645a1d9..000000000000 --- a/war/src/main/webapp/images/material-icons/feed.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/war/src/main/webapp/images/material-icons/rss_feed-24px.svg b/war/src/main/webapp/images/material-icons/rss_feed-24px.svg deleted file mode 100644 index ab35422ed1e3..000000000000 --- a/war/src/main/webapp/images/material-icons/rss_feed-24px.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/war/src/main/webapp/images/material-icons/svg-sprite-action-symbol.svg b/war/src/main/webapp/images/material-icons/svg-sprite-action-symbol.svg deleted file mode 100644 index 84951eec8da6..000000000000 --- a/war/src/main/webapp/images/material-icons/svg-sprite-action-symbol.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/war/src/main/webapp/images/material-icons/svg-sprite-content-symbol.svg b/war/src/main/webapp/images/material-icons/svg-sprite-content-symbol.svg deleted file mode 100644 index 17bb4c67f8f8..000000000000 --- a/war/src/main/webapp/images/material-icons/svg-sprite-content-symbol.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/war/src/main/webapp/images/material-icons/svg-sprite-navigation-symbol.svg b/war/src/main/webapp/images/material-icons/svg-sprite-navigation-symbol.svg deleted file mode 100644 index 5e3fbefe1059..000000000000 --- a/war/src/main/webapp/images/material-icons/svg-sprite-navigation-symbol.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/war/src/main/webapp/images/material-icons/svg-sprite-social-symbol.svg b/war/src/main/webapp/images/material-icons/svg-sprite-social-symbol.svg deleted file mode 100644 index d9f371db0de7..000000000000 --- a/war/src/main/webapp/images/material-icons/svg-sprite-social-symbol.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/war/src/main/webapp/images/material-icons/view_headline-24px.svg b/war/src/main/webapp/images/material-icons/view_headline-24px.svg deleted file mode 100644 index 4d753fa0b345..000000000000 --- a/war/src/main/webapp/images/material-icons/view_headline-24px.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/war/yarn.lock b/war/yarn.lock index 9565b31ec987..e354e8bdc364 100644 --- a/war/yarn.lock +++ b/war/yarn.lock @@ -699,22 +699,21 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.23.5": - version: 7.23.5 - resolution: "@babel/plugin-transform-classes@npm:7.23.5" +"@babel/plugin-transform-classes@npm:^7.23.8": + version: 7.23.8 + resolution: "@babel/plugin-transform-classes@npm:7.23.8" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" - "@babel/helper-compilation-targets": "npm:^7.22.15" + "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-function-name": "npm:^7.23.0" - "@babel/helper-optimise-call-expression": "npm:^7.22.5" "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/helper-replace-supers": "npm:^7.22.20" "@babel/helper-split-export-declaration": "npm:^7.22.6" globals: "npm:^11.1.0" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 07988f52b4893151887d1ea6ff79e5fe834078c5731bd09babd5659edbbae21ea4e2de326a02443a63fd776b4c945da6177f07875b56fe66e0b7899e830a9e92 + checksum: 227ac5166501e04d9e7fbd5eda6869b084ffa4af6830ac12544ac6ea14953ca00eb1762b0df9349c0f6c8d2a799385910f558066cd0fb85b9ca437b1131a6043 languageName: node linkType: hard @@ -1195,9 +1194,9 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.23.7": - version: 7.23.7 - resolution: "@babel/preset-env@npm:7.23.7" +"@babel/preset-env@npm:7.23.8": + version: 7.23.8 + resolution: "@babel/preset-env@npm:7.23.8" dependencies: "@babel/compat-data": "npm:^7.23.5" "@babel/helper-compilation-targets": "npm:^7.23.6" @@ -1232,7 +1231,7 @@ __metadata: "@babel/plugin-transform-block-scoping": "npm:^7.23.4" "@babel/plugin-transform-class-properties": "npm:^7.23.3" "@babel/plugin-transform-class-static-block": "npm:^7.23.4" - "@babel/plugin-transform-classes": "npm:^7.23.5" + "@babel/plugin-transform-classes": "npm:^7.23.8" "@babel/plugin-transform-computed-properties": "npm:^7.23.3" "@babel/plugin-transform-destructuring": "npm:^7.23.3" "@babel/plugin-transform-dotall-regex": "npm:^7.23.3" @@ -1281,7 +1280,7 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ac9def873cec52ee02a550bde6e22eced16d1ae331bb8ebc82c03e4c91c12ac17e3e4027647e61612937bcc25ac46e71370aaf99dc2e85dbd11f7777ffeed54e + checksum: e602ad954645f1a509644e3d2c72b3c63bdc2273c377e7a83b78f076eca215887ea3624ffc36aaad03deb9ac8acd89e247fd4562b96e0f2b679485e20d8ff25f languageName: node linkType: hard @@ -3126,21 +3125,21 @@ __metadata: languageName: node linkType: hard -"css-loader@npm:6.8.1": - version: 6.8.1 - resolution: "css-loader@npm:6.8.1" +"css-loader@npm:6.9.0": + version: 6.9.0 + resolution: "css-loader@npm:6.9.0" dependencies: icss-utils: "npm:^5.1.0" - postcss: "npm:^8.4.21" + postcss: "npm:^8.4.31" postcss-modules-extract-imports: "npm:^3.0.0" postcss-modules-local-by-default: "npm:^4.0.3" - postcss-modules-scope: "npm:^3.0.0" + postcss-modules-scope: "npm:^3.1.0" postcss-modules-values: "npm:^4.0.0" postcss-value-parser: "npm:^4.2.0" - semver: "npm:^7.3.8" + semver: "npm:^7.5.4" peerDependencies: webpack: ^5.0.0 - checksum: a6e23de4ec1d2832f10b8ca3cfec6b6097a97ca3c73f64338ae5cd110ac270f1b218ff0273d39f677a7a561f1a9d9b0d332274664d0991bcfafaae162c2669c4 + checksum: dded9ddbf3d7d2befe6a6c8fc861a46790626219a732ada3e52d02833dd2731d81b5f9ac7be51d3871b48d1a4b840668598e033f5f82790e892c6942139dbf9c languageName: node linkType: hard @@ -4447,10 +4446,10 @@ __metadata: dependencies: "@babel/cli": "npm:7.23.4" "@babel/core": "npm:7.23.7" - "@babel/preset-env": "npm:7.23.7" + "@babel/preset-env": "npm:7.23.8" babel-loader: "npm:9.1.3" clean-webpack-plugin: "npm:4.0.0" - css-loader: "npm:6.8.1" + css-loader: "npm:6.9.0" css-minimizer-webpack-plugin: "npm:5.0.1" eslint: "npm:8.56.0" eslint-config-prettier: "npm:9.1.0" @@ -4460,7 +4459,7 @@ __metadata: jquery: "npm:3.7.1" lodash: "npm:4.17.21" mini-css-extract-plugin: "npm:2.7.6" - postcss: "npm:8.4.32" + postcss: "npm:8.4.33" postcss-loader: "npm:7.3.4" postcss-preset-env: "npm:9.3.0" postcss-scss: "npm:4.0.9" @@ -4468,7 +4467,7 @@ __metadata: sass: "npm:1.69.7" sass-loader: "npm:13.3.3" sortablejs: "npm:1.15.1" - style-loader: "npm:3.3.3" + style-loader: "npm:3.3.4" stylelint: "npm:16.1.0" stylelint-checkstyle-reporter: "npm:0.2.0" stylelint-config-standard: "npm:33.0.0" @@ -5782,14 +5781,14 @@ __metadata: languageName: node linkType: hard -"postcss-modules-scope@npm:^3.0.0": - version: 3.0.0 - resolution: "postcss-modules-scope@npm:3.0.0" +"postcss-modules-scope@npm:^3.1.0": + version: 3.1.0 + resolution: "postcss-modules-scope@npm:3.1.0" dependencies: postcss-selector-parser: "npm:^6.0.4" peerDependencies: postcss: ^8.1.0 - checksum: 60af503910363689568c2c3701cb019a61b58b3d739391145185eec211bea5d50ccb6ecbe6955b39d856088072fd50ea002e40a52b50e33b181ff5c41da0308a + checksum: bc8e12e9312d7070f34ccef2929f65154102e2b2984a385eaf2ef25b6d4e22234de71116c240a05b541a79946b717d6fa8c5d314f6697bf05f295261693050fe languageName: node linkType: hard @@ -6155,14 +6154,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.32, postcss@npm:^8.4.21, postcss@npm:^8.4.24, postcss@npm:^8.4.32": - version: 8.4.32 - resolution: "postcss@npm:8.4.32" +"postcss@npm:8.4.33, postcss@npm:^8.4.24, postcss@npm:^8.4.31, postcss@npm:^8.4.32": + version: 8.4.33 + resolution: "postcss@npm:8.4.33" dependencies: nanoid: "npm:^3.3.7" picocolors: "npm:^1.0.0" source-map-js: "npm:^1.0.2" - checksum: 39308a9195fa34d4dbdd7b58a896cff0c7809f84f7a4ac1b95b68ca86c9138a395addff33075668ed3983d41b90aac05754c445237a9365eb1c3a5602ebd03ad + checksum: 16eda83458fcd8a91bece287b5920c7f57164c3ea293e6c80d0ea71ce7843007bcd8592260a5160b9a7f02693e6ac93e2495b02d8c7596d3f3f72c1447e3ba79 languageName: node linkType: hard @@ -6512,7 +6511,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.5, semver@npm:^7.3.8, semver@npm:^7.5.4": +"semver@npm:^7.3.5, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: @@ -6734,12 +6733,12 @@ __metadata: languageName: node linkType: hard -"style-loader@npm:3.3.3": - version: 3.3.3 - resolution: "style-loader@npm:3.3.3" +"style-loader@npm:3.3.4": + version: 3.3.4 + resolution: "style-loader@npm:3.3.4" peerDependencies: webpack: ^5.0.0 - checksum: 104bae8abd0627579dc14f3917cf65f1117e8098e3529872f09c26b5eee07933567b7be5c8ebf94d16e322b6e726dc569c5787111bf3786915850db4e351ef33 + checksum: 8f8027fc5c6e91400cbb60066e7db3315810f8eaa0d19b2a254936eb0bec399ba8a7043b1789da9d05ab7c3ba50faf9267765ae0bf3571e48aa34ecdc774be37 languageName: node linkType: hard