From 621a29f7662953aca518cede1e9b540e82095ba6 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Tue, 22 Oct 2024 14:04:03 +0200
Subject: [PATCH 01/10] Updated azure-eventhubs to 3.3.0 adapting the
 instantiation of EventProcessorHost using the EventProcessorHostBuilder

---
 VERSION                                 |  2 +-
 build.gradle                            | 47 ++++++++++++++++++++++---
 lib/logstash-input-azure_event_hubs.rb  | 43 +++++++++++++++++++---
 lib/logstash/inputs/azure_event_hubs.rb | 33 +++++++++--------
 4 files changed, 99 insertions(+), 26 deletions(-)

diff --git a/VERSION b/VERSION
index 4ea2b1f..bc80560 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.4.9
+1.5.0
diff --git a/build.gradle b/build.gradle
index e2a1fa5..cbe3355 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,12 +19,51 @@ repositories {
 dependencies {
     testImplementation 'junit:junit:4.12'
 
-    implementation 'com.microsoft.azure:azure-eventhubs:2.3.2'
+    implementation 'com.microsoft.azure:azure-eventhubs:3.3.0'
+
     implementation 'com.microsoft.azure:qpid-proton-j-extensions:1.2.4'
-    implementation 'com.microsoft.azure:azure-eventhubs-eph:2.5.2'
+    implementation 'com.microsoft.azure:azure-eventhubs-eph:3.3.0'
     implementation 'com.microsoft.azure:azure-storage:8.6.6'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    implementation 'org.apache.qpid:proton-j:0.33.9'
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'org.apache.qpid:proton-j:0.33.8'
+
+
+    implementation 'com.microsoft.azure:azure-keyvault-core:1.2.4'
+    implementation 'com.microsoft.azure:adal4j:1.6.4'
+    implementation 'com.microsoft.azure:azure-annotations:1.10.0'
+    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.10.1'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.1'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.1'
+    implementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1'
+    implementation 'com.google.code.findbugs:jsr305:1.3.9'
+    implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
+    implementation 'com.google.guava:guava:24.1.1-jre'
+    implementation 'com.google.j2objc:j2objc-annotations:1.1'
+    implementation 'com.nimbusds:lang-tag:1.7'
+    implementation 'com.nimbusds:nimbus-jose-jwt:9.8.1'
+    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.2'
+    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 'io.reactivex:rxjava:1.3.8'
+    implementation 'javax.activation:activation:1.1'
+    implementation 'joda-time:joda-time:2.9.9'
+    implementation 'net.minidev:accessors-smart:1.2'
+    implementation 'net.minidev:json-smart:2.3'
+//    implementation 'org.apache.commons:commons-lang3:3.8.1' // this result to do not have any file during vendor task
+    implementation 'org.checkerframework:checker-compat-qual:2.0.0'
+    implementation 'org.codehaus.mojo:animal-sniffer-annotations:1.14'
+    implementation 'org.ow2.asm:asm:5.0.4'
     compileOnly 'org.apache.logging.log4j:log4j-api:2.17.0' // provided by Logstash
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' // provided by Logstash
 }
diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb
index 721bf31..e145566 100644
--- a/lib/logstash-input-azure_event_hubs.rb
+++ b/lib/logstash-input-azure_event_hubs.rb
@@ -1,9 +1,44 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('com.microsoft.azure', 'azure-eventhubs', '2.3.2')
+require_jar('com.microsoft.azure', 'azure-eventhubs', '3.3.0')
 require_jar('com.microsoft.azure', 'qpid-proton-j-extensions', '1.2.4')
-require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '2.5.2')
+require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '3.3.0')
 require_jar('com.microsoft.azure', 'azure-storage', '8.6.6')
-require_jar('com.google.code.gson', 'gson', '2.10.1')
-require_jar('org.apache.qpid', 'proton-j', '0.33.9')
+require_jar('com.google.code.gson', 'gson', '2.8.6')
+require_jar('org.apache.qpid', 'proton-j', '0.33.8')
+require_jar('com.microsoft.azure', 'azure-keyvault-core', '1.2.4')
+require_jar('com.microsoft.azure', 'adal4j', '1.6.4')
+require_jar('com.microsoft.azure', 'azure-annotations', '1.10.0')
+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.10.1')
+require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.10.1')
+require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.10.1')
+require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.10.1')
+require_jar('com.github.stephenc.jcip', 'jcip-annotations', '1.0-1')
+require_jar('com.google.code.findbugs', 'jsr305', '1.3.9')
+require_jar('com.google.errorprone', 'error_prone_annotations', '2.1.3')
+require_jar('com.google.guava', 'guava', '24.1.1-jre')
+require_jar('com.google.j2objc', 'j2objc-annotations', '1.1')
+require_jar('com.nimbusds', 'lang-tag', '1.7')
+require_jar('com.nimbusds', 'nimbus-jose-jwt', '9.8.1')
+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.2')
+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('io.reactivex', 'rxjava', '1.3.8')
+require_jar('javax.activation', 'activation', '1.1')
+require_jar('joda-time', 'joda-time', '2.9.9')
+require_jar('net.minidev', 'accessors-smart', '1.2')
+require_jar('net.minidev', 'json-smart', '2.3')
+require_jar('org.checkerframework', 'checker-compat-qual', '2.0.0')
+require_jar('org.codehaus.mojo', 'animal-sniffer-annotations', '1.14')
+require_jar('org.ow2.asm', 'asm', '5.0.4')
diff --git a/lib/logstash/inputs/azure_event_hubs.rb b/lib/logstash/inputs/azure_event_hubs.rb
index 7909f25..40885aa 100644
--- a/lib/logstash/inputs/azure_event_hubs.rb
+++ b/lib/logstash/inputs/azure_event_hubs.rb
@@ -401,14 +401,17 @@ def run(queue)
         @logger.info("Event Hub #{event_hub_name} is initializing... ")
         begin
           if event_hub['storage_connection']
-            event_processor_host = EventProcessorHost.new(
-                EventProcessorHost.createHostName('logstash'),
-                event_hub_name,
-                event_hub['consumer_group'],
-                event_hub['event_hub_connections'].first.value, #there will only be one in this array by the time it gets here
-                event_hub['storage_connection'].value,
-                event_hub.fetch('storage_container', event_hub_name),
-                scheduled_executor_service)
+            event_processor_host = EventProcessorHost::EventProcessorHostBuilder.newBuilder(EventProcessorHost.createHostName('logstash'), event_hub['consumer_group'])
+                                                         .useAzureStorageCheckpointLeaseManager(
+                                                           event_hub['storage_connection'].value,
+                                                           event_hub.fetch('storage_container', event_hub_name),
+                                                           nil
+                                                         )
+                                                         .useEventHubConnectionString(
+                                                           event_hub['event_hub_connections'].first.value, #there will only be one in this array by the time it gets here
+                                                         )
+                                                     .setExecutor(scheduled_executor_service)
+                                                     .build
           else
             @logger.warn("You have NOT specified a `storage_connection_string` for #{event_hub_name}. This configuration is only supported for a single Logstash instance.")
             event_processor_host = create_in_memory_event_processor_host(event_hub, event_hub_name, scheduled_executor_service)
@@ -487,15 +490,11 @@ def run(queue)
   def create_in_memory_event_processor_host(event_hub, event_hub_name, scheduled_executor_service)
     checkpoint_manager = InMemoryCheckpointManager.new
     lease_manager = InMemoryLeaseManager.new
-    event_processor_host = EventProcessorHost.new(
-      EventProcessorHost.createHostName('logstash'),
-      event_hub_name,
-      event_hub['consumer_group'],
-      event_hub['event_hub_connections'].first.value, #there will only be one in this array by the time it gets here
-      checkpoint_manager,
-      lease_manager,
-      scheduled_executor_service,
-      nil)
+    event_processor_host = EventProcessorHost::EventProcessorHostBuilder.newBuilder(EventProcessorHost.createHostName('logstash'), event_hub['consumer_group'])
+                                             .useUserCheckpointAndLeaseManagers(checkpoint_manager, lease_manager)
+                                             .useEventHubConnectionString(event_hub['event_hub_connections'].first.value) #there will only be one in this array by the time it gets here
+                                             .setExecutor(scheduled_executor_service)
+                                             .build
     host_context = get_host_context(event_processor_host)
     #using java_send to avoid naming conflicts with 'initialize' method
     lease_manager.java_send :initialize, [HostContext], host_context

From 207d5f97e796e7fb8ed8d2a7b748b50a0cc153ad Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Wed, 23 Oct 2024 15:52:47 +0200
Subject: [PATCH 02/10] Fixed test after EventProcessorHost constructor became
 private

With version 3 of the library EventProcessorHost cosntructor has been replaced by EventProcessorHost.EventProcessorHostBuilder.
The tests was updated to mock the builder and not the constructor.
---
 spec/inputs/azure_event_hub_spec.rb | 97 ++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 35 deletions(-)

diff --git a/spec/inputs/azure_event_hub_spec.rb b/spec/inputs/azure_event_hub_spec.rb
index cb4df20..d022610 100644
--- a/spec/inputs/azure_event_hub_spec.rb
+++ b/spec/inputs/azure_event_hub_spec.rb
@@ -84,25 +84,39 @@
           unregister_counter.incrementAndGet
           completable_future
         }
-        expect(EventProcessorHost).to receive(:new).at_most(2).times {|host_name, event_hub_name, consumer_group, event_hub_connection, storage_connection, container, executor|
-          case event_hub_name
-          when 'event_hub_name0'
 
-            assertion_count.incrementAndGet
+        build_step_mock = double("final build step")
+        expect(build_step_mock).to receive(:build).at_most(2).times.and_return(mock_host)
+
+        executor_step = double("executor step")
+        expect(executor_step).to receive(:setExecutor).at_most(2).times.and_return(build_step_mock)
+
+        mock_connection_string = double("connection string")
+        expect(mock_connection_string).to receive(:useEventHubConnectionString).at_most(2).times {|event_hub_connection|
+          case event_hub_connection
+          when /.*event_hub_name0$/
             expect(event_hub_connection).to eql(config['event_hub_connections'][0])
-            expect(container).to eql('event_hub_name0') # default
+          when /.*event_hub_name1$/
+            expect(event_hub_connection).to eql(config['event_hub_connections'][1])
+          end
+          executor_step
+        }
 
+        mock_builder = double("storage and lease managers")
+        expect(mock_builder).to receive(:useAzureStorageCheckpointLeaseManager).at_most(2).times {|storage_connection_str, storage_container, storage_blob_prefix|
+          case storage_container
+          when 'event_hub_name0'
+            assertion_count.incrementAndGet
           when 'event_hub_name1'
             assertion_count.incrementAndGet
-            expect(host_name).to start_with('logstash')
-            expect(event_hub_connection).to eql(config['event_hub_connections'][1])
-            expect(container).to eql('event_hub_name1') # default
           end
-          expect(host_name).to start_with('logstash')
-          expect(storage_connection).to eql(config['storage_connection'])
+          mock_connection_string
+        }
 
+        expect(EventProcessorHost::EventProcessorHostBuilder).to receive(:newBuilder).at_most(2).times {|host_name, consumer_group|
+          expect(host_name).to start_with('logstash')
           host_counter.incrementAndGet
-          mock_host
+          mock_builder
         }
         # signal the stop first since the run method blocks until stop is called.
         input.do_stop
@@ -126,8 +140,6 @@
           expect(exploded_config[0]['event_hub_connections'][0].value).to eql('Endpoint=sb://logstash/;SharedAccessKeyName=activity-log-readonly;SharedAccessKey=something;EntityPath=event_hub1')
         end
       end
-
-
     end
 
     describe "Advanced Config" do
@@ -221,32 +233,45 @@
           unregister_counter.incrementAndGet
           completable_future
         }
-        expect(EventProcessorHost).to receive(:new).at_most(3).times {|host_name, event_hub_name, consumer_group, event_hub_connection, storage_connection, container, executor|
-          case event_hub_name
+
+        build_step_mock = double("final build step")
+        expect(build_step_mock).to receive(:build).at_most(3).times.and_return(mock_host)
+
+        executor_step = double("executor step")
+        expect(executor_step).to receive(:setExecutor).at_most(3).times.and_return(build_step_mock)
+
+        mock_connection_string = double("connection string")
+        expect(mock_connection_string).to receive(:useEventHubConnectionString).at_most(3).times {|event_hub_connection|
+          case event_hub_connection
+          when /.*event_hub_name0$/
+            expect(event_hub_connection).to eql(config['event_hubs'][0]['event_hub_name0']['event_hub_connections'][0].value)
+          when /.*event_hub_name1$/
+            expect(event_hub_connection).to eql(config['event_hubs'][1]['event_hub_name1']['event_hub_connections'][0].value)
+          end
+          executor_step
+        }
+
+        managers_mock = double("checkpoint and lease managers")
+        expect(managers_mock).to receive(:useUserCheckpointAndLeaseManagers).at_most(3).times {|checkpoint_mngr, lease_mngr|
+          assertion_count.incrementAndGet
+          mock_connection_string
+        }
+        expect(managers_mock).to receive(:useAzureStorageCheckpointLeaseManager).at_most(3).times {|storage_connection_str, storage_container, storage_blob_prefix|
+          case storage_container
           when 'event_hub_name0'
-            if consumer_group.eql?('cg')
-              assertion_count.incrementAndGet
-              expect(host_name).to start_with('logstash')
-              expect(event_hub_connection).to eql(config['event_hubs'][0]['event_hub_name0']['event_hub_connections'][0].value)
-              expect(storage_connection).to eql(config['event_hubs'][0]['event_hub_name0']['storage_connection'].value)
-              expect(container).to eql('event_hub_name0') # default
-            elsif consumer_group.eql?('ls')
-              assertion_count.incrementAndGet
-              expect(event_hub_connection).to eql(config['event_hubs'][2]['event_hub_name0']['event_hub_connections'][0].value)
-              # in this mode, storage connection and container are replaced with in memory offset management
-              expect(storage_connection).to be_kind_of(InMemoryCheckpointManager)
-              expect(container).to be_kind_of(InMemoryLeaseManager)
-            end
-          when 'event_hub_name1'
             assertion_count.incrementAndGet
-            expect(host_name).to start_with('logstash')
-            expect(event_hub_connection).to eql(config['event_hubs'][1]['event_hub_name1']['event_hub_connections'][0].value)
-            expect(storage_connection).to eql(config['event_hubs'][1]['event_hub_name1']['storage_connection'].value)
-            expect(container).to eql(config['event_hubs'][1]['event_hub_name1']['storage_container'])
+          when 'alt_container'
+            assertion_count.incrementAndGet
           end
+          mock_connection_string
+        }
+
+        expect(EventProcessorHost::EventProcessorHostBuilder).to receive(:newBuilder).at_most(3).times {|host_name, consumer_group|
+          expect(host_name).to start_with('logstash')
           host_counter.incrementAndGet
-          mock_host
+          managers_mock
         }
+
         # signal the stop first since the run method blocks until stop is called.
         input.do_stop
         input.run(mock_queue)
@@ -259,12 +284,14 @@
       it "can create an in memory EPH" do
         #event_hub, event_hub_name, scheduled_executor_service
         exploded_config = input.event_hubs_exploded
+        # During build step Azure libraries does a syntax check of EventHub connection string, so needs to be a pseudo real
+        exploded_config[0]['event_hub_connections'] = [::LogStash::Util::Password.new("Endpoint=sb://logstash.windows.net/;SharedAccessKeyName=activity-log-read-only;SharedAccessKey=blabla;EntityPath=ops-logs")]
         input.create_in_memory_event_processor_host(exploded_config[0], exploded_config[0]['event_hubs'].first, nil)
       end
     end
 
     describe "Bad Basic Config" do
-      describe "Offset overwritting" do
+      describe "Offset overwriting" do
         let(:config) do
           {
               'event_hub_connections' => ['Endpoint=sb://...;EntityPath=event_hub_name0', 'Endpoint=sb://...;EntityPath=event_hub_name0'],

From 3055b79f9ff10696198b0df3ffa1f2fbcbf3f498 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Wed, 23 Oct 2024 16:27:05 +0200
Subject: [PATCH 03/10] Added changelog line for version 1.5.0

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08e8782..213e6ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 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)
+
 ## 1.4.9
   - Fixed issue with `getHostContext` method accessibility, causing plugin not to be able to run  [#93](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/93)
 

From 3ea33ee76d93cbc8895470df965787f5dc344b79 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Thu, 24 Oct 2024 16:56:51 +0200
Subject: [PATCH 04/10] Updated some transitive dependencies

---
 build.gradle                           | 30 +++++++++++++++-----------
 lib/logstash-input-azure_event_hubs.rb | 14 ++++++------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index cbe3355..9fa8b14 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,20 +24,19 @@ dependencies {
     implementation 'com.microsoft.azure:qpid-proton-j-extensions:1.2.4'
     implementation 'com.microsoft.azure:azure-eventhubs-eph:3.3.0'
     implementation 'com.microsoft.azure:azure-storage:8.6.6'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'org.apache.qpid:proton-j:0.33.8'
 
-
     implementation 'com.microsoft.azure:azure-keyvault-core:1.2.4'
     implementation 'com.microsoft.azure:adal4j:1.6.4'
     implementation 'com.microsoft.azure:azure-annotations:1.10.0'
     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.10.1'
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.10.1'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.10.1'
+    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.github.stephenc.jcip:jcip-annotations:1.0-1'
     implementation 'com.google.code.findbugs:jsr305:1.3.9'
     implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
@@ -49,7 +48,7 @@ dependencies {
     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.2'
+    implementation 'com.squareup.okio:okio:1.17.6'
     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'
@@ -59,7 +58,7 @@ dependencies {
     implementation 'javax.activation:activation:1.1'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'net.minidev:accessors-smart:1.2'
-    implementation 'net.minidev:json-smart:2.3'
+    implementation 'net.minidev:json-smart:2.4.9'
 //    implementation 'org.apache.commons:commons-lang3:3.8.1' // this result to do not have any file during vendor task
     implementation 'org.checkerframework:checker-compat-qual:2.0.0'
     implementation 'org.codehaus.mojo:animal-sniffer-annotations:1.14'
@@ -86,11 +85,16 @@ task vendor {
     doLast {
         String vendorPathPrefix = "vendor/jar-dependencies"
         configurations.runtimeClasspath.allDependencies.each { dep ->
-            File f = configurations.runtimeClasspath.filter { it.absolutePath.contains("${dep.group}" + File.separator + "${dep.name}" + File.separator + "${dep.version}") }.singleFile
-            String groupPath = dep.group.replaceAll('\\.', '/')
-            File newJarFile = file("${vendorPathPrefix}" + File.separator + "${groupPath}" + File.separator + "${dep.name}"+ File.separator + "${dep.version}" + File.separator + "${dep.name}-${dep.version}.jar")
-            newJarFile.mkdirs()
-            Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING)
+            FileCollection fileCollection = configurations.runtimeClasspath.filter { it.absolutePath.contains("${dep.group}" + File.separator + "${dep.name}" + File.separator + "${dep.version}") }
+            if (fileCollection.isEmpty()) {
+                println "runtimeClasspath is empty for dependency ${dep.group}" + File.separator + "${dep.name}" + File.separator + "${dep.version}"
+            } else {
+                File f = fileCollection.singleFile
+                String groupPath = dep.group.replaceAll('\\.', '/')
+                File newJarFile = file("${vendorPathPrefix}" + File.separator + "${groupPath}" + File.separator + "${dep.name}" + File.separator + "${dep.version}" + File.separator + "${dep.name}-${dep.version}.jar")
+                newJarFile.mkdirs()
+                Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING)
+            }
         }
     }
 }
diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb
index e145566..81496bd 100644
--- a/lib/logstash-input-azure_event_hubs.rb
+++ b/lib/logstash-input-azure_event_hubs.rb
@@ -5,7 +5,7 @@
 require_jar('com.microsoft.azure', 'qpid-proton-j-extensions', '1.2.4')
 require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '3.3.0')
 require_jar('com.microsoft.azure', 'azure-storage', '8.6.6')
-require_jar('com.google.code.gson', 'gson', '2.8.6')
+require_jar('com.google.code.gson', 'gson', '2.8.9')
 require_jar('org.apache.qpid', 'proton-j', '0.33.8')
 require_jar('com.microsoft.azure', 'azure-keyvault-core', '1.2.4')
 require_jar('com.microsoft.azure', 'adal4j', '1.6.4')
@@ -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.10.1')
-require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.10.1')
-require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.10.1')
-require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.10.1')
+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.github.stephenc.jcip', 'jcip-annotations', '1.0-1')
 require_jar('com.google.code.findbugs', 'jsr305', '1.3.9')
 require_jar('com.google.errorprone', 'error_prone_annotations', '2.1.3')
@@ -28,7 +28,7 @@
 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.2')
+require_jar('com.squareup.okio', 'okio', '1.17.6')
 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')
@@ -38,7 +38,7 @@
 require_jar('javax.activation', 'activation', '1.1')
 require_jar('joda-time', 'joda-time', '2.9.9')
 require_jar('net.minidev', 'accessors-smart', '1.2')
-require_jar('net.minidev', 'json-smart', '2.3')
+require_jar('net.minidev', 'json-smart', '2.4.9')
 require_jar('org.checkerframework', 'checker-compat-qual', '2.0.0')
 require_jar('org.codehaus.mojo', 'animal-sniffer-annotations', '1.14')
 require_jar('org.ow2.asm', 'asm', '5.0.4')

From 658d43cfad97588eb98fbbdf6e6cc5fb1a42aac6 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Thu, 24 Oct 2024 17:15:20 +0200
Subject: [PATCH 05/10] Updated Guava dependency

---
 build.gradle                           | 2 +-
 lib/logstash-input-azure_event_hubs.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9fa8b14..33f8ce4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     implementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1'
     implementation 'com.google.code.findbugs:jsr305:1.3.9'
     implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
-    implementation 'com.google.guava:guava:24.1.1-jre'
+    implementation 'com.google.guava:guava:32.0.1-jre'
     implementation 'com.google.j2objc:j2objc-annotations:1.1'
     implementation 'com.nimbusds:lang-tag:1.7'
     implementation 'com.nimbusds:nimbus-jose-jwt:9.8.1'
diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb
index 81496bd..7e5f305 100644
--- a/lib/logstash-input-azure_event_hubs.rb
+++ b/lib/logstash-input-azure_event_hubs.rb
@@ -20,7 +20,7 @@
 require_jar('com.github.stephenc.jcip', 'jcip-annotations', '1.0-1')
 require_jar('com.google.code.findbugs', 'jsr305', '1.3.9')
 require_jar('com.google.errorprone', 'error_prone_annotations', '2.1.3')
-require_jar('com.google.guava', 'guava', '24.1.1-jre')
+require_jar('com.google.guava', 'guava', '32.0.1-jre')
 require_jar('com.google.j2objc', 'j2objc-annotations', '1.1')
 require_jar('com.nimbusds', 'lang-tag', '1.7')
 require_jar('com.nimbusds', 'nimbus-jose-jwt', '9.8.1')

From 213d519237361ba148ea896a9bddd6911f54c74b Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Thu, 24 Oct 2024 17:45:54 +0200
Subject: [PATCH 06/10] Removed findbugs and errorprone which are dependencies
 related to build step and not runtime execution

---
 build.gradle                           | 4 ++--
 lib/logstash-input-azure_event_hubs.rb | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 33f8ce4..d3a3a01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,8 +38,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.7.1'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.7'
     implementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1'
-    implementation 'com.google.code.findbugs:jsr305:1.3.9'
-    implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
+//    implementation 'com.google.code.findbugs:jsr305:1.3.9'
+//    implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
     implementation 'com.google.guava:guava:32.0.1-jre'
     implementation 'com.google.j2objc:j2objc-annotations:1.1'
     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 7e5f305..3bf8579 100644
--- a/lib/logstash-input-azure_event_hubs.rb
+++ b/lib/logstash-input-azure_event_hubs.rb
@@ -18,8 +18,6 @@
 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.github.stephenc.jcip', 'jcip-annotations', '1.0-1')
-require_jar('com.google.code.findbugs', 'jsr305', '1.3.9')
-require_jar('com.google.errorprone', 'error_prone_annotations', '2.1.3')
 require_jar('com.google.guava', 'guava', '32.0.1-jre')
 require_jar('com.google.j2objc', 'j2objc-annotations', '1.1')
 require_jar('com.nimbusds', 'lang-tag', '1.7')

From 082ce43b75f41ca9ff36b1e6405f007023b2aaa0 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Thu, 24 Oct 2024 18:10:41 +0200
Subject: [PATCH 07/10] Commented dependencies that are not present in
 runtimeClasspath during the vendor. This avoid to have require_jar calls that
 doesn't find the expected file

---
 build.gradle                           | 8 ++++----
 lib/logstash-input-azure_event_hubs.rb | 4 ----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index d3a3a01..4431446 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 //    implementation 'com.google.code.findbugs:jsr305:1.3.9'
 //    implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
     implementation 'com.google.guava:guava:32.0.1-jre'
-    implementation 'com.google.j2objc:j2objc-annotations:1.1'
+//    implementation 'com.google.j2objc:j2objc-annotations:1.1' // this result to do not have any file during vendor task
     implementation 'com.nimbusds:lang-tag:1.7'
     implementation 'com.nimbusds:nimbus-jose-jwt:9.8.1'
     implementation 'com.nimbusds:oauth2-oidc-sdk:6.5'
@@ -56,13 +56,13 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.11'
     implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'javax.activation:activation:1.1'
-    implementation 'joda-time:joda-time:2.9.9'
-    implementation 'net.minidev:accessors-smart:1.2'
+//    implementation 'joda-time:joda-time:2.9.9' // this result to do not have any file during vendor task
+//    implementation 'net.minidev:accessors-smart:1.2' // this result to do not have any file during vendor task
     implementation 'net.minidev:json-smart:2.4.9'
 //    implementation 'org.apache.commons:commons-lang3:3.8.1' // this result to do not have any file during vendor task
     implementation 'org.checkerframework:checker-compat-qual:2.0.0'
     implementation 'org.codehaus.mojo:animal-sniffer-annotations:1.14'
-    implementation 'org.ow2.asm:asm:5.0.4'
+//    implementation 'org.ow2.asm:asm:5.0.4' // this result to do not have any file during vendor task
     compileOnly 'org.apache.logging.log4j:log4j-api:2.17.0' // provided by Logstash
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' // provided by Logstash
 }
diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb
index 3bf8579..74f3b78 100644
--- a/lib/logstash-input-azure_event_hubs.rb
+++ b/lib/logstash-input-azure_event_hubs.rb
@@ -19,7 +19,6 @@
 require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.12.7')
 require_jar('com.github.stephenc.jcip', 'jcip-annotations', '1.0-1')
 require_jar('com.google.guava', 'guava', '32.0.1-jre')
-require_jar('com.google.j2objc', 'j2objc-annotations', '1.1')
 require_jar('com.nimbusds', 'lang-tag', '1.7')
 require_jar('com.nimbusds', 'nimbus-jose-jwt', '9.8.1')
 require_jar('com.nimbusds', 'oauth2-oidc-sdk', '6.5')
@@ -34,9 +33,6 @@
 require_jar('commons-codec', 'commons-codec', '1.11')
 require_jar('io.reactivex', 'rxjava', '1.3.8')
 require_jar('javax.activation', 'activation', '1.1')
-require_jar('joda-time', 'joda-time', '2.9.9')
-require_jar('net.minidev', 'accessors-smart', '1.2')
 require_jar('net.minidev', 'json-smart', '2.4.9')
 require_jar('org.checkerframework', 'checker-compat-qual', '2.0.0')
 require_jar('org.codehaus.mojo', 'animal-sniffer-annotations', '1.14')
-require_jar('org.ow2.asm', 'asm', '5.0.4')

From a9ee6182daf3e70655fd10362b0b89c8a9c6f730 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Thu, 24 Oct 2024 18:26:12 +0200
Subject: [PATCH 08/10] Removed commented dependencies

---
 build.gradle | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4431446..f3bfbd7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,10 +38,7 @@ dependencies {
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.7.1'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.12.7'
     implementation 'com.github.stephenc.jcip:jcip-annotations:1.0-1'
-//    implementation 'com.google.code.findbugs:jsr305:1.3.9'
-//    implementation 'com.google.errorprone:error_prone_annotations:2.1.3'
     implementation 'com.google.guava:guava:32.0.1-jre'
-//    implementation 'com.google.j2objc:j2objc-annotations:1.1' // this result to do not have any file during vendor task
     implementation 'com.nimbusds:lang-tag:1.7'
     implementation 'com.nimbusds:nimbus-jose-jwt:9.8.1'
     implementation 'com.nimbusds:oauth2-oidc-sdk:6.5'
@@ -56,13 +53,9 @@ dependencies {
     implementation 'commons-codec:commons-codec:1.11'
     implementation 'io.reactivex:rxjava:1.3.8'
     implementation 'javax.activation:activation:1.1'
-//    implementation 'joda-time:joda-time:2.9.9' // this result to do not have any file during vendor task
-//    implementation 'net.minidev:accessors-smart:1.2' // this result to do not have any file during vendor task
     implementation 'net.minidev:json-smart:2.4.9'
-//    implementation 'org.apache.commons:commons-lang3:3.8.1' // this result to do not have any file during vendor task
     implementation 'org.checkerframework:checker-compat-qual:2.0.0'
     implementation 'org.codehaus.mojo:animal-sniffer-annotations:1.14'
-//    implementation 'org.ow2.asm:asm:5.0.4' // this result to do not have any file during vendor task
     compileOnly 'org.apache.logging.log4j:log4j-api:2.17.0' // provided by Logstash
     testImplementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.17.0' // provided by Logstash
 }

From 1083ac802dbc68265c1bc4e9f7260d46a7059f70 Mon Sep 17 00:00:00 2001
From: Andrea Selva <selva.andre@gmail.com>
Date: Fri, 25 Oct 2024 08:34:47 +0200
Subject: [PATCH 09/10] Update nimbus-jose-jwt dependency in build.gradle
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f3bfbd7..53125a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     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.8.1'
+    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'

From 162c5cc04caeaf309844bdebfd5fec248816a778 Mon Sep 17 00:00:00 2001
From: andsel <selva.andre@gmail.com>
Date: Fri, 25 Oct 2024 08:36:10 +0200
Subject: [PATCH 10/10] Updated require_jar for nimbus-jose-jwt

---
 lib/logstash-input-azure_event_hubs.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/logstash-input-azure_event_hubs.rb b/lib/logstash-input-azure_event_hubs.rb
index 74f3b78..9b540a0 100644
--- a/lib/logstash-input-azure_event_hubs.rb
+++ b/lib/logstash-input-azure_event_hubs.rb
@@ -20,7 +20,7 @@
 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.8.1')
+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')