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(dependency): unpin junit-bom #1089

Merged
merged 1 commit into from
Aug 11, 2023
Merged

chore(dependency): unpin junit-bom #1089

merged 1 commit into from
Aug 11, 2023

Conversation

j-sandy
Copy link
Contributor

@j-sandy j-sandy commented Aug 11, 2023

Consumed the modified kork to build and test all spinnaker components, all build successfully and test passed. Below is the difference in version of junit-bom before and after the junit-bom unpin (in gate):

$ ./gradlew gate-web:dI --dependency org.junit.jupiter --configuration testCompileClasspath

> Task :gate-web:dependencyInsight
org.junit.jupiter:junit-jupiter:5.6.3
  Variant apiElements:
    | Attribute Name                 | Provided | Requested         |
    |--------------------------------|----------|-------------------|
    | org.gradle.status              | release  |                   |
    | org.gradle.category            | library  | library           |
    | org.gradle.dependency.bundling | external | external          |
    | org.gradle.jvm.version         | 8        | 11                |
    | org.gradle.libraryelements     | jar      | classes+resources |
    | org.gradle.usage               | java-api | java-api          |
    | org.gradle.jvm.environment     |          | standard-jvm      |
   Selection reasons:
      - By constraint
      - Forced

org.junit.jupiter:junit-jupiter:5.6.3
+--- io.spinnaker.kork:kork-bom:7.182.1
|    \--- testCompileClasspath
\--- org.junit:junit-bom:5.6.3
     +--- org.junit.jupiter:junit-jupiter-params:5.6.3
     |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
     |    +--- org.junit:junit-bom:5.6.3 (*)
     |    \--- org.junit.jupiter:junit-jupiter:5.6.3 (*)
     +--- org.junit.jupiter:junit-jupiter-api:5.6.3
     |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
     |    +--- org.junit.jupiter:junit-jupiter-params:5.6.3 (*)
     |    +--- org.junit:junit-bom:5.6.3 (*)
     |    \--- org.junit.jupiter:junit-jupiter:5.6.3 (*)
     +--- org.junit.platform:junit-platform-commons:1.6.3
     |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
     |    +--- org.junit.jupiter:junit-jupiter-api:5.6.3 (*)
     |    \--- org.junit:junit-bom:5.6.3 (*)
     \--- org.junit.jupiter:junit-jupiter:5.6.3 (*)

org.junit.jupiter:junit-jupiter:5.7.2 -> 5.6.3
\--- org.springframework.boot:spring-boot-starter-test:2.5.14
     +--- testCompileClasspath (requested org.springframework.boot:spring-boot-starter-test)
     \--- io.spinnaker.kork:kork-bom:7.182.1
          \--- testCompileClasspath

org.junit.jupiter:junit-jupiter-api:5.6.3
  Variant apiElements:
    | Attribute Name                      | Provided | Requested         |
    |-------------------------------------|----------|-------------------|
    | org.gradle.status                   | release  |                   |
    | org.jetbrains.kotlin.localToProject | public   |                   |
    | org.jetbrains.kotlin.platform.type  | jvm      |                   |
    | org.gradle.category                 | library  | library           |
    | org.gradle.dependency.bundling      | external | external          |
    | org.gradle.jvm.version              | 8        | 11                |
    | org.gradle.libraryelements          | jar      | classes+resources |
    | org.gradle.usage                    | java-api | java-api          |
    | org.gradle.jvm.environment          |          | standard-jvm      |
   Selection reasons:
      - By constraint
      - Forced

org.junit.jupiter:junit-jupiter-api:5.6.3
+--- io.spinnaker.kork:kork-bom:7.182.1
|    \--- testCompileClasspath
+--- org.junit:junit-bom:5.6.3
|    +--- org.junit.jupiter:junit-jupiter-params:5.6.3
|    |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |    +--- org.junit:junit-bom:5.6.3 (*)
|    |    \--- org.junit.jupiter:junit-jupiter:5.6.3
|    |         +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |         +--- org.springframework.boot:spring-boot-starter-test:2.5.14 (requested org.junit.jupiter:junit-jupiter:5.7.2)
|    |         |    +--- testCompileClasspath (requested org.springframework.boot:spring-boot-starter-test)
|    |         |    \--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |         \--- org.junit:junit-bom:5.6.3 (*)
|    +--- org.junit.jupiter:junit-jupiter-api:5.6.3 (*)
|    +--- org.junit.platform:junit-platform-commons:1.6.3
|    |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |    +--- org.junit.jupiter:junit-jupiter-api:5.6.3 (*)
|    |    \--- org.junit:junit-bom:5.6.3 (*)
|    \--- org.junit.jupiter:junit-jupiter:5.6.3 (*)
+--- org.junit.jupiter:junit-jupiter:5.6.3 (*)
\--- org.junit.jupiter:junit-jupiter-params:5.6.3 (*)

org.junit.jupiter:junit-jupiter-params:5.6.3
  Variant apiElements:
    | Attribute Name                      | Provided | Requested         |
    |-------------------------------------|----------|-------------------|
    | org.gradle.status                   | release  |                   |
    | org.jetbrains.kotlin.localToProject | public   |                   |
    | org.jetbrains.kotlin.platform.type  | jvm      |                   |
    | org.gradle.category                 | library  | library           |
    | org.gradle.dependency.bundling      | external | external          |
    | org.gradle.jvm.version              | 8        | 11                |
    | org.gradle.libraryelements          | jar      | classes+resources |
    | org.gradle.usage                    | java-api | java-api          |
    | org.gradle.jvm.environment          |          | standard-jvm      |
   Selection reasons:
      - By constraint
      - Forced

org.junit.jupiter:junit-jupiter-params:5.6.3
+--- io.spinnaker.kork:kork-bom:7.182.1
|    \--- testCompileClasspath
+--- org.junit:junit-bom:5.6.3
|    +--- org.junit.jupiter:junit-jupiter-params:5.6.3 (*)
|    +--- org.junit.jupiter:junit-jupiter-api:5.6.3
|    |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |    +--- org.junit.jupiter:junit-jupiter-params:5.6.3 (*)
|    |    +--- org.junit:junit-bom:5.6.3 (*)
|    |    \--- org.junit.jupiter:junit-jupiter:5.6.3
|    |         +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |         +--- org.springframework.boot:spring-boot-starter-test:2.5.14 (requested org.junit.jupiter:junit-jupiter:5.7.2)
|    |         |    +--- testCompileClasspath (requested org.springframework.boot:spring-boot-starter-test)
|    |         |    \--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |         \--- org.junit:junit-bom:5.6.3 (*)
|    +--- org.junit.platform:junit-platform-commons:1.6.3
|    |    +--- io.spinnaker.kork:kork-bom:7.182.1 (*)
|    |    +--- org.junit.jupiter:junit-jupiter-api:5.6.3 (*)
|    |    \--- org.junit:junit-bom:5.6.3 (*)
|    \--- org.junit.jupiter:junit-jupiter:5.6.3 (*)
\--- org.junit.jupiter:junit-jupiter:5.6.3 (*)

=========================After==============================

$ ./gradlew gate-web:dI --dependency org.junit.jupiter --configuration testCompileClasspath

> Task :gate-web:dependencyInsight
org.junit.jupiter:junit-jupiter:5.7.2
  Variant apiElements:
    | Attribute Name                 | Provided | Requested         |
    |--------------------------------|----------|-------------------|
    | org.gradle.status              | release  |                   |
    | org.gradle.category            | library  | library           |
    | org.gradle.dependency.bundling | external | external          |
    | org.gradle.jvm.version         | 8        | 11                |
    | org.gradle.libraryelements     | jar      | classes+resources |
    | org.gradle.usage               | java-api | java-api          |
    | org.gradle.jvm.environment     |          | standard-jvm      |
   Selection reasons:
      - By constraint
      - Forced

org.junit.jupiter:junit-jupiter:5.7.2
+--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT
|    \--- testCompileClasspath
+--- org.junit:junit-bom:5.7.2
|    +--- org.junit.jupiter:junit-jupiter-params:5.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit:junit-bom:5.7.2 (*)
|    |    \--- org.junit.jupiter:junit-jupiter:5.7.2 (*)
|    +--- org.junit.jupiter:junit-jupiter-api:5.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit.jupiter:junit-jupiter-params:5.7.2 (*)
|    |    +--- org.junit:junit-bom:5.7.2 (*)
|    |    \--- org.junit.jupiter:junit-jupiter:5.7.2 (*)
|    +--- org.junit.platform:junit-platform-commons:1.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit.jupiter:junit-jupiter-api:5.7.2 (*)
|    |    \--- org.junit:junit-bom:5.7.2 (*)
|    \--- org.junit.jupiter:junit-jupiter:5.7.2 (*)
\--- org.springframework.boot:spring-boot-starter-test:2.5.14
     +--- testCompileClasspath (requested org.springframework.boot:spring-boot-starter-test)
     \--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)

org.junit.jupiter:junit-jupiter-api:5.7.2
  Variant apiElements:
    | Attribute Name                      | Provided | Requested         |
    |-------------------------------------|----------|-------------------|
    | org.gradle.status                   | release  |                   |
    | org.jetbrains.kotlin.localToProject | public   |                   |
    | org.jetbrains.kotlin.platform.type  | jvm      |                   |
    | org.gradle.category                 | library  | library           |
    | org.gradle.dependency.bundling      | external | external          |
    | org.gradle.jvm.version              | 8        | 11                |
    | org.gradle.libraryelements          | jar      | classes+resources |
    | org.gradle.usage                    | java-api | java-api          |
    | org.gradle.jvm.environment          |          | standard-jvm      |
   Selection reasons:
      - By constraint
      - Forced

org.junit.jupiter:junit-jupiter-api:5.7.2
+--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT
|    \--- testCompileClasspath
+--- org.junit:junit-bom:5.7.2
|    +--- org.junit.jupiter:junit-jupiter-params:5.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit:junit-bom:5.7.2 (*)
|    |    \--- org.junit.jupiter:junit-jupiter:5.7.2
|    |         +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |         +--- org.springframework.boot:spring-boot-starter-test:2.5.14
|    |         |    +--- testCompileClasspath (requested org.springframework.boot:spring-boot-starter-test)
|    |         |    \--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |         \--- org.junit:junit-bom:5.7.2 (*)
|    +--- org.junit.jupiter:junit-jupiter-api:5.7.2 (*)
|    +--- org.junit.platform:junit-platform-commons:1.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit.jupiter:junit-jupiter-api:5.7.2 (*)
|    |    \--- org.junit:junit-bom:5.7.2 (*)
|    \--- org.junit.jupiter:junit-jupiter:5.7.2 (*)
+--- org.junit.jupiter:junit-jupiter:5.7.2 (*)
\--- org.junit.jupiter:junit-jupiter-params:5.7.2 (*)

org.junit.jupiter:junit-jupiter-params:5.7.2
  Variant apiElements:
    | Attribute Name                      | Provided | Requested         |
    |-------------------------------------|----------|-------------------|
    | org.gradle.status                   | release  |                   |
    | org.jetbrains.kotlin.localToProject | public   |                   |
    | org.jetbrains.kotlin.platform.type  | jvm      |                   |
    | org.gradle.category                 | library  | library           |
    | org.gradle.dependency.bundling      | external | external          |
    | org.gradle.jvm.version              | 8        | 11                |
    | org.gradle.libraryelements          | jar      | classes+resources |
    | org.gradle.usage                    | java-api | java-api          |
    | org.gradle.jvm.environment          |          | standard-jvm      |
   Selection reasons:
      - By constraint
      - Forced

org.junit.jupiter:junit-jupiter-params:5.7.2
+--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT
|    \--- testCompileClasspath
+--- org.junit:junit-bom:5.7.2
|    +--- org.junit.jupiter:junit-jupiter-params:5.7.2 (*)
|    +--- org.junit.jupiter:junit-jupiter-api:5.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit.jupiter:junit-jupiter-params:5.7.2 (*)
|    |    +--- org.junit:junit-bom:5.7.2 (*)
|    |    \--- org.junit.jupiter:junit-jupiter:5.7.2
|    |         +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |         +--- org.springframework.boot:spring-boot-starter-test:2.5.14
|    |         |    +--- testCompileClasspath (requested org.springframework.boot:spring-boot-starter-test)
|    |         |    \--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |         \--- org.junit:junit-bom:5.7.2 (*)
|    +--- org.junit.platform:junit-platform-commons:1.7.2
|    |    +--- io.spinnaker.kork:kork-bom:junit5-SNAPSHOT (*)
|    |    +--- org.junit.jupiter:junit-jupiter-api:5.7.2 (*)
|    |    \--- org.junit:junit-bom:5.7.2 (*)
|    \--- org.junit.jupiter:junit-jupiter:5.7.2 (*)
\--- org.junit.jupiter:junit-jupiter:5.7.2 (*)

@dbyron-sf dbyron-sf added the ready to merge Approved and ready for merge label Aug 11, 2023
@mergify mergify bot added the auto merged label Aug 11, 2023
@mergify mergify bot merged commit 1d5d80b into spinnaker:master Aug 11, 2023
6 checks passed
@j-sandy j-sandy deleted the junit5-upgrade branch August 11, 2023 17:58
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

Assignees
No one assigned
Labels
auto merged ready to merge Approved and ready for merge target-release/1.32
Projects
None yet
Milestone
No milestone
Development

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