[openmeetings] 03/06: javax.annotation -> jakarta.annotation

2023-07-27 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 16753b354aa0b212f1e2d9f0c858e8c2ec8aa1f6
Author: Maxim Solodovnik 
AuthorDate: Fri Jan 13 23:08:00 2023 +0700

javax.annotation -> jakarta.annotation
---
 openmeetings-core/pom.xml   | 4 
 .../src/main/java/org/apache/openmeetings/core/sip/SipManager.java  | 4 ++--
 .../java/org/apache/openmeetings/mediaserver/KurentoHandler.java| 4 ++--
 .../openmeetings/service/calendar/caldav/AppointmentManager.java| 2 +-
 .../java/org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +-
 .../java/org/apache/openmeetings/service/notifier/TextNotifier.java | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/OtpManager.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/TimerService.java | 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 1 +
 .../src/main/webapp/WEB-INF/classes/applicationContext.xml  | 2 +-
 .../java/org/apache/openmeetings/webservice/NetTestWebService.java  | 2 +-
 pom.xml | 6 ++
 12 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index aa8d5ffc4..e9139f91f 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -70,6 +70,10 @@



+   
+   jakarta.annotation
+   jakarta.annotation-api
+   

org.apache.openmeetings
openmeetings-db
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 68358aa16..ef1a61d27 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -25,8 +25,8 @@ import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
diff --git 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
index 33fd09c0f..957d33abe 100644
--- 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
+++ 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
@@ -36,8 +36,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index c425eb90f..f90eb26b9 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 131e786f5..9649e2042 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -22,7 +22,7 @@ import static 
org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
 
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.openmeetings.core.notifier.INotifier;
 import org.apache.openmeetings.core.notifier.NotifierService;
diff --git 

[openmeetings] 03/06: javax.annotation -> jakarta.annotation

2023-07-27 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 7dd9fa0454b10df42b54d1a1350043de209629ca
Author: Maxim Solodovnik 
AuthorDate: Fri Jan 13 23:08:00 2023 +0700

javax.annotation -> jakarta.annotation
---
 openmeetings-core/pom.xml   | 4 
 .../src/main/java/org/apache/openmeetings/core/sip/SipManager.java  | 4 ++--
 .../java/org/apache/openmeetings/mediaserver/KurentoHandler.java| 4 ++--
 .../openmeetings/service/calendar/caldav/AppointmentManager.java| 2 +-
 .../java/org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +-
 .../java/org/apache/openmeetings/service/notifier/TextNotifier.java | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/OtpManager.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/TimerService.java | 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 1 +
 .../src/main/webapp/WEB-INF/classes/applicationContext.xml  | 2 +-
 .../java/org/apache/openmeetings/webservice/NetTestWebService.java  | 2 +-
 pom.xml | 6 ++
 12 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index de9f504c8..d7ef03f1c 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -70,6 +70,10 @@



+   
+   jakarta.annotation
+   jakarta.annotation-api
+   

org.apache.openmeetings
openmeetings-db
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 68358aa16..ef1a61d27 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -25,8 +25,8 @@ import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
diff --git 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
index 33fd09c0f..957d33abe 100644
--- 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
+++ 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
@@ -36,8 +36,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index c425eb90f..f90eb26b9 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 131e786f5..9649e2042 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -22,7 +22,7 @@ import static 
org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
 
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.openmeetings.core.notifier.INotifier;
 import org.apache.openmeetings.core.notifier.NotifierService;
diff --git 

[openmeetings] 03/06: javax.annotation -> jakarta.annotation

2023-06-07 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 2931bcfb57806254992f6560390a752daffe6cd8
Author: Maxim Solodovnik 
AuthorDate: Fri Jan 13 23:08:00 2023 +0700

javax.annotation -> jakarta.annotation
---
 openmeetings-core/pom.xml   | 4 
 .../src/main/java/org/apache/openmeetings/core/sip/SipManager.java  | 4 ++--
 .../java/org/apache/openmeetings/mediaserver/KurentoHandler.java| 4 ++--
 .../openmeetings/service/calendar/caldav/AppointmentManager.java| 2 +-
 .../java/org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +-
 .../java/org/apache/openmeetings/service/notifier/TextNotifier.java | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/OtpManager.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/TimerService.java | 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 1 +
 .../src/main/webapp/WEB-INF/classes/applicationContext.xml  | 2 +-
 .../java/org/apache/openmeetings/webservice/NetTestWebService.java  | 2 +-
 pom.xml | 6 ++
 12 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index aa8d5ffc4..e9139f91f 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -70,6 +70,10 @@



+   
+   jakarta.annotation
+   jakarta.annotation-api
+   

org.apache.openmeetings
openmeetings-db
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 68358aa16..ef1a61d27 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -25,8 +25,8 @@ import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
diff --git 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
index 33fd09c0f..957d33abe 100644
--- 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
+++ 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
@@ -36,8 +36,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index c425eb90f..f90eb26b9 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 131e786f5..9649e2042 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -22,7 +22,7 @@ import static 
org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
 
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.openmeetings.core.notifier.INotifier;
 import org.apache.openmeetings.core.notifier.NotifierService;
diff --git 

[openmeetings] 03/06: javax.annotation -> jakarta.annotation

2023-01-29 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit dccb0fc8650ded5009091b79fbae22e9a7c407a8
Author: Maxim Solodovnik 
AuthorDate: Fri Jan 13 23:08:00 2023 +0700

javax.annotation -> jakarta.annotation
---
 openmeetings-core/pom.xml   | 4 
 .../src/main/java/org/apache/openmeetings/core/sip/SipManager.java  | 4 ++--
 .../java/org/apache/openmeetings/mediaserver/KurentoHandler.java| 4 ++--
 .../openmeetings/service/calendar/caldav/AppointmentManager.java| 2 +-
 .../java/org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +-
 .../java/org/apache/openmeetings/service/notifier/TextNotifier.java | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/OtpManager.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/TimerService.java | 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 1 +
 .../src/main/webapp/WEB-INF/classes/applicationContext.xml  | 2 +-
 .../java/org/apache/openmeetings/webservice/NetTestWebService.java  | 2 +-
 pom.xml | 6 ++
 12 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 0d4590ed9..93f31deeb 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -49,6 +49,10 @@



+   
+   jakarta.annotation
+   jakarta.annotation-api
+   

org.apache.openmeetings
openmeetings-db
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 68358aa16..ef1a61d27 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -25,8 +25,8 @@ import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
diff --git 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
index 33fd09c0f..957d33abe 100644
--- 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
+++ 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
@@ -36,8 +36,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index c425eb90f..f90eb26b9 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 131e786f5..9649e2042 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -22,7 +22,7 @@ import static 
org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
 
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.openmeetings.core.notifier.INotifier;
 import org.apache.openmeetings.core.notifier.NotifierService;
diff --git 

[openmeetings] 03/06: javax.annotation -> jakarta.annotation

2023-01-17 Thread solomax
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit dccb0fc8650ded5009091b79fbae22e9a7c407a8
Author: Maxim Solodovnik 
AuthorDate: Fri Jan 13 23:08:00 2023 +0700

javax.annotation -> jakarta.annotation
---
 openmeetings-core/pom.xml   | 4 
 .../src/main/java/org/apache/openmeetings/core/sip/SipManager.java  | 4 ++--
 .../java/org/apache/openmeetings/mediaserver/KurentoHandler.java| 4 ++--
 .../openmeetings/service/calendar/caldav/AppointmentManager.java| 2 +-
 .../java/org/apache/openmeetings/service/notifier/MailNotifier.java | 2 +-
 .../java/org/apache/openmeetings/service/notifier/TextNotifier.java | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/OtpManager.java   | 2 +-
 .../src/main/java/org/apache/openmeetings/web/app/TimerService.java | 2 +-
 .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 1 +
 .../src/main/webapp/WEB-INF/classes/applicationContext.xml  | 2 +-
 .../java/org/apache/openmeetings/webservice/NetTestWebService.java  | 2 +-
 pom.xml | 6 ++
 12 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 0d4590ed9..93f31deeb 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -49,6 +49,10 @@



+   
+   jakarta.annotation
+   jakarta.annotation-api
+   

org.apache.openmeetings
openmeetings-db
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 68358aa16..ef1a61d27 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -25,8 +25,8 @@ import java.util.BitSet;
 import java.util.Optional;
 import java.util.function.Function;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.user.User;
diff --git 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
index 33fd09c0f..957d33abe 100644
--- 
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
+++ 
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
@@ -36,8 +36,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
index c425eb90f..f90eb26b9 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java
@@ -27,7 +27,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.auth.AuthScope;
diff --git 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
index 131e786f5..9649e2042 100644
--- 
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
+++ 
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/MailNotifier.java
@@ -22,7 +22,7 @@ import static 
org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
 
 import java.util.TimeZone;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.apache.openmeetings.core.notifier.INotifier;
 import org.apache.openmeetings.core.notifier.NotifierService;
diff --git