Skip to content

Commit

Permalink
Merge branch 'master' into new-reorderable-list
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik committed Aug 14, 2024
2 parents 78c6de3 + ef894ef commit 371468a
Show file tree
Hide file tree
Showing 57 changed files with 1,894 additions and 814 deletions.
68 changes: 0 additions & 68 deletions .github/dependabot.yml

This file was deleted.

204 changes: 181 additions & 23 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,63 +1,221 @@
{
"$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:jetty-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 6.x, Spring requires Java 17 at a minimum.",
"matchManagers": [
"maven"
],
"allowedVersions": "<6.0.0",
"matchPackageNames": [
"org.springframework:spring-framework-bom",
"org.springframework.security:spring-security-bom"
]
},
{
"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": [
"war/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__/**"
]
}
10 changes: 5 additions & 5 deletions .github/workflows/publish-release-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
wget -q https://get.jenkins.io/${REPO}/${PROJECT_VERSION}/${FILE_NAME}
- name: Upload Release Asset
id: upload-war
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Upload Release Asset
id: upload-deb
if: always()
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -144,7 +144,7 @@ jobs:
- name: Upload Release Asset
id: upload-rpm
if: always()
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
- name: Upload Release Asset
id: upload-msi
if: always()
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
- name: Upload Release Asset
id: upload-suse-rpm
if: always()
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191
uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2.0.8
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
3 changes: 3 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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=5911.v5f88b_6d0c450
export ATH_VERSION=5929.v295db_5f04eb_1

if [[ $# -eq 0 ]]; then
export JDK=17
Expand Down
Loading

0 comments on commit 371468a

Please sign in to comment.