Skip to content

Commit e8cfa34

Browse files
timjatimja
authored
Enable CD (#1840)
1 parent 44b59a0 commit e8cfa34

File tree

12 files changed

+144
-51
lines changed

12 files changed

+144
-51
lines changed

‎.github/dependabot.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ updates:
55
schedule:
66
interval: weekly
77
open-pull-requests-limit: 10
8-
ignore:
9-
- dependency-name: org.jenkins-ci.main:jenkins-core
10-
versions:
11-
- ">= 0"
8+
- package-ecosystem: github-actions
9+
directory: /
10+
schedule:
11+
interval: weekly

‎.github/release-drafter.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
_extends: .github
2-
name-template: v$NEXT_MINOR_VERSION 🌈
3-
tag-template: configuration-as-code-$NEXT_MINOR_VERSION

‎.github/workflows/cd.yaml

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins
2+
3+
name: cd
4+
on:
5+
workflow_dispatch:
6+
check_run:
7+
types:
8+
- completed
9+
10+
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/[email protected]
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/[email protected]
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/[email protected]
47+
with:
48+
fetch-depth: 0
49+
- name: Set up JDK 8
50+
uses: actions/[email protected]
51+
with:
52+
distribution: temurin
53+
java-version: 8
54+
- name: Release
55+
uses: jenkins-infra/[email protected]
56+
with:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
59+
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

‎.mvn/extensions.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
1+
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 https://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
22
<extension>
33
<groupId>io.jenkins.tools.incrementals</groupId>
44
<artifactId>git-changelist-maven-extension</artifactId>
5-
<version>1.2</version>
5+
<version>1.3</version>
66
</extension>
77
</extensions>

‎.mvn/maven.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
-Pconsume-incrementals
22
-Pmight-produce-incrementals
3+
-Dchangelist.format=%d.v%s

‎integrations/pom.xml

+55-12
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<parent>
44
<artifactId>parent</artifactId>
55
<groupId>io.jenkins.configuration-as-code</groupId>
6-
<version>${revision}${changelist}</version>
6+
<version>${changelist}</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

@@ -13,7 +13,8 @@
1313

1414
<properties>
1515
<maven.deploy.skip>true</maven.deploy.skip> <!-- no need to be deployed during release, this is a test-only module -->
16-
<jackson.version>2.12.4</jackson.version>
16+
<jackson.version>2.13.1</jackson.version>
17+
<enforcer.skip>true</enforcer.skip> <!-- I give up, too much effort to maintain enforcer here, should probably try clear out all enforcer only deps and see if it works -->
1718
<netty.version>4.1.72.Final</netty.version>
1819
<jenkins.version>2.319.1</jenkins.version>
1920
<junixsocket.version>2.4.0</junixsocket.version>
@@ -73,6 +74,11 @@
7374
</exclusion>
7475
</exclusions>
7576
</dependency>
77+
<dependency>
78+
<groupId>org.apache.ivy</groupId>
79+
<artifactId>ivy</artifactId>
80+
<version>2.5.0</version>
81+
</dependency>
7682

7783
<dependency>
7884
<groupId>org.jenkins-ci.plugins</groupId>
@@ -409,7 +415,7 @@
409415
<dependency>
410416
<groupId>org.antlr</groupId>
411417
<artifactId>antlr4-runtime</artifactId>
412-
<version>4.9.2</version>
418+
<version>4.9.3</version>
413419
</dependency>
414420
<dependency>
415421
<groupId>org.jenkins-ci.plugins</groupId>
@@ -418,7 +424,12 @@
418424
<dependency>
419425
<groupId>jaxen</groupId>
420426
<artifactId>jaxen</artifactId>
421-
<version>1.2.0</version>
427+
<exclusions>
428+
<exclusion>
429+
<groupId>xml-apis</groupId>
430+
<artifactId>xml-apis</artifactId>
431+
</exclusion>
432+
</exclusions>
422433
</dependency>
423434

424435
<dependency>
@@ -437,7 +448,7 @@
437448
<dependency>
438449
<groupId>org.jenkins-ci.plugins</groupId>
439450
<artifactId>slack</artifactId>
440-
<version>2.48</version>
451+
<version>602.v0da_f7458945d</version>
441452
<scope>test</scope>
442453
</dependency>
443454

@@ -458,6 +469,18 @@
458469
<artifactId>custom-tools-plugin</artifactId>
459470
<version>0.8</version>
460471
</dependency>
472+
473+
<dependency>
474+
<groupId>net.minidev</groupId>
475+
<artifactId>json-smart</artifactId>
476+
<version>2.4.7</version>
477+
<exclusions>
478+
<exclusion>
479+
<groupId>org.ow2.asm</groupId>
480+
<artifactId>asm</artifactId>
481+
</exclusion>
482+
</exclusions>
483+
</dependency>
461484
<dependency>
462485
<groupId>org.jenkins-ci.plugins</groupId>
463486
<artifactId>gitlab-plugin</artifactId>
@@ -491,14 +514,14 @@
491514
<dependency>
492515
<groupId>org.jsoup</groupId>
493516
<artifactId>jsoup</artifactId>
494-
<version>1.14.2</version>
517+
<version>1.14.3</version>
495518
<scope>test</scope>
496519
</dependency>
497520

498521
<dependency>
499522
<groupId>com.vladsch.flexmark</groupId>
500523
<artifactId>flexmark-all</artifactId>
501-
<version>0.50.42</version>
524+
<version>0.62.2</version>
502525
<scope>test</scope>
503526
</dependency>
504527

@@ -552,16 +575,36 @@
552575
<artifactId>gson</artifactId>
553576
<version>2.8.8</version>
554577
</dependency>
578+
<dependency>
579+
<groupId>org.projectlombok</groupId>
580+
<artifactId>lombok</artifactId>
581+
<version>1.18.20</version>
582+
</dependency>
583+
<dependency>
584+
<groupId>com.atlassian.plugins</groupId>
585+
<artifactId>atlassian-plugins-core</artifactId>
586+
<version>4.0.0-m029</version>
587+
</dependency>
588+
<dependency>
589+
<groupId>io.atlassian.fugue</groupId>
590+
<artifactId>fugue</artifactId>
591+
<version>4.7.2</version>
592+
</dependency>
555593
<dependency>
556594
<groupId>com.squareup.okhttp3</groupId>
557595
<artifactId>logging-interceptor</artifactId>
558-
<version>3.14.9</version>
596+
<version>4.9.2</version>
559597
</dependency>
560598
<dependency>
561599
<groupId>com.squareup.okhttp3</groupId>
562600
<artifactId>okhttp</artifactId>
563601
<version>4.9.2</version>
564602
</dependency>
603+
<dependency>
604+
<groupId>org.jenkins-ci</groupId>
605+
<artifactId>symbol-annotation</artifactId>
606+
<version>1.21</version>
607+
</dependency>
565608

566609
<dependency>
567610
<groupId>com.github.docker-java</groupId>
@@ -661,7 +704,7 @@
661704
<dependency>
662705
<groupId>com.google.errorprone</groupId>
663706
<artifactId>error_prone_annotations</artifactId>
664-
<version>2.9.0</version>
707+
<version>2.10.0</version>
665708
</dependency>
666709
<dependency>
667710
<groupId>com.google.protobuf</groupId>
@@ -686,7 +729,7 @@
686729
<dependency>
687730
<groupId>jaxen</groupId>
688731
<artifactId>jaxen</artifactId>
689-
<version>1.1.6</version>
732+
<version>1.2.0</version>
690733
</dependency>
691734
<dependency>
692735
<groupId>org.apache.commons</groupId>
@@ -772,7 +815,7 @@
772815
<dependency>
773816
<groupId>org.json</groupId>
774817
<artifactId>json</artifactId>
775-
<version>20210307</version>
818+
<version>20211205</version>
776819
</dependency>
777820
<dependency>
778821
<groupId>joda-time</groupId>

‎integrations/src/test/resources/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListExpected.yml

-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,3 @@ jdk:
99
mavenGlobalConfig:
1010
globalSettingsProvider: "standard"
1111
settingsProvider: "standard"
12-
msTestInstallation:
13-
installations:
14-
- defaultArgs: "/category:SmokeTests"
15-
home: "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\IDE\\MSTest.exe"
16-
name: "MSTest test"
17-
omitNoIsolation: true

‎plugin/pom.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

55
<parent>
66
<groupId>io.jenkins.configuration-as-code</groupId>
77
<artifactId>parent</artifactId>
8-
<version>${revision}${changelist}</version>
9-
<relativePath>..</relativePath>
8+
<version>${changelist}</version>
109
</parent>
1110
<groupId>io.jenkins</groupId>
1211
<artifactId>configuration-as-code</artifactId>
13-
<version>${revision}${changelist}</version>
12+
<version>${changelist}</version>
1413
<packaging>hpi</packaging>
1514

1615
<name>Configuration as Code Plugin</name>
@@ -49,7 +48,7 @@
4948
<dependencies>
5049
<dependency>
5150
<groupId>io.jenkins.tools.bom</groupId>
52-
<artifactId>bom-2.249.x</artifactId>
51+
<artifactId>bom-2.289.x</artifactId>
5352
<version>${plugin-bom.version}</version>
5453
<scope>import</scope>
5554
<type>pom</type>
@@ -65,7 +64,7 @@
6564
<dependency>
6665
<groupId>org.json</groupId>
6766
<artifactId>json</artifactId>
68-
<version>20210307</version>
67+
<version>20211205</version>
6968
</dependency>
7069
<dependency>
7170
<groupId>com.google.code.findbugs</groupId>

‎pom.xml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.29</version>
7+
<version>4.33</version>
88
<relativePath />
99
</parent>
1010
<groupId>io.jenkins.configuration-as-code</groupId>
1111
<artifactId>parent</artifactId>
12-
<version>${revision}${changelist}</version>
12+
<version>${changelist}</version>
1313
<packaging>pom</packaging>
1414

1515
<modules>
@@ -19,13 +19,13 @@
1919
</modules>
2020

2121
<properties>
22-
<revision>1.55.2</revision>
23-
<changelist>-SNAPSHOT</changelist>
24-
<jenkins.version>2.249.1</jenkins.version>
22+
<changelist>999999-SNAPSHOT</changelist>
23+
<gitHubRepo>jenkinsci/configuration-as-code-plugin</gitHubRepo>
24+
<jenkins.version>2.289.3</jenkins.version>
2525
<java.level>8</java.level>
2626
<tagNameFormat>configuration-as-code-@{project.version}</tagNameFormat>
2727
<useBeta>true</useBeta>
28-
<plugin-bom.version>950.v396cb834de1e</plugin-bom.version>
28+
<plugin-bom.version>1117.v62a_f6a_01de98</plugin-bom.version>
2929
</properties>
3030

3131
<name>Configuration as Code Parent</name>
@@ -35,14 +35,14 @@
3535
<licenses>
3636
<license>
3737
<name>MIT License</name>
38-
<url>http://opensource.org/licenses/MIT</url>
38+
<url>https://opensource.org/licenses/MIT</url>
3939
</license>
4040
</licenses>
4141

4242
<scm>
43-
<connection>scm:git:git://github.com/jenkinsci/configuration-as-code-plugin.git</connection>
44-
<developerConnection>scm:git:[email protected]:jenkinsci/configuration-as-code-plugin.git</developerConnection>
45-
<url>https://github.com/jenkinsci/configuration-as-code-plugin</url>
43+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
44+
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
45+
<url>https://github.com/${gitHubRepo}</url>
4646
<tag>${scmTag}</tag>
4747
</scm>
4848

‎test-harness/pom.xml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
44
<artifactId>parent</artifactId>
55
<groupId>io.jenkins.configuration-as-code</groupId>
6-
<version>${revision}${changelist}</version>
7-
<relativePath>..</relativePath>
6+
<version>${changelist}</version>
87
</parent>
98

109
<artifactId>test-harness</artifactId>
@@ -19,7 +18,7 @@
1918
<dependencies>
2019
<dependency>
2120
<groupId>io.jenkins.tools.bom</groupId>
22-
<artifactId>bom-2.249.x</artifactId>
21+
<artifactId>bom-2.289.x</artifactId>
2322
<version>${plugin-bom.version}</version>
2423
<scope>import</scope>
2524
<type>pom</type>
@@ -59,7 +58,7 @@
5958
<dependency>
6059
<groupId>com.vladsch.flexmark</groupId>
6160
<artifactId>flexmark-all</artifactId>
62-
<version>0.50.42</version>
61+
<version>0.62.2</version>
6362
</dependency>
6463
<dependency>
6564
<groupId>com.github.stefanbirkner</groupId>

0 commit comments

Comments
 (0)