From bc0d1e90967532cd2658f5553c977749ad6839d4 Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 11 Apr 2024 11:50:57 -0500
Subject: [PATCH 1/2] feat: Updates jicoco and jetty.

---
 pom.xml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 711ca94b3..fd4dee50a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,8 @@
     <smack.version>4.4.6</smack.version>
     <jxmppVersion>1.0.3</jxmppVersion>
     <!-- Match jicoco's jetty version. -->
-    <jicoco.version>1.1-133-g768ef2e</jicoco.version>
-    <jetty.version>11.0.14</jetty.version>
+    <jicoco.version>1.1-140-g8f45a9f</jicoco.version>
+    <jetty.version>11.0.20</jetty.version>
   </properties>
 
   <dependencies>
@@ -270,16 +270,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.12.0</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpcore</artifactId>
-      <version>4.4.15</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.13</version>
-    </dependency>
     <!-- org.jitsi runtime-->
     <dependency>
       <groupId>${jitsi-desktop.groupId}</groupId>

From f21ca53150a13e99c627901adc3a64ed31bbbd4d Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Thu, 11 Apr 2024 11:59:22 -0500
Subject: [PATCH 2/2] fix: Fixes tests.

---
 src/main/java/org/jitsi/jigasi/JvbConference.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/org/jitsi/jigasi/JvbConference.java b/src/main/java/org/jitsi/jigasi/JvbConference.java
index 9c608f2d9..4166d490a 100644
--- a/src/main/java/org/jitsi/jigasi/JvbConference.java
+++ b/src/main/java/org/jitsi/jigasi/JvbConference.java
@@ -1965,6 +1965,12 @@ public void setLobbyEnabled(boolean value)
      */
     private String getMeetingId()
     {
+        // in case when running unittests
+        if (this.getConnection() == null)
+        {
+            return null;
+        }
+
         if (this.meetingId == null)
         {
             try
@@ -1994,6 +2000,12 @@ private String getMeetingId()
      */
     private void updateFromRoomConfiguration()
     {
+        // in case when running unittests
+        if (this.getConnection() == null)
+        {
+            return;
+        }
+
         try
         {
             DiscoverInfo info = ServiceDiscoveryManager.getInstanceFor(getConnection()).