Skip to content

Commit

Permalink
Sync from main (#459)
Browse files Browse the repository at this point in the history
* Update Spring Framework to 5.3.34 (#449)
* Add dep. mgmt. for commons-io and commons-compress (#452)
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.
* Next development version
* [CI] Remove unused labeler workflow file (#456)
As part of the Spring Project assessment tool initiative we needed to clean up our unused labels as they have grown out of control.
We did this manually in the Github UI.
We came across this unused labels file.
* Update Jackson to 2.17.1
* Update hashids to 1.0.3 (#458)


Co-authored-by: Chris Bono <cbono@vmware.com>
  • Loading branch information
corneil and onobc authored Jun 25, 2024
1 parent 77fb9d2 commit 0214090
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 150 deletions.
140 changes: 0 additions & 140 deletions .github/labels-manage.yml

This file was deleted.

37 changes: 30 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@
<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.33</spring-framework.version>
<spring-framework.version>5.3.34</spring-framework.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<logback.version>1.2.13</logback.version>
<json-path.version>2.9.0</json-path.version>
<jackson-bom.version>2.17.1</jackson-bom.version>
</properties>

<modules>
Expand Down Expand Up @@ -98,18 +100,23 @@
<artifactId>okio</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.5</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client-bom</artifactId>
<version>${kubernetes-fabric8-client.version}</version>
<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 All @@ -126,6 +133,22 @@
<artifactId>logback-access</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- Override Jackson provided by Spring Boot -->
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson-bom.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Override Spring Framework provided by Spring Boot -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring-framework.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
Expand Down
1 change: 0 additions & 1 deletion spring-cloud-deployer-cloudfoundry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.cloudfoundry</groupId>
Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-deployer-kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>org.hashids</groupId>
<artifactId>hashids</artifactId>
<version>1.0.1</version>
<version>1.0.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</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 0214090

Please sign in to comment.