From 330545df643840c3e77fb1224929a10fa614db23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Fri, 3 Jan 2025 07:19:30 +0000 Subject: [PATCH 1/5] bump multiple dependencies --- build.gradle | 19 +++++++++---------- lib/logstash-input-azure_event_hubs.rb | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 53125a5..86352d4 100644 --- a/build.gradle +++ b/build.gradle @@ -33,24 +33,23 @@ dependencies { implementation 'com.microsoft.azure:azure-client-authentication:1.7.3' implementation 'com.microsoft.azure:azure-client-runtime:1.7.3' implementation 'com.microsoft.rest:client-runtime:1.7.3' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.7' - implementation 'com.fasterxml.jackson.core:jackson-core:2.12.7' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.7.1' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.7' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.4' + implementation 'com.fasterxml.jackson.core:jackson-core:2.15.4' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.15.4' implementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1' implementation 'com.google.guava:guava:32.0.1-jre' implementation 'com.nimbusds:lang-tag:1.7' implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2' - implementation 'com.nimbusds:oauth2-oidc-sdk:6.5' - implementation 'com.squareup.okhttp3:logging-interceptor:3.12.2' - implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.12.2' - implementation 'com.squareup.okhttp3:okhttp:3.14.7' - implementation 'com.squareup.okio:okio:1.17.6' + implementation 'com.nimbusds:oauth2-oidc-sdk:8.36.2' + implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' + implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.3' + implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'com.squareup.retrofit2:adapter-rxjava:2.7.2' implementation 'com.squareup.retrofit2:converter-jackson:2.7.2' implementation 'com.squareup.retrofit2:retrofit:2.7.2' implementation 'com.sun.mail:javax.mail:1.6.1' - implementation 'commons-codec:commons-codec:1.11' + implementation 'commons-codec:commons-codec:1.14' implementation 'io.reactivex:rxjava:1.3.8' implementation 'javax.activation:activation:1.1' implementation 'net.minidev:json-smart:2.4.9' diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb index 9b540a0..4888212 100644 --- a/lib/logstash-input-azure_event_hubs.rb +++ b/lib/logstash-input-azure_event_hubs.rb @@ -13,24 +13,23 @@ require_jar('com.microsoft.azure', 'azure-client-authentication', '1.7.3') require_jar('com.microsoft.azure', 'azure-client-runtime', '1.7.3') require_jar('com.microsoft.rest', 'client-runtime', '1.7.3') -require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.12.7') -require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.12.7') -require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.12.7.1') -require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.12.7') +require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.15.4') +require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.15.4') +require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.15.4') +require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.15.4') require_jar('com.github.stephenc.jcip', 'jcip-annotations', '1.0-1') require_jar('com.google.guava', 'guava', '32.0.1-jre') require_jar('com.nimbusds', 'lang-tag', '1.7') require_jar('com.nimbusds', 'nimbus-jose-jwt', '9.37.2') -require_jar('com.nimbusds', 'oauth2-oidc-sdk', '6.5') -require_jar('com.squareup.okhttp3', 'logging-interceptor', '3.12.2') -require_jar('com.squareup.okhttp3', 'okhttp-urlconnection', '3.12.2') -require_jar('com.squareup.okhttp3', 'okhttp', '3.14.7') -require_jar('com.squareup.okio', 'okio', '1.17.6') +require_jar('com.nimbusds', 'oauth2-oidc-sdk', '8.36.2') +require_jar('com.squareup.okhttp3', 'logging-interceptor', '4.9.3') +require_jar('com.squareup.okhttp3', 'okhttp-urlconnection', '4.9.3') +require_jar('com.squareup.okhttp3', 'okhttp', '4.9.3') require_jar('com.squareup.retrofit2', 'adapter-rxjava', '2.7.2') require_jar('com.squareup.retrofit2', 'converter-jackson', '2.7.2') require_jar('com.squareup.retrofit2', 'retrofit', '2.7.2') require_jar('com.sun.mail', 'javax.mail', '1.6.1') -require_jar('commons-codec', 'commons-codec', '1.11') +require_jar('commons-codec', 'commons-codec', '1.14') require_jar('io.reactivex', 'rxjava', '1.3.8') require_jar('javax.activation', 'activation', '1.1') require_jar('net.minidev', 'json-smart', '2.4.9') From 4c5813d47cf4aaf1e02a0ea1842c1ae6fa5b01fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Fri, 3 Jan 2025 10:20:37 +0000 Subject: [PATCH 2/5] update dependencies for testing --- .ci/integration/event_hub_consumer/pom.xml | 90 +++++++++++++++++++++- .ci/integration/event_hub_producer/pom.xml | 81 +++++++++++++++++-- build.gradle | 9 ++- lib/logstash-input-azure_event_hubs.rb | 7 +- 4 files changed, 170 insertions(+), 17 deletions(-) diff --git a/.ci/integration/event_hub_consumer/pom.xml b/.ci/integration/event_hub_consumer/pom.xml index 7057e08..c687dd2 100644 --- a/.ci/integration/event_hub_consumer/pom.xml +++ b/.ci/integration/event_hub_consumer/pom.xml @@ -69,12 +69,12 @@ com.microsoft.azure azure-eventhubs - 1.0.1 + 3.3.0 com.microsoft.azure azure-eventhubs-eph - 1.0.0 + 3.3.0 org.slf4j @@ -84,12 +84,58 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.24.3 org.apache.logging.log4j log4j-slf4j-impl - 2.20.0 + 2.24.3 + + + com.fasterxml.jackson.core + jackson-databind + [2.15.4,3.0) + + + com.nimbusds + oauth2-oidc-sdk + 8.36.2 + runtime + + + com.google.code.gson + gson + 2.8.9 + + + commons-codec + commons-codec + 1.14 + + + net.minidev + json-smart + 2.4.9 + + + com.google.guava + guava + 32.0.1-jre + + + com.nimbusds + nimbus-jose-jwt + 9.37.2 + + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 2.1.0 @@ -110,5 +156,41 @@ org.apache.logging.log4j log4j-slf4j-impl + + com.fasterxml.jackson.core + jackson-databind + + + com.nimbusds + oauth2-oidc-sdk + + + com.google.code.gson + gson + + + net.minidev + json-smart + + + commons-codec + commons-codec + + + com.google.guava + guava + + + com.nimbusds + nimbus-jose-jwt + + + com.squareup.okhttp3 + okhttp + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + diff --git a/.ci/integration/event_hub_producer/pom.xml b/.ci/integration/event_hub_producer/pom.xml index 4988c06..00d59ed 100644 --- a/.ci/integration/event_hub_producer/pom.xml +++ b/.ci/integration/event_hub_producer/pom.xml @@ -69,7 +69,7 @@ com.microsoft.azure azure-eventhubs - 1.0.1 + 3.3.0 org.slf4j @@ -79,27 +79,68 @@ org.apache.logging.log4j log4j-core - 2.20.0 + 2.24.3 org.apache.logging.log4j log4j-slf4j-impl - 2.20.0 + 2.24.3 com.fasterxml.jackson.core jackson-core - [2.15.2,3.0) + [2.15.4,3.0) com.fasterxml.jackson.core jackson-annotations - [2.15.2,3.0) + [2.15.4,3.0) com.fasterxml.jackson.core jackson-databind - [2.15.2,3.0) + [2.15.4,3.0) + + + com.nimbusds + oauth2-oidc-sdk + 8.36.2 + runtime + + + com.google.code.gson + gson + 2.8.9 + + + net.minidev + json-smart + 2.4.9 + + + com.google.guava + guava + 32.0.1-jre + + + commons-codec + commons-codec + 1.14 + + + com.nimbusds + nimbus-jose-jwt + 9.37.2 + + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 2.1.0 @@ -128,5 +169,33 @@ com.fasterxml.jackson.core jackson-databind + + com.google.code.gson + gson + + + net.minidev + json-smart + + + com.google.guava + guava + + + commons-codec + commons-codec + + + com.nimbusds + nimbus-jose-jwt + + + com.squareup.okhttp3 + okhttp + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + diff --git a/build.gradle b/build.gradle index 86352d4..370e531 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ repositories { } dependencies { - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13.1' implementation 'com.microsoft.azure:azure-eventhubs:3.3.0' @@ -42,9 +42,10 @@ dependencies { implementation 'com.nimbusds:lang-tag:1.7' implementation 'com.nimbusds:nimbus-jose-jwt:9.37.2' implementation 'com.nimbusds:oauth2-oidc-sdk:8.36.2' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3' - implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.3' - implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0' + implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.12.0' + implementation 'com.squareup.okhttp3:okhttp:4.12.0' + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0' implementation 'com.squareup.retrofit2:adapter-rxjava:2.7.2' implementation 'com.squareup.retrofit2:converter-jackson:2.7.2' implementation 'com.squareup.retrofit2:retrofit:2.7.2' diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb index 4888212..e8de61c 100644 --- a/lib/logstash-input-azure_event_hubs.rb +++ b/lib/logstash-input-azure_event_hubs.rb @@ -22,9 +22,10 @@ require_jar('com.nimbusds', 'lang-tag', '1.7') require_jar('com.nimbusds', 'nimbus-jose-jwt', '9.37.2') require_jar('com.nimbusds', 'oauth2-oidc-sdk', '8.36.2') -require_jar('com.squareup.okhttp3', 'logging-interceptor', '4.9.3') -require_jar('com.squareup.okhttp3', 'okhttp-urlconnection', '4.9.3') -require_jar('com.squareup.okhttp3', 'okhttp', '4.9.3') +require_jar('com.squareup.okhttp3', 'logging-interceptor', '4.12.0') +require_jar('com.squareup.okhttp3', 'okhttp-urlconnection', '4.12.0') +require_jar('com.squareup.okhttp3', 'okhttp', '4.12.0') +require_jar('org.jetbrains.kotlin', 'kotlin-stdlib-jdk8', '2.1.0') require_jar('com.squareup.retrofit2', 'adapter-rxjava', '2.7.2') require_jar('com.squareup.retrofit2', 'converter-jackson', '2.7.2') require_jar('com.squareup.retrofit2', 'retrofit', '2.7.2') From b53dad934794f0cf1fde71745251c4b0c5be943c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Fri, 3 Jan 2025 13:56:05 +0000 Subject: [PATCH 3/5] revert dependency upgrades in test consumer and producer --- .ci/integration/event_hub_consumer/pom.xml | 90 +--------------------- .ci/integration/event_hub_producer/pom.xml | 81 ++----------------- 2 files changed, 10 insertions(+), 161 deletions(-) diff --git a/.ci/integration/event_hub_consumer/pom.xml b/.ci/integration/event_hub_consumer/pom.xml index c687dd2..7057e08 100644 --- a/.ci/integration/event_hub_consumer/pom.xml +++ b/.ci/integration/event_hub_consumer/pom.xml @@ -69,12 +69,12 @@ com.microsoft.azure azure-eventhubs - 3.3.0 + 1.0.1 com.microsoft.azure azure-eventhubs-eph - 3.3.0 + 1.0.0 org.slf4j @@ -84,58 +84,12 @@ org.apache.logging.log4j log4j-core - 2.24.3 + 2.20.0 org.apache.logging.log4j log4j-slf4j-impl - 2.24.3 - - - com.fasterxml.jackson.core - jackson-databind - [2.15.4,3.0) - - - com.nimbusds - oauth2-oidc-sdk - 8.36.2 - runtime - - - com.google.code.gson - gson - 2.8.9 - - - commons-codec - commons-codec - 1.14 - - - net.minidev - json-smart - 2.4.9 - - - com.google.guava - guava - 32.0.1-jre - - - com.nimbusds - nimbus-jose-jwt - 9.37.2 - - - com.squareup.okhttp3 - okhttp - 4.12.0 - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - 2.1.0 + 2.20.0 @@ -156,41 +110,5 @@ org.apache.logging.log4j log4j-slf4j-impl - - com.fasterxml.jackson.core - jackson-databind - - - com.nimbusds - oauth2-oidc-sdk - - - com.google.code.gson - gson - - - net.minidev - json-smart - - - commons-codec - commons-codec - - - com.google.guava - guava - - - com.nimbusds - nimbus-jose-jwt - - - com.squareup.okhttp3 - okhttp - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - diff --git a/.ci/integration/event_hub_producer/pom.xml b/.ci/integration/event_hub_producer/pom.xml index 00d59ed..4988c06 100644 --- a/.ci/integration/event_hub_producer/pom.xml +++ b/.ci/integration/event_hub_producer/pom.xml @@ -69,7 +69,7 @@ com.microsoft.azure azure-eventhubs - 3.3.0 + 1.0.1 org.slf4j @@ -79,68 +79,27 @@ org.apache.logging.log4j log4j-core - 2.24.3 + 2.20.0 org.apache.logging.log4j log4j-slf4j-impl - 2.24.3 + 2.20.0 com.fasterxml.jackson.core jackson-core - [2.15.4,3.0) + [2.15.2,3.0) com.fasterxml.jackson.core jackson-annotations - [2.15.4,3.0) + [2.15.2,3.0) com.fasterxml.jackson.core jackson-databind - [2.15.4,3.0) - - - com.nimbusds - oauth2-oidc-sdk - 8.36.2 - runtime - - - com.google.code.gson - gson - 2.8.9 - - - net.minidev - json-smart - 2.4.9 - - - com.google.guava - guava - 32.0.1-jre - - - commons-codec - commons-codec - 1.14 - - - com.nimbusds - nimbus-jose-jwt - 9.37.2 - - - com.squareup.okhttp3 - okhttp - 4.12.0 - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - 2.1.0 + [2.15.2,3.0) @@ -169,33 +128,5 @@ com.fasterxml.jackson.core jackson-databind - - com.google.code.gson - gson - - - net.minidev - json-smart - - - com.google.guava - guava - - - commons-codec - commons-codec - - - com.nimbusds - nimbus-jose-jwt - - - com.squareup.okhttp3 - okhttp - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - From 09137014ff8b3b0f06688ac33076f0c988740d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Fri, 3 Jan 2025 14:06:46 +0000 Subject: [PATCH 4/5] [skip ci] bump version to 1.5.1 --- CHANGELOG.md | 3 +++ VERSION | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 213e6ef..3ad976e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.5.1 + - Updated multiple Java dependencies [#99](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/99) + ## 1.5.0 - Updated Azure Event Hub client library to version 3.3.0 [#96](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/96) diff --git a/VERSION b/VERSION index bc80560..26ca594 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.0 +1.5.1 From a621e409f223b70bee2655774ed2b0311c330e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Duarte?= Date: Fri, 3 Jan 2025 15:41:47 +0000 Subject: [PATCH 5/5] bump jackson to 2.16.2 --- build.gradle | 8 ++++---- lib/logstash-input-azure_event_hubs.rb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 370e531..c0d3815 100644 --- a/build.gradle +++ b/build.gradle @@ -33,10 +33,10 @@ dependencies { implementation 'com.microsoft.azure:azure-client-authentication:1.7.3' implementation 'com.microsoft.azure:azure-client-runtime:1.7.3' implementation 'com.microsoft.rest:client-runtime:1.7.3' - implementation 'com.fasterxml.jackson.core:jackson-annotations:2.15.4' - implementation 'com.fasterxml.jackson.core:jackson-core:2.15.4' - implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.4' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.15.4' + implementation 'com.fasterxml.jackson.core:jackson-annotations:2.16.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.16.2' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.16.2' + implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.16.2' implementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1' implementation 'com.google.guava:guava:32.0.1-jre' implementation 'com.nimbusds:lang-tag:1.7' diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb index e8de61c..d746674 100644 --- a/lib/logstash-input-azure_event_hubs.rb +++ b/lib/logstash-input-azure_event_hubs.rb @@ -13,10 +13,10 @@ require_jar('com.microsoft.azure', 'azure-client-authentication', '1.7.3') require_jar('com.microsoft.azure', 'azure-client-runtime', '1.7.3') require_jar('com.microsoft.rest', 'client-runtime', '1.7.3') -require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.15.4') -require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.15.4') -require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.15.4') -require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.15.4') +require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.16.2') +require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.16.2') +require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.16.2') +require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.16.2') require_jar('com.github.stephenc.jcip', 'jcip-annotations', '1.0-1') require_jar('com.google.guava', 'guava', '32.0.1-jre') require_jar('com.nimbusds', 'lang-tag', '1.7')