This is an automated email from the ASF dual-hosted git repository. dzamo pushed a commit to branch 1.20 in repository https://gitbox.apache.org/repos/asf/drill.git
commit 5abb4e9d79dd5e045c2e77715120566312755a41 Author: Niels Basjes <[email protected]> AuthorDate: Thu Dec 8 20:35:48 2022 +0100 DRILL-8368: Update Yauaa to 7.9.0 (#2717) --- contrib/format-httpd/pom.xml | 19 +++++++++++++++++++ contrib/udfs/pom.xml | 14 ++++++++++++++ pom.xml | 6 +++--- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/contrib/format-httpd/pom.xml b/contrib/format-httpd/pom.xml index 24e3cdde87..fc87aa0226 100644 --- a/contrib/format-httpd/pom.xml +++ b/contrib/format-httpd/pom.xml @@ -60,8 +60,27 @@ <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> + <!-- The default logging implementation for Yauaa --> + <!-- Send all Log4j2 calls to SLF4J --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + </dependency> + + <!-- The default logging implementation for Yauaa --> + <!-- Send all Log4j2 calls to SLF4J --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j.version}</version> + </dependency> <!-- Test dependencies --> <dependency> diff --git a/contrib/udfs/pom.xml b/contrib/udfs/pom.xml index 20f575221b..39b6ed9d5e 100644 --- a/contrib/udfs/pom.xml +++ b/contrib/udfs/pom.xml @@ -68,6 +68,20 @@ <groupId>nl.basjes.parse.useragent</groupId> <artifactId>yauaa</artifactId> <version>${yauaa.version}</version> + <exclusions> + <exclusion> + <groupId>com.github.benmanes.caffeine</groupId> + <artifactId>caffeine</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- The default logging implementation for Yauaa --> + <!-- Send all Log4j2 calls to SLF4J --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-to-slf4j</artifactId> + <version>${log4j.version}</version> </dependency> <!-- Test dependencies --> diff --git a/pom.xml b/pom.xml index 633d8e1ca6..024d6b91da 100644 --- a/pom.xml +++ b/pom.xml @@ -132,14 +132,14 @@ <xerces.version>2.12.2</xerces.version> <commons.configuration.version>1.10</commons.configuration.version> <commons.beanutils.version>1.9.4</commons.beanutils.version> - <httpdlog-parser.version>5.7</httpdlog-parser.version> - <yauaa.version>5.20</yauaa.version> + <httpdlog-parser.version>5.8</httpdlog-parser.version> + <yauaa.version>7.9.0</yauaa.version> + <log4j.version>2.18.0</log4j.version> <aircompressor.version>0.20</aircompressor.version> <iceberg.version>0.12.1</iceberg.version> <univocity-parsers.version>2.8.3</univocity-parsers.version> <mongo.version>4.3.3</mongo.version> <junit.args /> - <log4j.version>2.17.2</log4j.version> </properties> <scm>
