Skip to content

Commit 3687d41

Browse files
authored
Merge pull request #762 from MarkEWaite/use-plugin-bom-more
Use plugin BOM for dependencies
2 parents d59ca64 + 06ade3b commit 3687d41

File tree

1 file changed

+5
-68
lines changed

1 file changed

+5
-68
lines changed

pom.xml

Lines changed: 5 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.jenkins-ci.plugins</groupId>
55
<artifactId>plugin</artifactId>
6-
<version>3.49</version>
6+
<version>3.50</version>
77
<relativePath />
88
</parent>
99

@@ -24,17 +24,14 @@
2424
<inceptionYear>2007</inceptionYear>
2525

2626
<properties>
27-
<revision>3.12.2</revision>
27+
<revision>3.13.0</revision>
2828
<changelist>-SNAPSHOT</changelist>
2929
<jenkins.version>2.138.4</jenkins.version>
3030
<java.level>8</java.level>
3131
<no-test-jar>false</no-test-jar>
3232
<useBeta>true</useBeta>
3333
<concurrency>1C</concurrency>
34-
<scm-api-plugin.version>2.6.3</scm-api-plugin.version>
3534
<jcasc.version>1.30</jcasc.version>
36-
<maven.checkstyle.plugin.version>3.1.0</maven.checkstyle.plugin.version>
37-
<maven.checkstyle.version>8.24</maven.checkstyle.version>
3835
<linkXRef>false</linkXRef>
3936
</properties>
4037

@@ -43,14 +40,7 @@
4340
<plugin>
4441
<groupId>org.apache.maven.plugins</groupId>
4542
<artifactId>maven-checkstyle-plugin</artifactId>
46-
<version>${maven.checkstyle.plugin.version}</version>
47-
<dependencies>
48-
<dependency>
49-
<groupId>com.puppycrawl.tools</groupId>
50-
<artifactId>checkstyle</artifactId>
51-
<version>${maven.checkstyle.version}</version>
52-
</dependency>
53-
</dependencies>
43+
<version>3.1.0</version>
5444
<configuration>
5545
<configLocation>google_checks.xml</configLocation>
5646
<failOnViolation>true</failOnViolation>
@@ -93,53 +83,38 @@
9383
<dependency>
9484
<groupId>org.jenkins-ci.plugins</groupId>
9585
<artifactId>structs</artifactId>
96-
<version>1.19</version>
9786
</dependency>
9887
<dependency>
9988
<groupId>org.jenkins-ci.plugins</groupId>
10089
<artifactId>git-client</artifactId>
101-
<version>2.7.7</version>
10290
</dependency>
10391
<dependency>
10492
<groupId>org.jenkins-ci.plugins</groupId>
10593
<artifactId>credentials</artifactId>
106-
<version>2.1.18</version>
10794
</dependency>
10895
<dependency>
10996
<groupId>org.jenkins-ci.plugins</groupId>
11097
<artifactId>ssh-credentials</artifactId>
111-
<version>1.13</version>
11298
</dependency>
11399
<dependency>
114100
<groupId>org.jenkins-ci.plugins</groupId>
115101
<artifactId>scm-api</artifactId>
116-
<version>${scm-api-plugin.version}</version>
117-
<exclusions>
118-
<exclusion>
119-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
120-
<artifactId>workflow-step-api</artifactId>
121-
</exclusion>
122-
</exclusions>
123102
</dependency>
124103
<dependency>
125104
<groupId>org.jenkins-ci.plugins.workflow</groupId>
126105
<artifactId>workflow-step-api</artifactId>
127-
<version>2.20</version>
128106
</dependency>
129107
<dependency>
130108
<groupId>org.jenkins-ci.plugins.workflow</groupId>
131109
<artifactId>workflow-scm-step</artifactId>
132-
<version>2.7</version>
133110
</dependency>
134111
<dependency>
135112
<groupId>org.jenkins-ci.plugins</groupId>
136113
<artifactId>matrix-project</artifactId>
137-
<version>1.7.1</version>
138114
</dependency>
139115
<dependency>
140116
<groupId>org.jenkins-ci.plugins</groupId>
141117
<artifactId>mailer</artifactId>
142-
<version>1.18</version>
143118
</dependency>
144119

145120
<dependency>
@@ -163,12 +138,6 @@
163138
<version>3.1.9</version>
164139
<scope>test</scope>
165140
</dependency>
166-
<dependency>
167-
<groupId>org.jenkins-ci.plugins</groupId>
168-
<artifactId>apache-httpcomponents-client-4-api</artifactId>
169-
<scope>test</scope>
170-
</dependency>
171-
172141

173142
<dependency><!-- we contribute AbstractBuildParameters for Git if it's available -->
174143
<groupId>org.jenkins-ci.plugins</groupId>
@@ -179,7 +148,6 @@
179148
<dependency>
180149
<groupId>org.jenkins-ci.plugins</groupId>
181150
<artifactId>token-macro</artifactId>
182-
<version>1.12.1</version> <!-- Depends on Jenkins 1.609 -->
183151
<optional>true</optional>
184152
</dependency>
185153
<dependency>
@@ -191,21 +159,8 @@
191159
<dependency>
192160
<groupId>org.jenkins-ci.plugins</groupId>
193161
<artifactId>promoted-builds</artifactId>
194-
<version>2.27</version>
162+
<version>3.3</version>
195163
<optional>true</optional>
196-
<exclusions>
197-
<exclusion>
198-
<groupId>org.sonatype.sisu</groupId>
199-
<artifactId>sisu-guava</artifactId>
200-
</exclusion>
201-
<exclusion>
202-
<!-- promoted-builds requests 1.9.2, core requests 1.8.4 -->
203-
<!-- use core version, rather than promoted builds version -->
204-
<!-- trust this optional reference will be harmless -->
205-
<groupId>org.apache.ant</groupId>
206-
<artifactId>ant</artifactId>
207-
</exclusion>
208-
</exclusions>
209164
</dependency>
210165
<dependency>
211166
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -216,15 +171,9 @@
216171
<dependency>
217172
<groupId>org.jenkins-ci.plugins</groupId>
218173
<artifactId>scm-api</artifactId>
219-
<version>${scm-api-plugin.version}</version>
220174
<classifier>tests</classifier>
221175
<scope>test</scope>
222176
</dependency>
223-
<dependency>
224-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
225-
<artifactId>workflow-cps</artifactId>
226-
<scope>test</scope>
227-
</dependency>
228177
<dependency>
229178
<groupId>org.jenkins-ci.plugins.workflow</groupId>
230179
<artifactId>workflow-job</artifactId>
@@ -249,14 +198,7 @@
249198
<dependency>
250199
<groupId>org.jenkins-ci.plugins.workflow</groupId>
251200
<artifactId>workflow-cps-global-lib</artifactId>
252-
<version>2.14</version>
253201
<scope>test</scope>
254-
<exclusions>
255-
<exclusion>
256-
<groupId>org.apache.commons</groupId>
257-
<artifactId>commons-lang3</artifactId>
258-
</exclusion>
259-
</exclusions>
260202
</dependency>
261203
<dependency>
262204
<groupId>org.xmlunit</groupId>
@@ -269,11 +211,6 @@
269211
<artifactId>workflow-api</artifactId>
270212
<scope>test</scope>
271213
</dependency>
272-
<dependency>
273-
<groupId>org.jenkins-ci.plugins.workflow</groupId>
274-
<artifactId>workflow-support</artifactId>
275-
<scope>test</scope>
276-
</dependency>
277214
<!-- JCasC compatibility -->
278215
<dependency>
279216
<groupId>io.jenkins</groupId>
@@ -295,7 +232,7 @@
295232
<dependency>
296233
<groupId>io.jenkins.tools.bom</groupId>
297234
<artifactId>bom</artifactId>
298-
<version>2.138.1</version>
235+
<version>2.138.2</version>
299236
<scope>import</scope>
300237
<type>pom</type>
301238
</dependency>

0 commit comments

Comments
 (0)