-
Notifications
You must be signed in to change notification settings - Fork 633
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(dependency): unpinning and cleanup springfox dependencies #1020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The springfox swagger-ui and swagger2 dependencies are not part of the code, whereas io.swagger:swagger-annotations dependency is part of the code. Removing the swagger-ui and swagger2 dependency and introducing swagger-annotations dependency which is available as transitive dependency coming from kork-swagger via orca-bom in kayenta-core module. The dependency insight before and after the cleanup given below: Before cleanup: ``` $ ./gradlew kayenta-web:dI --dependency swagger > Task :kayenta-web:dependencyInsight io.spinnaker.kork:kork-swagger:7.206.0 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced io.spinnaker.kork:kork-swagger:7.206.0 \--- io.spinnaker.orca:orca-bom:8.48.0 \--- compileClasspath io.spinnaker.kork:kork-swagger -> 7.206.0 +--- project :kayenta-atlas | \--- compileClasspath +--- project :kayenta-aws | \--- compileClasspath +--- project :kayenta-azure | \--- compileClasspath +--- project :kayenta-blobs | \--- compileClasspath +--- project :kayenta-core | \--- compileClasspath +--- project :kayenta-datadog | \--- compileClasspath +--- project :kayenta-gcs | \--- compileClasspath +--- project :kayenta-google | \--- compileClasspath +--- project :kayenta-graphite | \--- compileClasspath +--- project :kayenta-influxdb | \--- compileClasspath +--- project :kayenta-judge | \--- compileClasspath +--- project :kayenta-newrelic-insights | \--- compileClasspath +--- project :kayenta-objectstore-configbin | \--- compileClasspath +--- project :kayenta-objectstore-memory | \--- compileClasspath +--- project :kayenta-orca | \--- compileClasspath +--- project :kayenta-prometheus | \--- compileClasspath +--- project :kayenta-s3 | \--- compileClasspath +--- project :kayenta-signalfx | \--- compileClasspath +--- project :kayenta-sql | \--- compileClasspath +--- project :kayenta-stackdriver | \--- compileClasspath +--- project :kayenta-standalone-canary-analysis | \--- compileClasspath +--- project :kayenta-wavefront | \--- compileClasspath \--- compileClasspath io.springfox:springfox-swagger-common:2.9.2 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | io.springfox:springfox-swagger-common:2.9.2 \--- io.springfox:springfox-swagger2:2.9.2 +--- project :kayenta-core | \--- compileClasspath \--- io.spinnaker.orca:orca-bom:8.48.0 \--- compileClasspath io.springfox:springfox-swagger-ui:2.9.2 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced io.springfox:springfox-swagger-ui:2.9.2 +--- project :kayenta-core | \--- compileClasspath \--- io.spinnaker.orca:orca-bom:8.48.0 \--- compileClasspath io.springfox:springfox-swagger2:2.9.2 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced io.springfox:springfox-swagger2:2.9.2 +--- project :kayenta-core | \--- compileClasspath \--- io.spinnaker.orca:orca-bom:8.48.0 \--- compileClasspath io.swagger:swagger-annotations:1.5.20 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced io.swagger:swagger-annotations:1.5.20 +--- io.spinnaker.kork:kork-swagger:7.206.0 | +--- compileClasspath (requested io.spinnaker.kork:kork-swagger) | +--- project :kayenta-atlas (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-aws (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-core (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-datadog (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-gcs (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-google (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-blobs (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-azure (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-graphite (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-influxdb (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-judge (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-newrelic-insights (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-objectstore-configbin (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-objectstore-memory (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-orca (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-prometheus (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-s3 (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-signalfx (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-sql (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-stackdriver (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-standalone-canary-analysis (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-wavefront (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | \--- io.spinnaker.orca:orca-bom:8.48.0 | \--- compileClasspath +--- io.spinnaker.orca:orca-bom:8.48.0 (*) +--- io.springfox:springfox-swagger-common:2.9.2 | \--- io.springfox:springfox-swagger2:2.9.2 | +--- project :kayenta-core (*) | \--- io.spinnaker.orca:orca-bom:8.48.0 (*) +--- io.springfox:springfox-swagger2:2.9.2 (*) \--- io.swagger:swagger-models:1.5.20 +--- io.springfox:springfox-swagger2:2.9.2 (*) \--- io.springfox:springfox-swagger-common:2.9.2 (*) io.swagger:swagger-models:1.5.20 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | io.swagger:swagger-models:1.5.20 +--- io.springfox:springfox-swagger-common:2.9.2 | \--- io.springfox:springfox-swagger2:2.9.2 | +--- project :kayenta-core | | \--- compileClasspath | \--- io.spinnaker.orca:orca-bom:8.48.0 | \--- compileClasspath \--- io.springfox:springfox-swagger2:2.9.2 (*) ``` After cleanup: ``` $ ./gradlew kayenta-web:dI --dependency swagger > Task :kayenta-web:dependencyInsight io.spinnaker.kork:kork-swagger:7.206.0 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced io.spinnaker.kork:kork-swagger:7.206.0 \--- io.spinnaker.orca:orca-bom:8.48.0 \--- compileClasspath io.spinnaker.kork:kork-swagger -> 7.206.0 +--- project :kayenta-atlas | \--- compileClasspath +--- project :kayenta-aws | \--- compileClasspath +--- project :kayenta-azure | \--- compileClasspath +--- project :kayenta-blobs | \--- compileClasspath +--- project :kayenta-core | \--- compileClasspath +--- project :kayenta-datadog | \--- compileClasspath +--- project :kayenta-gcs | \--- compileClasspath +--- project :kayenta-google | \--- compileClasspath +--- project :kayenta-graphite | \--- compileClasspath +--- project :kayenta-influxdb | \--- compileClasspath +--- project :kayenta-judge | \--- compileClasspath +--- project :kayenta-newrelic-insights | \--- compileClasspath +--- project :kayenta-objectstore-configbin | \--- compileClasspath +--- project :kayenta-objectstore-memory | \--- compileClasspath +--- project :kayenta-orca | \--- compileClasspath +--- project :kayenta-prometheus | \--- compileClasspath +--- project :kayenta-s3 | \--- compileClasspath +--- project :kayenta-signalfx | \--- compileClasspath +--- project :kayenta-sql | \--- compileClasspath +--- project :kayenta-stackdriver | \--- compileClasspath +--- project :kayenta-standalone-canary-analysis | \--- compileClasspath +--- project :kayenta-wavefront | \--- compileClasspath \--- compileClasspath io.swagger:swagger-annotations:1.5.20 Variant compile: | Attribute Name | Provided | Requested | |--------------------------------|----------|-------------------| | org.gradle.status | release | | | org.gradle.category | library | library | | org.gradle.libraryelements | jar | classes+resources | | org.gradle.usage | java-api | java-api | | org.gradle.dependency.bundling | | external | | org.gradle.jvm.environment | | standard-jvm | | org.gradle.jvm.version | | 11 | Selection reasons: - By constraint - Forced io.swagger:swagger-annotations:1.5.20 +--- io.spinnaker.kork:kork-swagger:7.206.0 | +--- compileClasspath (requested io.spinnaker.kork:kork-swagger) | +--- project :kayenta-atlas (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-aws (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-core (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-datadog (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-gcs (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-google (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-blobs (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-azure (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-graphite (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-influxdb (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-judge (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-newrelic-insights (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-objectstore-configbin (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-objectstore-memory (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-orca (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-prometheus (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-s3 (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-signalfx (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-sql (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-stackdriver (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-standalone-canary-analysis (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | +--- project :kayenta-wavefront (requested io.spinnaker.kork:kork-swagger) | | \--- compileClasspath | \--- io.spinnaker.orca:orca-bom:8.48.0 | \--- compileClasspath \--- io.spinnaker.orca:orca-bom:8.48.0 (*) io.swagger:swagger-annotations -> 1.5.20 \--- project :kayenta-core \--- compileClasspath ```
dbyron-sf
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The springfox swagger-ui and swagger2 dependencies are not part of the code, whereas io.swagger:swagger-annotations dependency is part of the code. Removing the swagger-ui and swagger2 dependency and introducing swagger-annotations dependency which is available as transitive dependency coming from kork-swagger via orca-bom in kayenta-core module.
The dependency insight before and after the cleanup given below:
Before cleanup:
After cleanup: