Skip to content

Commit

Permalink
Add dep. mgmt. for commons-io and commons-compress (#452)
Browse files Browse the repository at this point in the history
A previous update to commons-compress 1.26.0 introduced a requirement
to use commons-io 2.15.1 but there was a version 2.7.x being pulled in
by maven resource module. This commit adds dependency management to all
deployer modules so that these libs stay in sync.
  • Loading branch information
onobc authored May 16, 2024
1 parent c9b2eac commit 310f4fd
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
13 changes: 12 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
<maven.version>3.6.2</maven.version>
<maven-resolver.version>1.4.1</maven-resolver.version>
<maven-wagon.version>3.5.2</maven-wagon.version>
<commons-io.version>2.7</commons-io.version>
<commons-compress.version>1.26.1</commons-compress.version>
<commons-io.version>2.15.1</commons-io.version>
<kubernetes-fabric8-client.version>5.12.4</kubernetes-fabric8-client.version>
<spring-boot.version>2.7.18</spring-boot.version>
<spring-framework.version>5.3.34</spring-framework.version>
Expand Down Expand Up @@ -110,6 +111,16 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<!-- Override Logback provided by Spring Boot -->
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down
2 changes: 0 additions & 2 deletions spring-cloud-deployer-cloudfoundry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<java.version>1.8</java.version>
<cloudfoundry-java-lib.version>4.16.0.RELEASE</cloudfoundry-java-lib.version>
<pivotal-cf-client-reactor.version>2.2.0.RELEASE</pivotal-cf-client-reactor.version>
<commons-compress.version>1.26.0</commons-compress.version>
<okhttp.version>3.14.9</okhttp.version>
</properties>

Expand Down Expand Up @@ -48,7 +47,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.cloudfoundry</groupId>
Expand Down
1 change: 0 additions & 1 deletion spring-cloud-deployer-resource-maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Expand Down

0 comments on commit 310f4fd

Please sign in to comment.