Skip to content

Commit

Permalink
Merge branch 'master' into administrative-monitors-api
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-beck authored Nov 28, 2024
2 parents 791b4d5 + d092094 commit 3d5b9fb
Show file tree
Hide file tree
Showing 2,200 changed files with 38,292 additions and 21,982 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
root = true

[*.{js, scss, css, hbs}]
[*.{js, scss, css, hbs, svg}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@

# Yarn
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
/war/.yarn/plugins/** binary
/.yarn/plugins/** binary
12 changes: 9 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,29 @@ For refactoring and code cleanup changes, exercise the code before and after the

### Proposed changelog entries

- JENKINS-XXXXX, human-readable text
- human-readable text

<!-- Comment:
The changelog entry should be in the imperative mood; e.g., write "do this"/"return that" rather than "does this"/"returns that".
For examples, see: https://www.jenkins.io/changelog/
Remove JENKINS-XXXXX if there is no issue for the pull request.
Do not include the Jira issue in the changelog entry.
Include the Jira issue in the description of the pull request so that the changelog generator can find it and include it in the generated changelog.
You may add multiple changelog entries if applicable by adding a new entry to the list, e.g.
- JENKINS-123456, First changelog entry
- First changelog entry
- Second changelog entry
-->

### Proposed upgrade guidelines

N/A

<!-- Comment:
Leave the proposed upgrade guidelines in the pull request with the "N/A" value if no upgrade guidelines are needed.
The changelog generator relies on the presence of the upgrade guidelines section as part of its data extraction process.
-->

```[tasklist]
### Submitter checklist
- [ ] The Jira issue, if it exists, is well-described.
Expand Down
68 changes: 0 additions & 68 deletions .github/dependabot.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ tag-template: jenkins-$NEXT_MINOR_VERSION

template: |
_This is an automatically generated changelog draft for Jenkins weekly releases.
See https://www.jenkins.io/changelog/#v$NEXT_MINOR_VERSION for the official changelog for this release, or https://www.jenkins.io/changelog-old/#v$NEXT_MINOR_VERSION for releases older than around 7 months._
See https://www.jenkins.io/changelog/$NEXT_MINOR_VERSION/ for the official changelog for this release._
$CHANGES
Expand Down
193 changes: 170 additions & 23 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,210 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:base",
"config:recommended",
":disableDependencyDashboard",
":semanticCommitsDisabled"
],
"enabledManagers": ["npm", "regex"],
"postUpdateOptions": ["yarnDedupeHighest"],
"prHourlyLimit": 0,
"prConcurrentLimit": 0,
"postUpdateOptions": [
"yarnDedupeHighest"
],
"packageRules": [
{
"matchDatasources": ["npm"],
"addLabels": ["javascript"],
"stabilityDays": 3,
"reviewers": ["team:sig-ux"]
"matchDatasources": [
"npm"
],
"addLabels": [
"javascript"
],
"minimumReleaseAge": "3 days",
"reviewers": [
"team:sig-ux"
]
},
{
"matchPackageNames": ["node"],
"matchPackageNames": [
"node"
],
"allowedVersions": "/20.[0-9]+.[0-9]+(.[0-9]+)?$/"
},
{
"description": "Should be upgraded in lockstep in order to keep their corresponding Jetty versions aligned, could be grouped but releases are likely separated by a bit of time",
"matchManagers": [
"maven"
],
"enabled": false,
"matchPackageNames": [
"org.eclipse.jetty.ee9:jetty-ee9-maven-plugin",
"org.jenkins-ci:winstone"
]
},
{
"description": "Provided by Jetty and should be aligned with the version provided by the version of Jetty we deliver. See: https://github.com/jenkinsci/jenkins/pull/5211",
"matchManagers": [
"maven"
],
"enabled": false,
"matchPackageNames": [
"jakarta.servlet:jakarta.servlet-api",
"jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api"
]
},
{
"description": "Needs significant testing. See: https://github.com/jenkinsci/jenkins/pull/5112#issuecomment-744429487 and https://github.com/jenkinsci/jenkins/pull/5116#issuecomment-744526638",
"matchManagers": [
"maven"
],
"allowedVersions": "<2.5.0",
"matchPackageNames": [
"org.codehaus.groovy:groovy-all"
]
},
{
"description": "Consumed by Groovy and should be updated in lockstep with Groovy. See: https://github.com/jenkinsci/jenkins/pull/5184",
"matchManagers": [
"maven"
],
"enabled": false,
"matchPackageNames": [
"org.fusesource.jansi:jansi"
]
},
{
"description": "Depends on commons-lang3 which is in progress for removal from core. See: https://issues.jenkins.io/browse/JENKINS-73355",
"matchManagers": [
"maven"
],
"enabled": false,
"matchPackageNames": [
"org.apache.commons:commons-compress"
]
},
{
"description": "Contains incompatible API changes and needs compatibility work. See: https://github.com/jenkinsci/jenkins/pull/4224",
"matchManagers": [
"maven"
],
"enabled": false,
"matchPackageNames": [
"org.jfree:jfreechart"
]
},
{
"description": "Starting with 7.x, Guice switches from javax.* to jakarta.* bindings. See https://github.com/google/guice/wiki/Guice700",
"matchManagers": [
"maven"
],
"allowedVersions": "<7.0.0",
"matchPackageNames": [
"com.google.inject:guice-bom"
]
},
{
"matchFileNames": [
"core/pom.xml",
"test/pom.xml",
"war/pom.xml"
],
"matchPackageNames": [
"org.jenkins-ci.main:remoting"
],
"description": "Avoid updating the remoting.minimum.supported.version property but still update latest one by not placing this property in the parent pom.xml",
"enabled": false
},
{
"matchPackageNames": [
"net.jcip:jcip-annotations"
],
"matchDatasources": [
"maven"
],
"enabled": false,
"description": "maven-metadata.xml is missing for this really old package which is required by renovate"
}
],
"regexManagers": [
"customManagers": [
{
"fileMatch": ["war/pom.xml"],
"matchStrings": ["<node.version>(?<currentValue>.*?)</node.version>"],
"customType": "regex",
"fileMatch": [
"pom.xml"
],
"matchStrings": [
"<node.version>(?<currentValue>.*?)</node.version>"
],
"depNameTemplate": "node",
"datasourceTemplate": "npm"
},
{
"fileMatch": ["ath.sh"],
"matchStrings": ["export ATH_VERSION=(?<currentValue>.*?)\n"],
"customType": "regex",
"fileMatch": [
"ath.sh"
],
"matchStrings": [
"export ATH_VERSION=(?<currentValue>.*?)\n"
],
"depNameTemplate": "jenkins/ath",
"datasourceTemplate": "docker",
"versioningTemplate": "loose"
},
{
"fileMatch": [".gitpod/Dockerfile"],
"matchStrings": ["ARG MAVEN_VERSION=(?<currentValue>.*?)\n"],
"customType": "regex",
"fileMatch": [
".gitpod/Dockerfile"
],
"matchStrings": [
"ARG MAVEN_VERSION=(?<currentValue>.*?)\n"
],
"depNameTemplate": "org.apache.maven:maven-core",
"datasourceTemplate": "maven"
},
{
"fileMatch": ["core/src/site/site.xml"],
"matchStrings": ["lit@(?<currentValue>.*?)/"],
"customType": "regex",
"fileMatch": [
"core/src/site/site.xml"
],
"matchStrings": [
"lit@(?<currentValue>.*?)/"
],
"depNameTemplate": "lit",
"datasourceTemplate": "npm"
},
{
"fileMatch": ["core/src/site/site.xml"],
"matchStrings": ["webcomponentsjs@(?<currentValue>.*?)/"],
"customType": "regex",
"fileMatch": [
"core/src/site/site.xml"
],
"matchStrings": [
"webcomponentsjs@(?<currentValue>.*?)/"
],
"depNameTemplate": "@webcomponents/webcomponentsjs",
"datasourceTemplate": "npm"
},
{
"fileMatch": ["core/src/site/site.xml"],
"matchStrings": ["<version>(?<currentValue>.*?)<\/version>"],
"customType": "regex",
"fileMatch": [
"core/src/site/site.xml"
],
"matchStrings": [
"<version>(?<currentValue>.*?)</version>"
],
"depNameTemplate": "org.apache.maven.skins:maven-fluido-skin",
"datasourceTemplate": "maven"
}
],
"labels": ["dependencies", "skip-changelog"],
"rebaseWhen": "conflicted"
"labels": [
"dependencies",
"skip-changelog"
],
"rebaseWhen": "conflicted",
"ignorePaths": [
"**/node_modules/**",
"**/bower_components/**",
"**/vendor/**",
"**/examples/**",
"**/__tests__/**",
"**/tests/**",
"**/__fixtures__/**"
]
}
2 changes: 1 addition & 1 deletion .github/workflows/announce-lts-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Post on Discourse
uses: roots/discourse-topic-github-release-action@fc9e50fa1a1ce6255ba4d03f104382845b79ad5f # v1.0.0
uses: roots/discourse-topic-github-release-action@c30dc233349b7c6f24f52fb1c659cc64f13b5474 # v1.0.1
with:
discourse-api-key: ${{ secrets.DISCOURSE_RELEASES_API_KEY }}
discourse-base-url: https://community.jenkins.io/
Expand Down
Loading

0 comments on commit 3d5b9fb

Please sign in to comment.