From 021409082ba0808ece293e71d2b1a53b793b95f2 Mon Sep 17 00:00:00 2001 From: Corneil du Plessis Date: Tue, 25 Jun 2024 17:09:01 +0200 Subject: [PATCH] Sync from main (#459) * 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 --- .github/labels-manage.yml | 140 ------------------- pom.xml | 37 ++++- spring-cloud-deployer-cloudfoundry/pom.xml | 1 - spring-cloud-deployer-kubernetes/pom.xml | 2 +- spring-cloud-deployer-resource-maven/pom.xml | 1 - 5 files changed, 31 insertions(+), 150 deletions(-) delete mode 100644 .github/labels-manage.yml diff --git a/.github/labels-manage.yml b/.github/labels-manage.yml deleted file mode 100644 index 2cee3243..00000000 --- a/.github/labels-manage.yml +++ /dev/null @@ -1,140 +0,0 @@ -- name: area/dependencies - color: F9D0C4 - description: Belongs project dependencies -- name: area/documentation - color: F9D0C4 - description: Belongs to documentation -- name: area/tests - color: F9D0C4 - description: Belongs to tests - -- name: automation/rlnotes-header - color: EDEDED - description: Belongs to release notes automation -- name: automation/rlnotes-footer - color: EDEDED - description: Belongs to release notes automation - -- name: for/backport - color: E99695 - description: For backporting -- name: for/blocker - color: E99695 - description: For blocking -- name: for/marketing - color: E99695 - description: For marketing -- name: for/spike - color: E99695 - description: For spike -- name: for/team-attention - color: E99695 - description: For team attention - -- name: status/complete - color: FEF2C0 - description: Issue is now complete -- name: status/declined - color: FEF2C0 - description: Issue has been declined -- name: status/duplicate - color: FEF2C0 - description: There were an existing issue -- name: status/in-progress - color: FEF2C0 - description: Something is happening -- name: status/invalid - color: FEF2C0 - description: Mistake, bogus, old, bye bye -- name: status/need-design - color: FEF2C0 - description: Vague so need some proper design -- name: status/need-feedback - color: FEF2C0 - description: Calling participant to provide feedback -- name: status/need-investigation - color: FEF2C0 - description: Oh need to look under a hood -- name: status/need-triage - color: FEF2C0 - description: Team needs to triage and take a first look -- name: status/on-hold - color: FEF2C0 - description: For various reasons is on hold -- name: status/stale - color: FEF2C0 - description: Marked as stale -- name: status/closed-as-stale - color: FEF2C0 - description: Closed as has been stale - -- name: type/automated-pr - color: D4C5F9 - description: Is an automated pr -- name: type/backport - color: D4C5F9 - description: Is a issue to track backport, use with branch/xxx -- name: type/bug - color: D4C5F9 - description: Is a bug report -- name: type/enhancement - color: D4C5F9 - description: Is an enhancement request -- name: type/epic - color: D4C5F9 - description: Collection of issues -- name: type/feature - color: D4C5F9 - description: Is a feature request -- name: type/help-needed - color: D4C5F9 - description: Calling help -- name: type/idea - color: D4C5F9 - description: Is just an idea -- name: type/task - color: D4C5F9 - description: Something needs to get done -- name: type/technical-debt - color: D4C5F9 - description: Techical Dept -- name: type/question - color: D4C5F9 - description: Is a question - -- name: branch/1.0.x - color: BFDADC - description: Issue for a branch -- name: branch/1.1.x - color: BFDADC - description: Issue for a branch -- name: branch/1.3.x - color: BFDADC - description: Issue for a branch -- name: branch/1.4.x - color: BFDADC - description: Issue for a branch -- name: branch/2.0.x - color: BFDADC - description: Issue for a branch -- name: branch/2.1.x - color: BFDADC - description: Issue for a branch -- name: branch/2.2.x - color: BFDADC - description: Issue for a branch -- name: branch/2.3.x - color: BFDADC - description: Issue for a branch -- name: branch/2.4.x - color: BFDADC - description: Issue for a branch -- name: branch/2.5.x - color: BFDADC - description: Issue for a branch -- name: branch/2.6.x - color: BFDADC - description: Issue for a branch -- name: branch/2.7.x - color: BFDADC - description: Issue for a branch diff --git a/pom.xml b/pom.xml index cf29d51d..2e0e5638 100644 --- a/pom.xml +++ b/pom.xml @@ -56,14 +56,16 @@ 3.6.2 1.4.1 3.5.2 - 2.7 + 1.26.1 + 2.15.1 5.12.4 2.7.18 - 5.3.33 + 5.3.34 ${java.version} ${java.version} 1.2.13 2.9.0 + 2.17.1 @@ -98,11 +100,6 @@ okio 3.4.0 - - com.fasterxml.jackson.core - jackson-databind - 2.13.5 - io.fabric8 kubernetes-client-bom @@ -110,6 +107,16 @@ pom import + + org.apache.commons + commons-compress + ${commons-compress.version} + + + commons-io + commons-io + ${commons-io.version} + ch.qos.logback @@ -126,6 +133,22 @@ logback-access ${logback.version} + + + com.fasterxml.jackson + jackson-bom + ${jackson-bom.version} + pom + import + + + + org.springframework + spring-framework-bom + ${spring-framework.version} + pom + import + org.springframework spring-framework-bom diff --git a/spring-cloud-deployer-cloudfoundry/pom.xml b/spring-cloud-deployer-cloudfoundry/pom.xml index b992af71..85ce2015 100644 --- a/spring-cloud-deployer-cloudfoundry/pom.xml +++ b/spring-cloud-deployer-cloudfoundry/pom.xml @@ -48,7 +48,6 @@ org.apache.commons commons-compress - ${commons-compress.version} org.cloudfoundry diff --git a/spring-cloud-deployer-kubernetes/pom.xml b/spring-cloud-deployer-kubernetes/pom.xml index 55de5747..91394037 100644 --- a/spring-cloud-deployer-kubernetes/pom.xml +++ b/spring-cloud-deployer-kubernetes/pom.xml @@ -51,7 +51,7 @@ org.hashids hashids - 1.0.1 + 1.0.3 org.springframework.boot diff --git a/spring-cloud-deployer-resource-maven/pom.xml b/spring-cloud-deployer-resource-maven/pom.xml index a633eb07..bc268b52 100644 --- a/spring-cloud-deployer-resource-maven/pom.xml +++ b/spring-cloud-deployer-resource-maven/pom.xml @@ -56,7 +56,6 @@ commons-io commons-io - ${commons-io.version} org.apache.maven.wagon