Skip to content

Commit 3ce3125

Browse files
authored
Merge pull request #29 from jenkinsci/ci/master/jdk-17
Add Java 17 as version to test on ci.jenkins.io
2 parents a5cbf8f + 1203ba6 commit 3ce3125

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.github/workflows/jenkins-security-scan.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ on:
77
types: [ opened, synchronize, reopened ]
88
workflow_dispatch:
99

10+
permissions:
11+
security-events: write
12+
contents: read
13+
actions: read
14+
1015
jobs:
1116
security-scan:
1217
uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
1318
with:
14-
java-cache: '' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
15-
java-version: 11 # What version of Java to set up for the build.
19+
java-cache: maven
20+
java-version: 11

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
buildPlugin(configurations: [
22
[platform: 'linux', jdk: '11'],
33
[platform: 'windows', jdk: '11'],
4+
[platform: 'linux', jdk: '17', jenkins: '2.342'],
45
])

pom.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>4.38</version>
8+
<version>4.40</version>
99
<relativePath />
1010
</parent>
1111

1212
<artifactId>envinject-api</artifactId>
1313
<version>1.${changelist}</version>
1414
<packaging>hpi</packaging>
1515
<name>EnvInject API Plugin</name>
16-
<description>Stores shared logic for Environment Injection management</description>
1716
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
1817

1918
<licenses>
@@ -39,8 +38,7 @@
3938

4039
<properties>
4140
<changelist>999999-SNAPSHOT</changelist>
42-
<java.level>8</java.level>
43-
<jenkins.version>2.319.3</jenkins.version>
41+
<jenkins.version>2.332.1</jenkins.version>
4442
</properties>
4543

4644
<scm>
@@ -54,7 +52,13 @@
5452
<dependency>
5553
<groupId>org.jenkins-ci.lib</groupId>
5654
<artifactId>envinject-lib</artifactId>
57-
<version>1.30</version>
55+
<version>1.168.v835cb_a_16513d</version>
56+
<exclusions>
57+
<exclusion>
58+
<groupId>org.kohsuke.stapler</groupId>
59+
<artifactId>stapler</artifactId>
60+
</exclusion>
61+
</exclusions>
5862
</dependency>
5963
</dependencies>
6064

src/main/resources/org/jenkinsci/plugins/envinjectapi/index.jelly renamed to src/main/resources/index.jelly

File renamed without changes.

0 commit comments

Comments
 (0)