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

chore(dependencies): Upgrade Spring Boot to 2.2.13 #895

Merged
merged 1 commit into from
Sep 27, 2021

Conversation

j-sandy
Copy link
Contributor

@j-sandy j-sandy commented Sep 23, 2021

Part of spinnaker/spinnaker#6537
Upgrade spring boot from 2.2.5 to 2.2.13.
Along with it upgrade org.junit:junit-bom to 5.6.3. due to this:
spring boot 2.2.13 uses groovy version 2.5.14, that upgrades org.codehaus.groovy:groovy-test from 2.5.11 (constrained in spinnaker-dependencies) to 2.5.14 and upgrades junit:junit from 4.13 to 4.13.1.
In kork, org.junit:junit-bom is constrained to 5.6.2, having bug as junit-vintage-engine:5.6.2 does not parse junit version of format x.y.z, just parse x.y.
This bug is fixed in 5.6.3 and 5.7.0.
junit-team/junit5#2529
junit-team/junit5#2198

j-sandy pushed a commit to j-sandy/rosco that referenced this pull request Sep 27, 2021
Refer spinnaker/spinnaker#6537

During verification of spring boot upgrade using spinnaker/kork#895, received below error:
Task :rosco-core:compileTestGroovy
startup failed:
/rosco/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/CloudProviderBakeHandlerSpec.groovy: 69: Only @shared and static fields may be accessed from here @ line 69, column 7.
         SOME_BAKE_REQUEST | SOME_BAKE_RECIPE | SOME_BAKE_RECIPE_NAME | null                 | SOME_AMI_ID       | SOME_BUILD_INFO_URL | SOME_BUILD_NR
         ^

/rosco/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/CloudProviderBakeHandlerSpec.groovy: 68: Only @shared and static fields may be accessed from here @ line 68, column 27.
         null              | SOME_BAKE_RECIPE | SOME_BAKE_RECIPE_NAME | null                 | SOME_AMI_ID       | null                | null
                             ^

/rosco/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/CloudProviderBakeHandlerSpec.groovy: 69: Only @shared and static fields may be accessed from here @ line 69, column 27.
         SOME_BAKE_REQUEST | SOME_BAKE_RECIPE | SOME_BAKE_RECIPE_NAME | null                 | SOME_AMI_ID       | SOME_BUILD_INFO_URL | SOME_BUILD_NR
         ^

To fix the error, added @shared in TestDefaults.groovy file.
mergify bot pushed a commit to spinnaker/rosco that referenced this pull request Sep 27, 2021
Refer spinnaker/spinnaker#6537

During verification of spring boot upgrade using spinnaker/kork#895, received below error:
Task :rosco-core:compileTestGroovy
startup failed:
/rosco/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/CloudProviderBakeHandlerSpec.groovy: 69: Only @shared and static fields may be accessed from here @ line 69, column 7.
         SOME_BAKE_REQUEST | SOME_BAKE_RECIPE | SOME_BAKE_RECIPE_NAME | null                 | SOME_AMI_ID       | SOME_BUILD_INFO_URL | SOME_BUILD_NR
         ^

/rosco/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/CloudProviderBakeHandlerSpec.groovy: 68: Only @shared and static fields may be accessed from here @ line 68, column 27.
         null              | SOME_BAKE_RECIPE | SOME_BAKE_RECIPE_NAME | null                 | SOME_AMI_ID       | null                | null
                             ^

/rosco/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/CloudProviderBakeHandlerSpec.groovy: 69: Only @shared and static fields may be accessed from here @ line 69, column 27.
         SOME_BAKE_REQUEST | SOME_BAKE_RECIPE | SOME_BAKE_RECIPE_NAME | null                 | SOME_AMI_ID       | SOME_BUILD_INFO_URL | SOME_BUILD_NR
         ^

To fix the error, added @shared in TestDefaults.groovy file.

Co-authored-by: j-sandy <jsandy>
@dbyron-sf dbyron-sf added the ready to merge Approved and ready for merge label Sep 27, 2021
@mergify mergify bot merged commit d03632a into spinnaker:master Sep 27, 2021
@mergify mergify bot added the auto merged label Sep 27, 2021
@j-sandy j-sandy deleted the sb-upgrade-2-2-13 branch October 5, 2021 04:29
ylebedeva pushed a commit to ylebedeva/kork that referenced this pull request May 3, 2022
ylebedeva pushed a commit to ylebedeva/kork that referenced this pull request May 24, 2022
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.

3 participants