Skip to content

Commit

Permalink
Merge branch 'master' into administrative-monitors
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik authored Sep 18, 2024
2 parents 86817f9 + 3767f78 commit d353452
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-since-updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
id: run_script
shell: bash
- name: Create Pull Request
uses: peter-evans/create-pull-request@d121e62763d8cc35b5fb1710e887d6e69a52d3a4 # v7
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: Fill in since annotations
Expand Down
2 changes: 1 addition & 1 deletion ath.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o xtrace
cd "$(dirname "$0")"

# https://github.com/jenkinsci/acceptance-test-harness/releases
export ATH_VERSION=5992.v39030e88deb_3
export ATH_VERSION=5997.v2a_1a_696620a_0

if [[ $# -eq 0 ]]; then
export JDK=17
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"globals": "15.9.0",
"handlebars-loader": "1.7.3",
"mini-css-extract-plugin": "2.9.1",
"postcss": "8.4.45",
"postcss": "8.4.47",
"postcss-loader": "8.1.1",
"postcss-preset-env": "10.0.3",
"postcss-scss": "4.0.9",
Expand Down Expand Up @@ -65,5 +65,5 @@
"defaults",
"not IE 11"
],
"packageManager": "yarn@4.4.1"
"packageManager": "yarn@4.5.0"
}
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ THE SOFTWARE.
</issueManagement>

<properties>
<revision>2.477</revision>
<revision>2.478</revision>
<changelist>-SNAPSHOT</changelist>
<project.build.outputTimestamp>2024-09-10T14:09:56Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2024-09-17T13:51:35Z</project.build.outputTimestamp>

<!-- configuration for patch tracker plugin -->
<project.patchManagement.system>github</project.patchManagement.system>
Expand All @@ -102,8 +102,8 @@ THE SOFTWARE.
<!-- frontend-maven-plugin will install this Yarn version as bootstrap, then hand over control to Yarn Berry. -->
<yarn.version>1.22.19</yarn.version>
<!-- maven-antrun-plugin will download this Yarn version. -->
<yarn-berry.version>4.4.1</yarn-berry.version>
<yarn-berry.sha256sum>920b4530755296dc2ce8b4351f057d4a26429524fcb2789d277560d94837c27e</yarn-berry.sha256sum>
<yarn-berry.version>4.5.0</yarn-berry.version>
<yarn-berry.sha256sum>cc00dce5de4f68d11450519a0f69eadf2a1cbe5cc0d8e740bfac817a31d76874</yarn-berry.sha256sum>
</properties>

<!--
Expand Down
6 changes: 3 additions & 3 deletions test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ THE SOFTWARE.
<!-- Required by plugin-util-api -->
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>920.v59f71ce16f04</version>
<version>926.v9f4f9b_b_98c19</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down Expand Up @@ -178,7 +178,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>jenkins-test-harness</artifactId>
<version>2270.v87a_0ea_b_54da_0</version>
<version>2272.v5db_817b_a_6f0d</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down Expand Up @@ -224,7 +224,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>1371.vfee6b_095f0a_3</version>
<version>1378.v81ef4269d764</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion test/src/test/java/hudson/ClassicPluginStrategyTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected Collection<String> loadBundledPlugins() {
}
};
setPluginManager(pluginManager);
return new Hudson(home, createWebServer(), pluginManager);
return new Hudson(home, createWebServer2(), pluginManager);
}
};

Expand Down
2 changes: 1 addition & 1 deletion war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ THE SOFTWARE.
<!-- dependency of checks-api and plugin-util-api -->
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-support</artifactId>
<version>920.v59f71ce16f04</version>
<version>926.v9f4f9b_b_98c19</version>
<type>hpi</type>
</artifactItem>

Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4405,7 +4405,7 @@ __metadata:
jquery: "npm:3.7.1"
lodash: "npm:4.17.21"
mini-css-extract-plugin: "npm:2.9.1"
postcss: "npm:8.4.45"
postcss: "npm:8.4.47"
postcss-loader: "npm:8.1.1"
postcss-preset-env: "npm:10.0.3"
postcss-scss: "npm:4.0.9"
Expand Down Expand Up @@ -5258,7 +5258,7 @@ __metadata:
languageName: node
linkType: hard

"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1, picocolors@npm:^1.1.0":
version: 1.1.0
resolution: "picocolors@npm:1.1.0"
checksum: 10c0/86946f6032148801ef09c051c6fb13b5cf942eaf147e30ea79edb91dd32d700934edebe782a1078ff859fb2b816792e97ef4dab03d7f0b804f6b01a0df35e023
Expand Down Expand Up @@ -6094,14 +6094,14 @@ __metadata:
languageName: node
linkType: hard

"postcss@npm:8.4.45, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
version: 8.4.45
resolution: "postcss@npm:8.4.45"
"postcss@npm:8.4.47, postcss@npm:^8.4.33, postcss@npm:^8.4.38, postcss@npm:^8.4.41":
version: 8.4.47
resolution: "postcss@npm:8.4.47"
dependencies:
nanoid: "npm:^3.3.7"
picocolors: "npm:^1.0.1"
source-map-js: "npm:^1.2.0"
checksum: 10c0/ad6f8b9b1157d678560373696109745ab97a947d449f8a997acac41c7f1e4c0f3ca4b092d6df1387f430f2c9a319987b1780dbdc27e35800a88cde9b606c1e8f
picocolors: "npm:^1.1.0"
source-map-js: "npm:^1.2.1"
checksum: 10c0/929f68b5081b7202709456532cee2a145c1843d391508c5a09de2517e8c4791638f71dd63b1898dba6712f8839d7a6da046c72a5e44c162e908f5911f57b5f44
languageName: node
linkType: hard

Expand Down Expand Up @@ -6530,7 +6530,7 @@ __metadata:
languageName: node
linkType: hard

"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.0":
"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
version: 1.2.1
resolution: "source-map-js@npm:1.2.1"
checksum: 10c0/7bda1fc4c197e3c6ff17de1b8b2c20e60af81b63a52cb32ec5a5d67a20a7d42651e2cb34ebe93833c5a2a084377e17455854fee3e21e7925c64a51b6a52b0faf
Expand Down

0 comments on commit d353452

Please sign in to comment.