Updates Guava versions to address CVE (opensearch-project#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]>
martin-gaievski · Feb 16, 2022 · 8c53f45 · 8c53f45
1 parent 4cfa533
commit 8c53f45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ apply plugin: 'opensearch.rest-test'
 
 
 checkstyle {
-    toolVersion = '8.24'
+    toolVersion = '9.3'
     configFile file("checkstyle/checkstyle.xml")
 }
 
@@ -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 {

diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
@@ -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"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>