Skip to content

Commit

Permalink
Merge branch 'master' into fsync-parent
Browse files Browse the repository at this point in the history
  • Loading branch information
basil authored Jan 1, 2024
2 parents 5591c01 + b5030b7 commit d11b688
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-release-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
is-rc: ${{ steps.set-version.outputs.is-rc }}
steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: 11
java-version: 17
cache: "maven"
- name: Set version
id: set-version
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This page provides information about contributing code to the Jenkins core codeb
1. Fork the repository on GitHub
2. Clone the forked repository to your machine
3. Install the necessary development tools. In order to develop Jenkins, you need the following:
- Java Development Kit (JDK) 11 or 17.
- Java Development Kit (JDK) 11, 17 or 21.
In the Jenkins project we usually use [Eclipse Temurin](https://adoptium.net/) or [OpenJDK](https://openjdk.java.net/), but you can use other JDKs as well.
- Apache Maven 3.8.1 or above. You can [download Maven here](https://maven.apache.org/download.cgi).
In the Jenkins project we usually use the most recent Maven release.
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ THE SOFTWARE.

<properties>
<asm.version>9.6</asm.version>
<slf4jVersion>2.0.9</slf4jVersion>
<slf4jVersion>2.0.10</slf4jVersion>
<stapler.version>1822.v120278426e1c</stapler.version>
<groovy.version>2.4.21</groovy.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion war/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"postcss-preset-env": "9.3.0",
"postcss-scss": "4.0.9",
"prettier": "3.1.1",
"sass": "1.69.5",
"sass": "1.69.6",
"sass-loader": "13.3.3",
"style-loader": "3.3.3",
"stylelint": "16.1.0",
Expand Down
10 changes: 5 additions & 5 deletions war/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4465,7 +4465,7 @@ __metadata:
postcss-preset-env: "npm:9.3.0"
postcss-scss: "npm:4.0.9"
prettier: "npm:3.1.1"
sass: "npm:1.69.5"
sass: "npm:1.69.6"
sass-loader: "npm:13.3.3"
sortablejs: "npm:1.15.1"
style-loader: "npm:3.3.3"
Expand Down Expand Up @@ -6458,16 +6458,16 @@ __metadata:
languageName: node
linkType: hard

"sass@npm:1.69.5":
version: 1.69.5
resolution: "sass@npm:1.69.5"
"sass@npm:1.69.6":
version: 1.69.6
resolution: "sass@npm:1.69.6"
dependencies:
chokidar: "npm:>=3.0.0 <4.0.0"
immutable: "npm:^4.0.0"
source-map-js: "npm:>=0.6.2 <2.0.0"
bin:
sass: sass.js
checksum: a9003a9482f2e467fc412cfe58ba4fa14fb78bef7e1283ce5d64a065f8a31114ec3bbf5d4e724f94eb8512c32c768a6f91f228c7f16a26a300bbf4db293b5608
checksum: 8153db8e51e74a9007bb54332e14d122c34288c7d21a5f2eaefef753a1b7bb13f35e042dc6247253dab5b1550b05cea27970371e7548286b4f50f23dd1147d89
languageName: node
linkType: hard

Expand Down

0 comments on commit d11b688

Please sign in to comment.