Skip to content

Commit 8e3cd84

Browse files
jglickjglick
authored
Merge pull request #127 from jglick/cd
Enable CD
2 parents 2e09f1f + f4cbfa1 commit 8e3cd84

File tree

12 files changed

+53
-225
lines changed

12 files changed

+53
-225
lines changed

‎.github/CODEOWNERS

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

‎.github/dependabot.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates
2+
13
version: 2
24
updates:
3-
- package-ecosystem: "maven"
4-
directory: "/"
5-
schedule:
6-
interval: "weekly"
5+
- package-ecosystem: maven
6+
directory: /
7+
schedule:
8+
interval: monthly
9+
- package-ecosystem: github-actions
10+
directory: /
11+
schedule:
12+
interval: monthly

‎.github/release-drafter.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/cd.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
permissions:
11+
checks: read
12+
contents: write
13+
14+
jobs:
15+
maven-cd:
16+
uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1
17+
secrets:
18+
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
19+
MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

‎.github/workflows/release-drafter.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
target/
2-
work*/
2+
work/
33

44
# IntelliJ project files
55
*.iml

‎.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.4</version>
5+
<version>1.6</version>
66
</extension>
77
</extensions>

‎.mvn/maven.config

Lines changed: 1 addition & 0 deletions
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

‎CHANGELOG.md

Lines changed: 0 additions & 158 deletions
This file was deleted.

‎Jenkinsfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
buildPlugin()
1+
buildPlugin(
2+
useContainerAgent: false,
3+
configurations: [
4+
[platform: 'linux', jdk: 17],
5+
[platform: 'windows', jdk: 11],
6+
])

‎README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Docker Commons API Plugin for Jenkins
22

33
[![Join the chat at https://gitter.im/jenkinsci/docker](https://badges.gitter.im/jenkinsci/docker.svg)](https://gitter.im/jenkinsci/docker?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
4-
[![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/docker-commons.svg)](https://plugins.jenkins.io/docker-commons)
5-
[![GitHub release](https://img.shields.io/github/release/jenkinsci/docker-commons-plugin.svg?label=changelog)](https://github.com/jenkinsci/docker-commons-plugin/releases/latest)
6-
[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/role-strategy.svg?color=blue)](https://plugins.jenkins.io/docker-commons)
74

85
API plugin, which provides the common shared functionality for various Docker-related plugins.
96

@@ -60,4 +57,4 @@ pipeline {
6057
## Changelog
6158

6259
* See [GitHub Releases](https://github.com/jenkinsci/docker-commons-plugin/releases/latest) for the recent versions
63-
* See [the release notes archive](./CHANGELOG.md) for version `1.15` and older
60+
* See [the release notes archive](https://github.com/jenkinsci/docker-commons-plugin/blob/2e09f1fe61389ef9a967a2bd362bc9d141807c86/CHANGELOG.md) for version `1.15` and older

‎pom.xml

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,35 @@
55
<parent>
66
<groupId>org.jenkins-ci.plugins</groupId>
77
<artifactId>plugin</artifactId>
8-
<version>4.46</version>
9-
<relativePath />
8+
<version>4.55</version>
9+
<relativePath/>
1010
</parent>
1111

1212
<groupId>org.jenkins-ci.plugins</groupId>
1313
<artifactId>docker-commons</artifactId>
14-
<version>${revision}${changelist}</version>
14+
<version>${changelist}</version>
1515
<packaging>hpi</packaging>
1616

1717
<name>Docker Commons Plugin</name>
18-
<description>APIs useful to Docker-based plugins.</description>
19-
<url>https://github.com/jenkinsci/docker-commons-plugin</url>
18+
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
2019
<licenses>
2120
<license>
2221
<name>MIT License</name>
2322
<url>https://opensource.org/licenses/MIT</url>
2423
</license>
2524
</licenses>
2625

27-
<scm>
28-
<connection>scm:git:git://github.com/jenkinsci/${project.artifactId}-plugin.git</connection>
29-
<developerConnection>scm:git:[email protected]:jenkinsci/${project.artifactId}-plugin.git</developerConnection>
30-
<url>http://github.com/jenkinsci/${project.artifactId}-plugin</url>
26+
<scm child.scm.connection.inherit.append.path="false" child.scm.developerConnection.inherit.append.path="false" child.scm.url.inherit.append.path="false">
27+
<connection>scm:git:https://github.com/${gitHubRepo}</connection>
28+
<developerConnection>scm:git:https://github.com/${gitHubRepo}</developerConnection>
3129
<tag>${scmTag}</tag>
30+
<url>https://github.com/${gitHubRepo}</url>
3231
</scm>
3332

3433
<properties>
35-
<revision>1.22</revision>
36-
<changelist>-SNAPSHOT</changelist>
37-
<bom>2.263</bom>
38-
<jenkins.version>2.263.1</jenkins.version>
39-
<pipeline-model-definition.version>1.9.3</pipeline-model-definition.version>
40-
<jcasc.version>1.51</jcasc.version>
34+
<changelist>999999-SNAPSHOT</changelist>
35+
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
36+
<jenkins.version>2.361.4</jenkins.version>
4137
</properties>
4238

4339
<repositories>
@@ -71,7 +67,6 @@
7167
<dependency>
7268
<groupId>org.jenkinsci.plugins</groupId>
7369
<artifactId>pipeline-model-extensions</artifactId>
74-
<version>${pipeline-model-definition.version}</version>
7570
<!-- optional because the dependency subtree is quite large -->
7671
<optional>true</optional>
7772
</dependency>
@@ -142,47 +137,29 @@
142137
<dependency>
143138
<groupId>org.jenkinsci.plugins</groupId>
144139
<artifactId>pipeline-model-definition</artifactId>
145-
<version>${pipeline-model-definition.version}</version>
146140
<scope>test</scope>
147141
</dependency>
148142
<!-- Dependencies for testing JCasC compatibility-->
149143
<dependency>
150144
<groupId>io.jenkins</groupId>
151145
<artifactId>configuration-as-code</artifactId>
152-
<version>${jcasc.version}</version>
153146
<scope>test</scope>
154147
</dependency>
155148
<dependency>
156149
<groupId>io.jenkins.configuration-as-code</groupId>
157150
<artifactId>test-harness</artifactId>
158-
<version>${jcasc.version}</version>
159151
<scope>test</scope>
160152
</dependency>
161153
</dependencies>
162154
<dependencyManagement>
163155
<dependencies>
164156
<dependency>
165157
<groupId>io.jenkins.tools.bom</groupId>
166-
<artifactId>bom-${bom}.x</artifactId>
167-
<version>984.vb5eaac999a7e</version>
158+
<artifactId>bom-2.361.x</artifactId>
159+
<version>1886.va_11c9f461054</version>
168160
<scope>import</scope>
169161
<type>pom</type>
170162
</dependency>
171-
<dependency>
172-
<groupId>org.jenkins-ci.plugins</groupId>
173-
<artifactId>credentials</artifactId>
174-
<version>2.6.1</version>
175-
</dependency>
176-
<dependency>
177-
<groupId>org.jenkinsci.plugins</groupId>
178-
<artifactId>pipeline-model-api</artifactId>
179-
<version>${pipeline-model-definition.version}</version>
180-
</dependency>
181-
<dependency>
182-
<groupId>org.jenkinsci.plugins</groupId>
183-
<artifactId>pipeline-stage-tags-metadata</artifactId>
184-
<version>${pipeline-model-definition.version}</version>
185-
</dependency>
186163
</dependencies>
187164
</dependencyManagement>
188165

0 commit comments

Comments
 (0)