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.

Sign up for GitHub

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

Jump to bottom

chore(dependencies): Autobump korkVersion #6233

Merged
merged 3 commits into from
Jun 12, 2024
Merged

chore(dependencies): Autobump korkVersion #6233

merged 3 commits into from
Jun 12, 2024

Conversation

spinnakerbot
Copy link
Contributor

No description provided.

@mergify mergify bot requested a review from a team June 12, 2024 03:26
@dbyron-sf dbyron-sf mentioned this pull request Jun 12, 2024
Closed
j-sandy added 2 commits June 11, 2024 22:03
@j-sandy @dbyron-sf
refactor(mysql): update mysql connector coordinate during upgrade to …
740e69e 
…spring boot 2.7.x

In spring boot 2.7.8 onwards mysql connector coordinate `mysql:mysql-connector-java` has been removed and only `com.mysql:mysql-connector-j` coordinate exist.

https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-2.7-Release-Notes#mysql-jdbc-driver

So, updating the mysql connector coordinate as `com.mysql:mysql-connector-j` with spring boot upgrade to 2.7.18.

https://repo1.maven.org/maven2/org/springframework/boot/spring-boot-dependencies/2.7.18/spring-boot-dependencies-2.7.18.pom
@j-sandy @dbyron-sf
refactor(test): remove extracting() method due to breaking change dur…
45f0223 
…ing upgrade to spring boot 2.7.x

While upgrading spring boot 2.7.18, encounter below error during execution of tests under clouddriver-google module:
```
> Task :clouddriver-google:test

AbstractGoogleServerGroupCachingAgentTest > serverGroupAutoscalingPolicy_allFields() FAILED
    java.lang.AssertionError:
    Expecting actual not to be null
        at com.netflix.spinnaker.clouddriver.google.provider.agent.AbstractGoogleServerGroupCachingAgentTest.serverGroupAutoscalingPolicy_allFields(AbstractGoogleServerGroupCachingAgentTest.java:791)

646 tests completed, 1 failed, 1 skipped

> Task :clouddriver-google:test FAILED
```
The root cause is a breaking change brought by assertj-core:3.22.0 as transitive dependency of spring boot 2.7.18.
The breaking change is that extracting() now throws an assertion error if actual is null.

https://assertj.github.io/doc/#assertj-core-3-22-0-release-notes

Before:
```
$ ./gradlew clouddriver-google:dI --dependency assertj-core --configuration testRuntimeClasspath

> Task :clouddriver-google:dependencyInsight
org.assertj:assertj-core:3.21.0
  Variant runtime:
    | Attribute Name                     | Provided     | Requested    |
    |------------------------------------|--------------|--------------|
    | org.gradle.status                  | release      |              |
    | org.gradle.category                | library      | library      |
    | org.gradle.libraryelements         | jar          | jar          |
    | org.gradle.usage                   | java-runtime | java-runtime |
    | org.gradle.dependency.bundling     |              | external     |
    | org.gradle.jvm.environment         |              | standard-jvm |
    | org.gradle.jvm.version             |              | 11           |
    | org.jetbrains.kotlin.platform.type |              | jvm          |
   Selection reasons:
      - By constraint
      - Forced

org.assertj:assertj-core:3.21.0
\--- io.spinnaker.kork:kork-bom:7.227.0
     +--- testRuntimeClasspath
     +--- project :clouddriver-artifacts
     |    \--- testRuntimeClasspath
     +--- project :clouddriver-consul
     |    \--- testRuntimeClasspath
     +--- project :clouddriver-core
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-artifacts (*)
     |    \--- project :clouddriver-consul (*)
     +--- project :clouddriver-security
     |    +--- testRuntimeClasspath
     |    \--- project :clouddriver-core (*)
     +--- project :cats:cats-redis
     |    \--- project :clouddriver-core (*)
     +--- project :cats:cats-core
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-core (*)
     |    +--- project :clouddriver-security (*)
     |    \--- project :cats:cats-redis (*)
     +--- project :clouddriver-api
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-artifacts (*)
     |    +--- project :clouddriver-core (*)
     |    +--- project :clouddriver-security (*)
     |    +--- project :cats:cats-redis (*)
     |    \--- project :cats:cats-core (*)
     +--- project :clouddriver-google-common
     |    \--- testRuntimeClasspath
     +--- project :clouddriver-saga
     |    \--- project :clouddriver-core (*)
     \--- project :clouddriver-event
          \--- project :clouddriver-saga (*)

org.assertj:assertj-core -> 3.21.0
\--- testRuntimeClasspath

org.assertj:assertj-core:3.20.2 -> 3.21.0
\--- org.junit.platform:junit-platform-testkit:1.8.2
     +--- io.spinnaker.kork:kork-bom:7.227.0
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-artifacts
     |    |    \--- testRuntimeClasspath
     |    +--- project :clouddriver-consul
     |    |    \--- testRuntimeClasspath
     |    +--- project :clouddriver-core
     |    |    +--- testRuntimeClasspath
     |    |    +--- project :clouddriver-artifacts (*)
     |    |    \--- project :clouddriver-consul (*)
     |    +--- project :clouddriver-security
     |    |    +--- testRuntimeClasspath
     |    |    \--- project :clouddriver-core (*)
     |    +--- project :cats:cats-redis
     |    |    \--- project :clouddriver-core (*)
     |    +--- project :cats:cats-core
     |    |    +--- testRuntimeClasspath
     |    |    +--- project :clouddriver-core (*)
     |    |    +--- project :clouddriver-security (*)
     |    |    \--- project :cats:cats-redis (*)
     |    +--- project :clouddriver-api
     |    |    +--- testRuntimeClasspath
     |    |    +--- project :clouddriver-artifacts (*)
     |    |    +--- project :clouddriver-core (*)
     |    |    +--- project :clouddriver-security (*)
     |    |    +--- project :cats:cats-redis (*)
     |    |    \--- project :cats:cats-core (*)
     |    +--- project :clouddriver-google-common
     |    |    \--- testRuntimeClasspath
     |    +--- project :clouddriver-saga
     |    |    \--- project :clouddriver-core (*)
     |    \--- project :clouddriver-event
     |         \--- project :clouddriver-saga (*)
     +--- org.spockframework:spock-core:2.0-groovy-3.0 (requested org.junit.platform:junit-platform-testkit)
     |    +--- testRuntimeClasspath (requested org.spockframework:spock-core)
     |    +--- io.spinnaker.kork:kork-bom:7.227.0 (*)
     |    \--- org.spockframework:spock-spring:2.0-groovy-3.0
     |         +--- testRuntimeClasspath (requested org.spockframework:spock-spring)
     |         \--- io.spinnaker.kork:kork-bom:7.227.0 (*)
     \--- org.junit:junit-bom:5.8.2
          +--- org.spockframework:spock-spring:2.0-groovy-3.0 (requested org.junit:junit-bom:5.7.2) (*)
          +--- org.spockframework:spock-core:2.0-groovy-3.0 (requested org.junit:junit-bom:5.7.2) (*)
          +--- org.junit.jupiter:junit-jupiter-engine:5.8.2
          |    +--- testRuntimeClasspath (requested org.junit.jupiter:junit-jupiter-engine)
          |    +--- io.spinnaker.kork:kork-bom:7.227.0 (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          +--- org.junit.jupiter:junit-jupiter-api:5.8.2
          |    +--- testRuntimeClasspath (requested org.junit.jupiter:junit-jupiter-api)
          |    +--- io.spinnaker.kork:kork-bom:7.227.0 (*)
          |    +--- org.junit.jupiter:junit-jupiter-engine:5.8.2 (*)
          |    +--- org.mockito:mockito-junit-jupiter:4.0.0 (requested org.junit.jupiter:junit-jupiter-api:5.8.1)
          |    |    +--- testRuntimeClasspath (requested org.mockito:mockito-junit-jupiter)
          |    |    \--- io.spinnaker.kork:kork-bom:7.227.0 (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          +--- org.junit.platform:junit-platform-launcher:1.8.2
          |    +--- io.spinnaker.kork:kork-bom:7.227.0 (*)
          |    +--- org.junit:junit-bom:5.8.2 (*)
          |    \--- org.junit.platform:junit-platform-testkit:1.8.2 (*)
          +--- org.junit.platform:junit-platform-engine:1.8.2
          |    +--- io.spinnaker.kork:kork-bom:7.227.0 (*)
          |    +--- org.spockframework:spock-core:2.0-groovy-3.0 (requested org.junit.platform:junit-platform-engine) (*)
          |    +--- org.junit.jupiter:junit-jupiter-engine:5.8.2 (*)
          |    +--- org.junit.platform:junit-platform-launcher:1.8.2 (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          +--- org.junit.platform:junit-platform-commons:1.8.2
          |    +--- io.spinnaker.kork:kork-bom:7.227.0 (*)
          |    +--- org.junit.jupiter:junit-jupiter-api:5.8.2 (*)
          |    +--- org.junit.platform:junit-platform-engine:1.8.2 (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          \--- org.junit.platform:junit-platform-testkit:1.8.2 (*)

```

After
```
$ ./gradlew clouddriver-google:dI --dependency assertj-core --configuration testRuntimeClasspath

> Task :clouddriver-google:dependencyInsight
org.assertj:assertj-core:3.22.0
  Variant runtime:
    | Attribute Name                     | Provided     | Requested    |
    |------------------------------------|--------------|--------------|
    | org.gradle.status                  | release      |              |
    | org.gradle.category                | library      | library      |
    | org.gradle.libraryelements         | jar          | jar          |
    | org.gradle.usage                   | java-runtime | java-runtime |
    | org.gradle.dependency.bundling     |              | external     |
    | org.gradle.jvm.environment         |              | standard-jvm |
    | org.gradle.jvm.version             |              | 11           |
    | org.jetbrains.kotlin.platform.type |              | jvm          |
   Selection reasons:
      - By constraint
      - Forced

org.assertj:assertj-core:3.22.0
\--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT
     +--- testRuntimeClasspath
     +--- project :clouddriver-artifacts
     |    \--- testRuntimeClasspath
     +--- project :clouddriver-consul
     |    \--- testRuntimeClasspath
     +--- project :clouddriver-core
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-artifacts (*)
     |    \--- project :clouddriver-consul (*)
     +--- project :clouddriver-security
     |    +--- testRuntimeClasspath
     |    \--- project :clouddriver-core (*)
     +--- project :cats:cats-redis
     |    \--- project :clouddriver-core (*)
     +--- project :cats:cats-core
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-core (*)
     |    +--- project :clouddriver-security (*)
     |    \--- project :cats:cats-redis (*)
     +--- project :clouddriver-api
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-artifacts (*)
     |    +--- project :clouddriver-core (*)
     |    +--- project :clouddriver-security (*)
     |    +--- project :cats:cats-redis (*)
     |    \--- project :cats:cats-core (*)
     +--- project :clouddriver-google-common
     |    \--- testRuntimeClasspath
     +--- project :clouddriver-saga
     |    \--- project :clouddriver-core (*)
     \--- project :clouddriver-event
          \--- project :clouddriver-saga (*)

org.assertj:assertj-core -> 3.22.0
\--- testRuntimeClasspath

org.assertj:assertj-core:3.20.2 -> 3.22.0
\--- org.junit.platform:junit-platform-testkit:1.8.2
     +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT
     |    +--- testRuntimeClasspath
     |    +--- project :clouddriver-artifacts
     |    |    \--- testRuntimeClasspath
     |    +--- project :clouddriver-consul
     |    |    \--- testRuntimeClasspath
     |    +--- project :clouddriver-core
     |    |    +--- testRuntimeClasspath
     |    |    +--- project :clouddriver-artifacts (*)
     |    |    \--- project :clouddriver-consul (*)
     |    +--- project :clouddriver-security
     |    |    +--- testRuntimeClasspath
     |    |    \--- project :clouddriver-core (*)
     |    +--- project :cats:cats-redis
     |    |    \--- project :clouddriver-core (*)
     |    +--- project :cats:cats-core
     |    |    +--- testRuntimeClasspath
     |    |    +--- project :clouddriver-core (*)
     |    |    +--- project :clouddriver-security (*)
     |    |    \--- project :cats:cats-redis (*)
     |    +--- project :clouddriver-api
     |    |    +--- testRuntimeClasspath
     |    |    +--- project :clouddriver-artifacts (*)
     |    |    +--- project :clouddriver-core (*)
     |    |    +--- project :clouddriver-security (*)
     |    |    +--- project :cats:cats-redis (*)
     |    |    \--- project :cats:cats-core (*)
     |    +--- project :clouddriver-google-common
     |    |    \--- testRuntimeClasspath
     |    +--- project :clouddriver-saga
     |    |    \--- project :clouddriver-core (*)
     |    \--- project :clouddriver-event
     |         \--- project :clouddriver-saga (*)
     +--- org.spockframework:spock-core:2.0-groovy-3.0 (requested org.junit.platform:junit-platform-testkit)
     |    +--- testRuntimeClasspath (requested org.spockframework:spock-core)
     |    +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
     |    \--- org.spockframework:spock-spring:2.0-groovy-3.0
     |         +--- testRuntimeClasspath (requested org.spockframework:spock-spring)
     |         \--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
     \--- org.junit:junit-bom:5.8.2
          +--- org.spockframework:spock-spring:2.0-groovy-3.0 (requested org.junit:junit-bom:5.7.2) (*)
          +--- org.spockframework:spock-core:2.0-groovy-3.0 (requested org.junit:junit-bom:5.7.2) (*)
          +--- org.junit.jupiter:junit-jupiter-engine:5.8.2
          |    +--- testRuntimeClasspath (requested org.junit.jupiter:junit-jupiter-engine)
          |    +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          +--- org.junit.jupiter:junit-jupiter-api:5.8.2
          |    +--- testRuntimeClasspath (requested org.junit.jupiter:junit-jupiter-api)
          |    +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
          |    +--- org.junit.jupiter:junit-jupiter-engine:5.8.2 (*)
          |    +--- org.mockito:mockito-junit-jupiter:4.5.1
          |    |    +--- testRuntimeClasspath (requested org.mockito:mockito-junit-jupiter)
          |    |    \--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          +--- org.junit.platform:junit-platform-launcher:1.8.2
          |    +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
          |    +--- org.junit:junit-bom:5.8.2 (*)
          |    \--- org.junit.platform:junit-platform-testkit:1.8.2 (*)
          +--- org.junit.platform:junit-platform-engine:1.8.2
          |    +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
          |    +--- org.spockframework:spock-core:2.0-groovy-3.0 (requested org.junit.platform:junit-platform-engine) (*)
          |    +--- org.junit.jupiter:junit-jupiter-engine:5.8.2 (*)
          |    +--- org.junit.platform:junit-platform-launcher:1.8.2 (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          +--- org.junit.platform:junit-platform-commons:1.8.2
          |    +--- io.spinnaker.kork:kork-bom:sb2718-SNAPSHOT (*)
          |    +--- org.junit.jupiter:junit-jupiter-api:5.8.2 (*)
          |    +--- org.junit.platform:junit-platform-engine:1.8.2 (*)
          |    \--- org.junit:junit-bom:5.8.2 (*)
          \--- org.junit.platform:junit-platform-testkit:1.8.2 (*)

```
@dbyron-sf dbyron-sf mentioned this pull request Jun 12, 2024
Closed
@dbyron-sf dbyron-sf added the ready to merge Approved and ready for a merge label Jun 12, 2024
@mergify mergify bot added the auto merged Merged automatically by a bot label Jun 12, 2024
@mergify mergify bot merged commit dd4d0a5 into spinnaker:master Jun 12, 2024
25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbyron-sf dbyron-sf dbyron-sf approved these changes

@plumpy plumpy Awaiting requested review from plumpy plumpy is a code owner

@skandragon skandragon Awaiting requested review from skandragon skandragon is a code owner

@clanesf clanesf Awaiting requested review from clanesf clanesf is a code owner

@german-muzquiz german-muzquiz Awaiting requested review from german-muzquiz german-muzquiz is a code owner

Assignees
No one assigned
Labels
auto merged Merged automatically by a bot autobump-korkVersion-master ready to merge Approved and ready for a merge target-release/1.35
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@spinnakerbot @dbyron-sf @j-sandy