Merge branch 'master' into chore-security/update-and-pin-graddle-worf…

…klow-action

build.gradle

@@ -62,7 +62,10 @@ repositories {
 
 dependencies {
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.15.0'
-    implementation group: 'com.google.guava', name: 'guava', version:'31.1-jre'
+    implementation (group: 'com.google.guava', name: 'guava', version:'32.1.1-jre') {
+        // needed due to https://github.com/google/guava/issues/6654
+        exclude group: "org.mockito", module: "mockito-core"
+    }
     testImplementation group: 'junit', name: 'junit', version:'4.13.1'
     testImplementation group: 'org.mockito', name: 'mockito-core', version:'1.10.19'
     testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
@@ -75,3 +78,13 @@ task exportVersion()  {
         new File(rootDir, "version.txt").text = "$version"
     }
 }
+
+// See https://github.com/google/guava/releases/tag/v32.1.0 for why this is required
+sourceSets.all {
+    configurations.getByName(runtimeClasspathConfigurationName) {
+        attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+    }
+    configurations.getByName(compileClasspathConfigurationName) {
+        attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
+    }
+}