Skip to content

Commit 2b65531

Browse files
authored
Merge branch 'master' into feature/add-script-listener
2 parents 81eef7b + b26663c commit 2b65531

File tree

62 files changed

+2298
-1701
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2298
-1701
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @jenkinsci/script-security-plugin-developers

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "daily"
7-
ignore:
8-
# Caffeine 3.x requires Java 11, so we cannot update until Jenkins requires Java 11
9-
- dependency-name: "com.github.ben-manes.caffeine:caffeine"
10-
versions: ["[3.0.0,)"]
117
- package-ecosystem: github-actions
128
directory: /
139
schedule:

.github/release-drafter.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.github/workflows/cd.yaml

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,52 +8,8 @@ on:
88
- completed
99

1010
jobs:
11-
validate:
12-
runs-on: ubuntu-latest
13-
outputs:
14-
should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }}
15-
steps:
16-
- name: Verify CI status
17-
uses: jenkins-infra/verify-ci-status-action@v1.2.0
18-
id: verify-ci-status
19-
with:
20-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21-
output_result: true
22-
23-
- name: Release Drafter
24-
uses: release-drafter/release-drafter@v5
25-
if: steps.verify-ci-status.outputs.result == 'success'
26-
with:
27-
name: next
28-
tag: next
29-
version: next
30-
env:
31-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32-
33-
- name: Check interesting categories
34-
uses: jenkins-infra/interesting-category-action@v1.0.0
35-
id: interesting-categories
36-
if: steps.verify-ci-status.outputs.result == 'success'
37-
with:
38-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39-
40-
release:
41-
runs-on: ubuntu-latest
42-
needs: [validate]
43-
if: needs.validate.outputs.should_release == 'true'
44-
steps:
45-
- name: Check out
46-
uses: actions/checkout@v3
47-
with:
48-
fetch-depth: 0
49-
- name: Set up JDK 8
50-
uses: actions/setup-java@v3
51-
with:
52-
distribution: 'temurin'
53-
java-version: 8
54-
- name: Release
55-
uses: jenkins-infra/jenkins-maven-cd-action@v1.2.0
56-
with:
57-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
59-
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
11+
maven-cd:
12+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
13+
secrets:
14+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
15+
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Jenkins Security Scan
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [ opened, synchronize, reopened ]
9+
workflow_dispatch:
10+
11+
permissions:
12+
security-events: write
13+
contents: read
14+
actions: read
15+
16+
jobs:
17+
security-scan:
18+
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
19+
with:
20+
java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
21+
# java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
target
22
work
3-
3+
/.classpath
4+
/.project
5+
/.settings/
46
.idea
57
*.iml
68
.*.sw*

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.3</version>
5+
<version>1.8</version>
66
</extension>
77
</extensions>

0 commit comments

Comments
 (0)