DRILL-8438: Bump YAUAA to 7.19.2 (#2808)

* chore(deps): Update Yauaa to 7.19.2 * Additional fix, please squash on merge
apache · May 23, 2023 · 214e188 · 214e188
1 parent d6d1b19
commit 214e188
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/contrib/format-httpd/pom.xml b/contrib/format-httpd/pom.xml
@@ -60,10 +60,6 @@
           <groupId>nl.basjes.parse.httpdlog</groupId>
           <artifactId>httpdlog-parser</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>com.github.ben-manes.caffeine</groupId>
-          <artifactId>caffeine</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
 

diff --git a/contrib/udfs/pom.xml b/contrib/udfs/pom.xml
@@ -80,12 +80,6 @@
       <groupId>nl.basjes.parse.useragent</groupId>
       <artifactId>yauaa</artifactId>
       <version>${yauaa.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.github.ben-manes.caffeine</groupId>
-          <artifactId>caffeine</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
 
     <!-- Test dependencies -->

diff --git a/contrib/udfs/src/main/java/org/apache/drill/exec/udfs/UserAgentAnalyzerProvider.java b/contrib/udfs/src/main/java/org/apache/drill/exec/udfs/UserAgentAnalyzerProvider.java
@@ -54,8 +54,6 @@ private static class UserAgentAnalyzerHolder {
     private static final UserAgentAnalyzer INSTANCE = UserAgentAnalyzer.newBuilder()
             .dropTests()
             .hideMatcherLoadStats()
-            // Caffeine is a Java 11+ library.
-            .useJava8CompatibleCaching()
             .immediateInitialization()
             .build();
   }

diff --git a/contrib/udfs/src/test/java/org/apache/drill/exec/udfs/TestUserAgentFunctions.java b/contrib/udfs/src/test/java/org/apache/drill/exec/udfs/TestUserAgentFunctions.java
@@ -157,7 +157,7 @@ public void testBadFieldName() throws Exception {
   @Test
   public void testNullUserAgent() throws Exception {
     // If a null value is provided then the UserAgentAnalyzer will classify this as a Hacker because all requests normally have a User-Agent.
-    UserAgentAnalyzer analyzer = UserAgentAnalyzer.newBuilder().showMinimalVersion().withoutCache().dropTests().immediateInitialization().build();
+    UserAgentAnalyzer analyzer = UserAgentAnalyzer.newBuilder().showMinimalVersion().withoutCache().withoutClientHintsCache().dropTests().immediateInitialization().build();
     Map<String, String> expected = analyzer.parse((String)null).toMap(analyzer.getAllPossibleFieldNamesSorted());
 
     Map<String, Text> expectedRecord = new TreeMap<>();

diff --git a/pom.xml b/pom.xml
@@ -127,7 +127,7 @@
     <commons.configuration.version>1.10</commons.configuration.version>
     <commons.beanutils.version>1.9.4</commons.beanutils.version>
     <httpdlog-parser.version>5.8</httpdlog-parser.version>
-    <yauaa.version>7.9.0</yauaa.version>
+    <yauaa.version>7.19.2</yauaa.version>
     <log4j.version>2.19.0</log4j.version>
     <aircompressor.version>0.20</aircompressor.version>
     <iceberg.version>0.12.1</iceberg.version>