Skip to content

Updates Guava versions to address CVE #292

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

Merged
jmazanec15 merged 2 commits into from
Feb 16, 2022
Merged

Updates Guava versions to address CVE #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c0ef74
Updates Guava versions to address CVE
jmazanec15 Feb 16, 2022
2c78f02
Update checkstyle to 9.3
jmazanec15 Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ apply plugin: 'opensearch.rest-test'


checkstyle {
toolVersion = '8.24'
toolVersion = '9.3'
configFile file("checkstyle/checkstyle.xml")
}

Expand Down Expand Up @@ -124,7 +124,7 @@ dependencies {
compile "org.opensearch:opensearch:${opensearch_version}"
compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
compile group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
compile group: 'com.google.guava', name: 'guava', version:'29.0-jre'
compile group: 'com.google.guava', name: 'guava', version:'30.0-jre'
compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
testImplementation "org.opensearch.test:framework:${opensearch_version}"
configurations.all {
Expand Down
4 changes: 0 additions & 4 deletions checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,9 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingThrowsTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="minLineCount" value="2"/>
<property name="allowedAnnotations" value="Override, Test"/>
<property name="allowThrowsTagsForSubclasses" value="true"/>
Comment on lines -244 to -248
Copy link
Copy Markdown
Member

@vamshin vamshin Feb 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

why are these properties removed?

Copy link
Copy Markdown
Member Author

@jmazanec15 jmazanec15 Feb 16, 2022

Choose a reason for hiding this comment

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

They break checkstyle upgrade.

Copy link
Copy Markdown
Member

@martin-gaievski martin-gaievski Feb 16, 2022

Choose a reason for hiding this comment

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

just to make sure - are we making our requirements stricter by removing those rules?

Copy link
Copy Markdown
Member Author

@jmazanec15 jmazanec15 Feb 16, 2022

Choose a reason for hiding this comment

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

Yes, it will be stricter. I think it is okay because, currently, we do not enforce the checkstyle checks.

In the future, we should migrate to spotless, as this is what OpenSearch does: opensearch-project/OpenSearch#1370. I will create an issue for this.

</module>
<module name="MethodName">
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
Expand Down