Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(vulnerability): Remove fixed version of commons-io dependency to accommodate safer version from kork. #1890

Merged
merged 4 commits into from
Aug 19, 2021

Conversation

j-sandy
Copy link
Contributor

@j-sandy j-sandy commented Aug 9, 2021

@dbyron-sf
Copy link
Contributor

There's some unwinding of other build issues before I think this PR makes sense. Specifically, see #1894.

@dbyron-sf
Copy link
Contributor

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Aug 19, 2021

Command update: success

Branch has been successfully updated

@dbyron-sf
Copy link
Contributor

Here's a before:

$ ./gradlew :halyard-backup:dI --dependency commons-io:commons-io

> Task :halyard-backup:dependencyInsight
commons-io:commons-io:2.7
   variant "compile" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-api
      org.gradle.libraryelements     = jar (compatible with: classes+resources)
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 11
   ]
   Selection reasons:
      - By constraint
      - By conflict resolution : between versions 2.7 and 2.6

commons-io:commons-io:2.7
\--- io.spinnaker.kork:kork-bom:7.117.0
     \--- compileClasspath

commons-io:commons-io:2.6 -> 2.7
\--- compileClasspath

and after:

$ ./gradlew :halyard-backup:dI --dependency commons-io:commons-io

> Task :halyard-backup:dependencyInsight
commons-io:commons-io:2.7 (by constraint)
   variant "compile" [
      org.gradle.status              = release (not requested)
      org.gradle.usage               = java-api
      org.gradle.libraryelements     = jar (compatible with: classes+resources)
      org.gradle.category            = library

      Requested attributes not found in the selected variant:
         org.gradle.dependency.bundling = external
         org.gradle.jvm.version         = 11
   ]

commons-io:commons-io:2.7
\--- io.spinnaker.kork:kork-bom:7.117.0
     \--- compileClasspath

commons-io:commons-io -> 2.7
\--- compileClasspath

so this is "just" a cleanup, with no change to the version of commons-io. Good times.

@dbyron-sf dbyron-sf added the ready to merge Approved and ready for a merge label Aug 19, 2021
@mergify mergify bot merged commit f861c44 into spinnaker:master Aug 19, 2021
@mergify mergify bot added the auto merged label Aug 19, 2021
@j-sandy j-sandy deleted the commons-io-cve-fix branch August 19, 2021 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants