Skip to content

Commit e77ef78

Browse files
authored
Updates Guava versions to address CVE (#292)
Updates direct Guava dependency to 30.0. Also, updates check style to 9.3 to inherent Guava fix. Remove deprecated features from check style xml config file. Signed-off-by: John Mazanec <[email protected]>
1 parent cb1a7d8 commit e77ef78

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Diff for: build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ apply plugin: 'opensearch.rest-test'
5252

5353

5454
checkstyle {
55-
toolVersion = '8.24'
55+
toolVersion = '9.3'
5656
configFile file("checkstyle/checkstyle.xml")
5757
}
5858

@@ -124,7 +124,7 @@ dependencies {
124124
compile "org.opensearch:opensearch:${opensearch_version}"
125125
compileOnly "org.opensearch.plugin:opensearch-scripting-painless-spi:${versions.opensearch}"
126126
compile group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
127-
compile group: 'com.google.guava', name: 'guava', version:'29.0-jre'
127+
compile group: 'com.google.guava', name: 'guava', version:'30.0-jre'
128128
compile group: 'commons-lang', name: 'commons-lang', version: '2.6'
129129
testImplementation "org.opensearch.test:framework:${opensearch_version}"
130130
configurations.all {

Diff for: checkstyle/checkstyle.xml

-4
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,9 @@
239239
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
240240
</module>
241241
<module name="JavadocMethod">
242-
<property name="scope" value="public"/>
243242
<property name="allowMissingParamTags" value="true"/>
244-
<property name="allowMissingThrowsTags" value="true"/>
245243
<property name="allowMissingReturnTag" value="true"/>
246-
<property name="minLineCount" value="2"/>
247244
<property name="allowedAnnotations" value="Override, Test"/>
248-
<property name="allowThrowsTagsForSubclasses" value="true"/>
249245
</module>
250246
<module name="MethodName">
251247
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>

0 commit comments

Comments
 (0)