Skip to content

[7.x] Sync discovery_gce versions with main#104086

Merged
jakelandis merged 4 commits intoelastic:7.17from
jakelandis:7x_sync_discovery_gce_versions_with_main
Jan 9, 2024
Merged

[7.x] Sync discovery_gce versions with main#104086
jakelandis merged 4 commits intoelastic:7.17from
jakelandis:7x_sync_discovery_gce_versions_with_main

Conversation

@jakelandis
Copy link
Copy Markdown
Contributor

@jakelandis jakelandis commented Jan 8, 2024

This commit syncs the dependencies for discovery GCE plugin with the dependency versions in use in main.

Specifically, this commit upgrades the following for the discovery GCE plugin:

com.google.apis:google-api-services-compute:v1-rev160-1.23.0 -> v1-rev20220322-1.32
com.google.api-client:google-api-client:1.23.0 -> 1.33.1
com.google.oauth-client:google-oauth-client:1.23.0 -> 1.34.1
com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2

and introduces the following for the discovery GCE plugin:

api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
api "com.google.http-client:google-http-client-gson:1.41.1"
runtimeOnly 'com.google.guava:guava:32.0.1-jre'
runtimeOnly 'com.google.guava:failureaccess:1.0.1'
api 'io.opencensus:opencensus-api:0.30.0'
api 'io.opencensus:opencensus-contrib-http-util:0.30.0'
api 'io.grpc:grpc-context:1.27.2'

backport of #85132 and #91722

===

The combination of dependencies have been used in main for 6+ months and assuming CI agrees, this should be a safe dependency upgrade.

diff of build.gradle against main : diff_with_main.pdf (main defines the version in the common versions file)

<sha256 value="357de0017d439c021a6a98d48e380a25a709dc9bc50e4b38c6ab84094e6f2e84" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.google.api-client" name="google-api-client" version="1.33.1">
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all changes here added via ./gradlew --write-verification-metadata sha256

}

versions << [
'google': '1.23.0'
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jakelandis
Copy link
Copy Markdown
Contributor Author

jakelandis commented Jan 8, 2024

@elasticmachine run elasticsearch-ci/packaging-tests-windows-sample
@elasticmachine run elasticsearch-ci/windows-2019 / default-windows-archive-no-jdk / packaging-tests-windows-sample

Those failed due to :
Caused by: java.nio.file.FileSystemException: C:\bk\qa\os\build\testrun\destructiveDistroTest.default-windows-archive-no-jdk\temp\org.elasticsearch.packaging.util.Shell5816487018950537013.out: The process cannot access the file because it is being used by another process

I think that is unrelated here.

@jakelandis
Copy link
Copy Markdown
Contributor Author

jakelandis commented Jan 8, 2024

@elasticmachine run elasticsearch-ci/windows-2019 / default-windows-archive-no-jdk / packaging-tests-windows-sample

@jakelandis jakelandis added >upgrade :Distributed/Discovery-Plugins Anything related to our integration plugins with EC2, GCP and Azure labels Jan 8, 2024
@jakelandis jakelandis requested a review from arteam January 8, 2024 22:31
@jakelandis jakelandis marked this pull request as ready for review January 8, 2024 22:32
@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-distributed (Team:Distributed)

@elasticsearchmachine
Copy link
Copy Markdown
Collaborator

Hi @jakelandis, I've created a changelog YAML for you.

@elasticsearchmachine elasticsearchmachine added the Team:Distributed Meta label for distributed team. label Jan 8, 2024
Copy link
Copy Markdown
Contributor

@arteam arteam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jakelandis jakelandis merged commit 93af646 into elastic:7.17 Jan 9, 2024
@jakelandis jakelandis deleted the 7x_sync_discovery_gce_versions_with_main branch January 9, 2024 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Distributed/Discovery-Plugins Anything related to our integration plugins with EC2, GCP and Azure Team:Distributed Meta label for distributed team. >upgrade v7.17.17

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants