Merge remote-tracking branch 'upstream/master' as of 2023-08-26 into log-ignored-branches

Author: jimklimov

.git-blame-ignore-revs

@@ -0,0 +1,5 @@
+# .git-blame-ignore-revs
+# Reformatted: https://github.com/jenkinsci/github-branch-source-plugin/pull/392
+2b68b4b8b14afa36ee5e243ed8630e2c01a86e2c
+# Use upstream Spotless configuration (#684)
+51545c395c1c893412a4967c4176f377879955f8

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily

.github/release-drafter.yml

@@ -1,19 +1 @@
-name-template: 'v$NEXT_PATCH_VERSION 🌈'
-tag-template: 'github-branch-source-$NEXT_PATCH_VERSION'
-categories:
-  - title: '🚀 Features'
-    labels:
-      - 'feature'
-      - 'enhancement'
-  - title: '🐛 Bug Fixes'
-    labels:
-      - 'fix'
-      - 'bugfix'
-      - 'bug'
-  - title: '🧰 Maintenance'
-    label: 'chore'
-change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
-template: |
-  ## Changes
-
-  $CHANGES
+_extends: .github

.github/workflows/cd.yaml

@@ -0,0 +1,15 @@
+# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
+
+name: cd
+on:
+  workflow_dispatch:
+  check_run:
+    types:
+      - completed
+
+jobs:
+  maven-cd:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
+    secrets:
+      MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+      MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.2</version>
+    <version>1.6</version>
   </extension>
 </extensions>

.mvn/maven.config

@@ -1,2 +1,3 @@
 -Pconsume-incrementals
 -Pmight-produce-incrementals
+-Dchangelist.format=%d.v%s

Jenkinsfile

@@ -1,5 +1,4 @@
-buildPlugin(configurations: [
-    [ platform: "linux", jdk: "8"],
-    [ platform: "windows", jdk: "8"],
-    [ platform: "linux", jdk: "11", javaLevel: "8" ]
+buildPlugin(useContainerAgent: true, configurations: [
+  [platform: 'linux', jdk: 17],
+  [platform: 'windows', jdk: 11],
 ])

docs/github-app.adoc

@@ -109,7 +109,7 @@ credentials:
 
 == Configuring the github organization folder
 
-See the link:https://docs.cloudbees.com/docs/admin-resources/latest/plugins/github-branch-source[main documentation]
+See the link:https://docs.cloudbees.com/docs/cloudbees-ci/latest/cloud-admin-guide/github-branch-source-plugin[main documentation]
 for how to create a GitHub folder.
 
 - Load the folders configuration page