Skip to content

Commit bbadeaf

Browse files
mawinter69mawinter69
authored
dependency cleanup (#173)
* dependency cleanup - remove all dependency declarations that are not needed anymore (basically those to make require upper bounds happy) - avoid inclusion of okhttp related jars by explicitly excluding them and instead add a dependency to okhttp-api jenkins plugin - remove version for used plugins that are provided though bom - update dependencies of plugins to latest version - move test dependencies to end * update parent pom version * stay on 2.387.3
1 parent 371d523 commit bbadeaf

File tree

1 file changed

+46
-140
lines changed

1 file changed

+46
-140
lines changed

‎pom.xml

+46-140
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ THE SOFTWARE.
2828
<parent>
2929
<groupId>org.jenkins-ci.plugins</groupId>
3030
<artifactId>plugin</artifactId>
31-
<version>4.66</version>
31+
<version>4.75</version>
3232
</parent>
3333

3434
<artifactId>influxdb</artifactId>
@@ -47,29 +47,13 @@ THE SOFTWARE.
4747
</scm>
4848

4949
<properties>
50-
<cobertura.version>1.16</cobertura.version>
51-
<commons-csv.version>1.8</commons-csv.version>
52-
<commons-lang3.version>3.12.0</commons-lang3.version>
53-
<configuration-as-code.version>1625.v27444588cc3d</configuration-as-code.version>
54-
<credentials.version>1189.vf61b_a_5e2f62e</credentials.version>
55-
<display-url-api.version>2.3.5</display-url-api.version>
56-
<git-plugin.version>4.11.5</git-plugin.version>
57-
<gson.version>2.8.9</gson.version>
50+
<jenkins.version>2.387.3</jenkins.version>
5851
<hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
5952
<influxdb-client-java.version>4.1.0</influxdb-client-java.version>
60-
<jacoco.version>3.3.2.1</jacoco.version>
61-
<jenkins.version>2.387.3</jenkins.version>
62-
<junit.version>4.13.2</junit.version>
63-
<junit_plugin.version>1166.va_436e268e972</junit_plugin.version>
64-
<kotlin-stdlib.version>1.6.0</kotlin-stdlib.version>
65-
<matrix-project.version>1.20</matrix-project.version>
66-
<metrics.version>4.0.2.8.1</metrics.version>
67-
<mockito-core.version>3.3.3</mockito-core.version>
68-
<performance.version>3.0</performance.version>
69-
<perfpublisher.version>8.05</perfpublisher.version>
70-
<plain-credentials.version>143.v1b_df8b_d3b_e48</plain-credentials.version>
71-
<robot.version>3.0.0</robot.version>
72-
<script-security.version>1244.ve463715a_f89c</script-security.version>
53+
<cobertura.version>1.17</cobertura.version>
54+
<performance.version>951.v5600a_c6422ed</performance.version>
55+
<perfpublisher.version>8.09</perfpublisher.version>
56+
<robot.version>3.5.0</robot.version>
7357
<spotbugs.failOnError>false</spotbugs.failOnError>
7458
</properties>
7559

@@ -103,76 +87,46 @@ THE SOFTWARE.
10387
<dependency>
10488
<groupId>io.jenkins.tools.bom</groupId>
10589
<artifactId>bom-2.387.x</artifactId>
106-
<version>2143.ve4c3c9ec790a</version>
90+
<version>2543.vfb_1a_5fb_9496d</version>
10791
<scope>import</scope>
10892
<type>pom</type>
10993
</dependency>
11094
</dependencies>
11195
</dependencyManagement>
11296

11397
<dependencies>
114-
<dependency>
115-
<groupId>org.ow2.asm</groupId>
116-
<artifactId>asm</artifactId>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.ow2.asm</groupId>
120-
<artifactId>asm-commons</artifactId>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.ow2.asm</groupId>
124-
<artifactId>asm-tree</artifactId>
125-
</dependency>
126-
<dependency>
127-
<groupId>org.jenkins-ci.plugins</groupId>
128-
<artifactId>structs</artifactId>
129-
</dependency>
130-
<dependency>
131-
<groupId>org.jenkins-ci</groupId>
132-
<artifactId>symbol-annotation</artifactId>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.apache.commons</groupId>
136-
<artifactId>commons-lang3</artifactId>
137-
<version>${commons-lang3.version}</version>
138-
</dependency>
139-
<dependency>
140-
<groupId>io.jenkins</groupId>
141-
<artifactId>configuration-as-code</artifactId>
142-
<version>${configuration-as-code.version}</version>
143-
<scope>test</scope>
144-
</dependency>
145-
<dependency>
146-
<groupId>org.jenkins-ci.plugins</groupId>
147-
<artifactId>credentials</artifactId>
148-
<version>${credentials.version}</version>
149-
</dependency>
15098
<dependency>
15199
<groupId>com.influxdb</groupId>
152100
<artifactId>influxdb-client-java</artifactId>
153101
<version>${influxdb-client-java.version}</version>
102+
<exclusions>
103+
<exclusion>
104+
<groupId>com.squareup.okio</groupId>
105+
<artifactId>okio</artifactId>
106+
</exclusion>
107+
<exclusion>
108+
<groupId>com.squareup.okhttp3</groupId>
109+
<artifactId>okhttp</artifactId>
110+
</exclusion>
111+
<exclusion>
112+
<groupId>com.squareup.okhttp3</groupId>
113+
<artifactId>logging-interceptor</artifactId>
114+
</exclusion>
115+
</exclusions>
154116
</dependency>
117+
118+
<!-- Jenkins plugin dependencies -->
155119
<dependency>
156-
<groupId>junit</groupId>
157-
<artifactId>junit</artifactId>
158-
<version>${junit.version}</version>
159-
<scope>test</scope>
160-
</dependency>
161-
<dependency>
162-
<groupId>org.jenkins-ci.plugins</groupId>
163-
<artifactId>junit</artifactId>
164-
<version>${junit_plugin.version}</version>
120+
<groupId>io.jenkins.plugins</groupId>
121+
<artifactId>okhttp-api</artifactId>
165122
</dependency>
166123
<dependency>
167-
<groupId>org.mockito</groupId>
168-
<artifactId>mockito-core</artifactId>
169-
<version>${mockito-core.version}</version>
170-
<scope>test</scope>
124+
<groupId>io.jenkins.plugins</groupId>
125+
<artifactId>commons-lang3-api</artifactId>
171126
</dependency>
172127
<dependency>
173128
<groupId>org.jenkins-ci.plugins</groupId>
174129
<artifactId>plain-credentials</artifactId>
175-
<version>${plain-credentials.version}</version>
176130
</dependency>
177131
<dependency>
178132
<groupId>org.jenkins-ci.plugins.workflow</groupId>
@@ -182,6 +136,14 @@ THE SOFTWARE.
182136
<groupId>org.jenkins-ci.plugins.workflow</groupId>
183137
<artifactId>workflow-step-api</artifactId>
184138
</dependency>
139+
<dependency>
140+
<groupId>org.jenkins-ci.plugins</groupId>
141+
<artifactId>credentials</artifactId>
142+
</dependency>
143+
<dependency>
144+
<groupId>org.jenkins-ci.plugins</groupId>
145+
<artifactId>junit</artifactId>
146+
</dependency>
185147

186148
<!-- Optional dependencies -->
187149
<dependency>
@@ -193,19 +155,16 @@ THE SOFTWARE.
193155
<dependency>
194156
<groupId>org.jenkins-ci.plugins</groupId>
195157
<artifactId>git</artifactId>
196-
<version>${git-plugin.version}</version>
197158
<optional>true</optional>
198159
</dependency>
199160
<dependency>
200161
<groupId>org.jenkins-ci.plugins</groupId>
201162
<artifactId>jacoco</artifactId>
202-
<version>${jacoco.version}</version>
203163
<optional>true</optional>
204164
</dependency>
205165
<dependency>
206166
<groupId>org.jenkins-ci.plugins</groupId>
207167
<artifactId>metrics</artifactId>
208-
<version>${metrics.version}</version>
209168
<optional>true</optional>
210169
</dependency>
211170
<dependency>
@@ -227,81 +186,28 @@ THE SOFTWARE.
227186
<optional>true</optional>
228187
</dependency>
229188

230-
<!-- Transitive dependencies -->
231-
<dependency>
232-
<groupId>org.jenkins-ci.plugins</groupId>
233-
<artifactId>matrix-project</artifactId>
234-
<version>${matrix-project.version}</version>
235-
</dependency>
189+
190+
<!-- Test dependencies -->
236191
<dependency>
237192
<groupId>org.jenkins-ci.plugins.workflow</groupId>
238193
<artifactId>workflow-durable-task-step</artifactId>
239194
<scope>test</scope>
240195
</dependency>
241196
<dependency>
242-
<groupId>org.jenkins-ci.plugins</groupId>
243-
<artifactId>scm-api</artifactId>
244-
</dependency>
245-
246-
<!-- RequireUpperBounds fix -->
247-
<dependency>
248-
<groupId>org.apache.commons</groupId>
249-
<artifactId>commons-csv</artifactId>
250-
<version>${commons-csv.version}</version>
251-
</dependency>
252-
<dependency>
253-
<groupId>org.jenkins-ci.plugins</groupId>
254-
<artifactId>display-url-api</artifactId>
255-
</dependency>
256-
<dependency>
257-
<groupId>com.github.spotbugs</groupId>
258-
<artifactId>spotbugs-annotations</artifactId>
259-
</dependency>
260-
<dependency>
261-
<groupId>org.jetbrains.kotlin</groupId>
262-
<artifactId>kotlin-stdlib</artifactId>
263-
<version>${kotlin-stdlib.version}</version>
264-
</dependency>
265-
<dependency>
266-
<groupId>org.jenkins-ci</groupId>
267-
<artifactId>annotation-indexer</artifactId>
268-
</dependency>
269-
<dependency>
270-
<groupId>org.jenkins-ci.plugins</groupId>
271-
<artifactId>script-security</artifactId>
272-
<version>${script-security.version}</version>
273-
</dependency>
274-
<dependency>
275-
<groupId>org.kohsuke</groupId>
276-
<artifactId>access-modifier-annotation</artifactId>
277-
<scope>provided</scope>
278-
</dependency>
279-
<dependency>
280-
<groupId>org.slf4j</groupId>
281-
<artifactId>jcl-over-slf4j</artifactId>
282-
</dependency>
283-
<dependency>
284-
<groupId>org.slf4j</groupId>
285-
<artifactId>log4j-over-slf4j</artifactId>
286-
</dependency>
287-
<dependency>
288-
<groupId>org.slf4j</groupId>
289-
<artifactId>slf4j-api</artifactId>
290-
</dependency>
291-
<dependency>
292-
<groupId>org.slf4j</groupId>
293-
<artifactId>slf4j-jdk14</artifactId>
197+
<groupId>org.jenkins-ci.plugins.workflow</groupId>
198+
<artifactId>workflow-job</artifactId>
199+
<scope>test</scope>
294200
</dependency>
295201
<dependency>
296-
<groupId>org.jenkins-ci.plugins</groupId>
297-
<artifactId>ssh-credentials</artifactId>
202+
<groupId>org.mockito</groupId>
203+
<artifactId>mockito-core</artifactId>
204+
<scope>test</scope>
298205
</dependency>
299206
<dependency>
300-
<groupId>com.google.code.gson</groupId>
301-
<artifactId>gson</artifactId>
302-
<version>${gson.version}</version>
207+
<groupId>io.jenkins</groupId>
208+
<artifactId>configuration-as-code</artifactId>
209+
<scope>test</scope>
303210
</dependency>
304-
305211
</dependencies>
306212

307213

0 commit comments

Comments
 (0)