Skip to content

Commit

Permalink
dependency cleanup (#173)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@mawinter69
mawinter69 authored Jan 23, 2024
1 parent 371d523 commit bbadeaf
Showing 1 changed file with 46 additions and 140 deletions.
186 changes: 46 additions & 140 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.66</version>
<version>4.75</version>
</parent>

<artifactId>influxdb</artifactId>
Expand All @@ -47,29 +47,13 @@ THE SOFTWARE.
</scm>

<properties>
<cobertura.version>1.16</cobertura.version>
<commons-csv.version>1.8</commons-csv.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<configuration-as-code.version>1625.v27444588cc3d</configuration-as-code.version>
<credentials.version>1189.vf61b_a_5e2f62e</credentials.version>
<display-url-api.version>2.3.5</display-url-api.version>
<git-plugin.version>4.11.5</git-plugin.version>
<gson.version>2.8.9</gson.version>
<jenkins.version>2.387.3</jenkins.version>
<hpi.compatibleSinceVersion>3.0</hpi.compatibleSinceVersion>
<influxdb-client-java.version>4.1.0</influxdb-client-java.version>
<jacoco.version>3.3.2.1</jacoco.version>
<jenkins.version>2.387.3</jenkins.version>
<junit.version>4.13.2</junit.version>
<junit_plugin.version>1166.va_436e268e972</junit_plugin.version>
<kotlin-stdlib.version>1.6.0</kotlin-stdlib.version>
<matrix-project.version>1.20</matrix-project.version>
<metrics.version>4.0.2.8.1</metrics.version>
<mockito-core.version>3.3.3</mockito-core.version>
<performance.version>3.0</performance.version>
<perfpublisher.version>8.05</perfpublisher.version>
<plain-credentials.version>143.v1b_df8b_d3b_e48</plain-credentials.version>
<robot.version>3.0.0</robot.version>
<script-security.version>1244.ve463715a_f89c</script-security.version>
<cobertura.version>1.17</cobertura.version>
<performance.version>951.v5600a_c6422ed</performance.version>
<perfpublisher.version>8.09</perfpublisher.version>
<robot.version>3.5.0</robot.version>
<spotbugs.failOnError>false</spotbugs.failOnError>
</properties>

Expand Down Expand Up @@ -103,76 +87,46 @@ THE SOFTWARE.
<dependency>
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.387.x</artifactId>
<version>2143.ve4c3c9ec790a</version>
<version>2543.vfb_1a_5fb_9496d</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>symbol-annotation</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<version>${configuration-as-code.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
<version>${credentials.version}</version>
</dependency>
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
<version>${influxdb-client-java.version}</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
</exclusion>
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Jenkins plugin dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
<version>${junit_plugin.version}</version>
<groupId>io.jenkins.plugins</groupId>
<artifactId>okhttp-api</artifactId>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito-core.version}</version>
<scope>test</scope>
<groupId>io.jenkins.plugins</groupId>
<artifactId>commons-lang3-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plain-credentials</artifactId>
<version>${plain-credentials.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
Expand All @@ -182,6 +136,14 @@ THE SOFTWARE.
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-step-api</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>credentials</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>junit</artifactId>
</dependency>

<!-- Optional dependencies -->
<dependency>
Expand All @@ -193,19 +155,16 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>git</artifactId>
<version>${git-plugin.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>jacoco</artifactId>
<version>${jacoco.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>metrics</artifactId>
<version>${metrics.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Expand All @@ -227,81 +186,28 @@ THE SOFTWARE.
<optional>true</optional>
</dependency>

<!-- Transitive dependencies -->
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>matrix-project</artifactId>
<version>${matrix-project.version}</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-durable-task-step</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>scm-api</artifactId>
</dependency>

<!-- RequireUpperBounds fix -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
<version>${commons-csv.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>display-url-api</artifactId>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>${kotlin-stdlib.version}</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci</groupId>
<artifactId>annotation-indexer</artifactId>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId>
<version>${script-security.version}</version>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>access-modifier-annotation</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>ssh-credentials</artifactId>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
<groupId>io.jenkins</groupId>
<artifactId>configuration-as-code</artifactId>
<scope>test</scope>
</dependency>

</dependencies>


Expand Down

0 comments on commit bbadeaf

Please sign in to comment.