From d0a046cb35d38ddb684652a81b95bc300bd7bdf0 Mon Sep 17 00:00:00 2001 From: Rob Bavey Date: Thu, 25 Aug 2022 12:21:08 -0400 Subject: [PATCH] Stop packaging jackson dependencies (#455) * Stop packaging jackson dependencies Use compileOnly and testImplemenation dependency options to rely on jars provided by Logstash --- CHANGELOG.md | 3 +++ VERSION | 2 +- build.gradle | 16 ++++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d21c6dba..be1f6728 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 6.4.2 + - Build: do not package jackson dependencies [#455](https://github.com/logstash-plugins/logstash-input-beats/pull/455) + ## 6.4.1 - [DOC] Add direct memory example [#454](https://github.com/logstash-plugins/logstash-input-beats/pull/454) diff --git a/VERSION b/VERSION index 4c77920f..a4c853ea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.4.1 +6.4.2 diff --git a/build.gradle b/build.gradle index bf132db0..13858fa2 100644 --- a/build.gradle +++ b/build.gradle @@ -13,8 +13,8 @@ description = "Beats/Lumberjack Netty implementation" sourceCompatibility = 1.8 targetCompatibility = 1.8 -String jacksonVersion = '2.9.10' -String jacksonDatabindVersion = '2.9.10.8' +String jacksonVersion = '2.13.3' +String jacksonDatabindVersion = '2.13.3' repositories { mavenCentral() @@ -26,10 +26,14 @@ dependencies { testImplementation 'org.apache.logging.log4j:log4j-core:2.17.0' implementation 'io.netty:netty-all:4.1.65.Final' implementation 'org.javassist:javassist:3.24.0-GA' - implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" - implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" - implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}" - implementation "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}" + testImplementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" + testImplementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" + testImplementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}" + testImplementation "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}" + compileOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" + compileOnly "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" + compileOnly "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}" + compileOnly "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}" compileOnly 'org.apache.logging.log4j:log4j-api:2.17.0' }