From b13fcf0be486e7af41774615a15c929236539484 Mon Sep 17 00:00:00 2001
From: Ben Manes <ben.manes@gmail.com>
Date: Sat, 10 Jul 2021 21:14:22 -0700
Subject: [PATCH] minor touchups

---
 .github/scripts/analyze.sh | 11 +++--------
 .github/scripts/test.sh    | 15 +++++----------
 checksum.xml               |  4 ++++
 gradle/dependencies.gradle |  4 ++--
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/.github/scripts/analyze.sh b/.github/scripts/analyze.sh
index ed5e17a2c5..f8a53b1ae0 100755
--- a/.github/scripts/analyze.sh
+++ b/.github/scripts/analyze.sh
@@ -1,10 +1,5 @@
 #!/bin/bash
-set -eu
+set -eux
 
-run() {
-  echo $1
-  eval $1
-}
-
-run "./gradlew pmdJavaPoet pmdMain -Dpmd"
-run "./gradlew spotbugsJavaPoet spotbugsMain spotbugsJmh -Dspotbugs"
+./gradlew pmdJavaPoet pmdMain -Dpmd
+./gradlew spotbugsJavaPoet spotbugsMain spotbugsJmh -Dspotbugs
diff --git a/.github/scripts/test.sh b/.github/scripts/test.sh
index 3e6ced03d0..cafdcf5b86 100755
--- a/.github/scripts/test.sh
+++ b/.github/scripts/test.sh
@@ -1,12 +1,7 @@
 #!/bin/bash
-set -eu
+set -eux
 
-run() {
-  echo $1
-  eval $1
-}
-
-run "./gradlew check"
-run "./gradlew :caffeine:isolatedTests"
-run "./gradlew :caffeine:slowGuavaTest"
-run "./gradlew :caffeine:slowCaffeineTest"
+./gradlew check
+./gradlew :caffeine:isolatedTests
+./gradlew :caffeine:slowGuavaTest
+./gradlew :caffeine:slowCaffeineTest
diff --git a/checksum.xml b/checksum.xml
index 9b361bb3a7..f69bbcbe92 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -159,6 +159,7 @@
     <trusted-key id='bb2eab31a732f339' group='org.apache.jackrabbit' />
     <trusted-key id='d108ff879aa63950' group='org.apache.jackrabbit' />
     <trusted-key id='3595395eb3d8e1ba' group='org.apache.logging.log4j' />
+    <trusted-key id='3e48c0c6ef362b9e' group='org.apache.lucene' />
     <trusted-key id='873a8e86b4372146' group='org.apache.maven' />
     <trusted-key id='ae5a7fb608a0221c' group='org.apache.maven' />
     <trusted-key id='bf1518e0160788a2' group='org.apache.maven.resolver' />
@@ -416,6 +417,9 @@
     <dependency group='gradle.plugin.com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='4.7.1'>
       <sha512>8138BCC41F3573FABC75DAB54D73303408301880ABD63838E0CFB2E6C9405CF54DB623684536209035FA31ADE4E6D627A4C11460C98FF29EFC0A372B40375F93</sha512>
     </dependency>
+    <dependency group='gradle.plugin.com.github.spotbugs.snom' module='spotbugs-gradle-plugin' version='4.7.2'>
+      <sha512>44C956BA53F81CEF4BC36EC4FC11A7862922524C970BCA4116790615A335795B28B0717F9F105C89949727DC77D97F5D4CE830438510776C52F69D968FCE14D6</sha512>
+    </dependency>
     <dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='2.0.0'>
       <sha512>B3BFAD07E6A3D4D73CBCE802D8614CF4AC84E589166D243D41028DC077F84C027DF4D514F145360405F37DA73A8F2E7B65D90877A9EE1151174D2440530F9051</sha512>
     </dependency>
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index e759dc70eb..f296b8936b 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -38,7 +38,7 @@ ext {
     ehcache3: '3.9.4',
     errorprone: '2.7.1',
     errorproneJavac: '9+181-r4173-1',
-    elasticSearch: '7.13.2',
+    elasticSearch: '7.13.3',
     expiringMap: '0.5.9',
     fastfilter: '1.0.2',
     fastutil: '8.5.4',
@@ -97,7 +97,7 @@ ext {
     shadow: '7.0.0',
     sonarqube: '3.3',
     spotbugs: '4.3.0',
-    spotbugsPlugin: '4.7.1',
+    spotbugsPlugin: '4.7.2',
     stats: '0.2.2',
     versions: '0.39.0',
   ]