[openmeetings] 15/27: javax.annotation -> jakarta.annotation
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 2785317acbd87fe4874549e26238f285d549cd88 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 95ab8775b..5c3f80689 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -69,6 +69,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 a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/T
[openmeetings] 15/27: javax.annotation -> jakarta.annotation
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 0d91994991e2bbbd42f06fe9408af35696974d36 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 95ab8775b..5c3f80689 100644 --- a/openmeetings-core/pom.xml +++ b/openmeetings-core/pom.xml @@ -69,6 +69,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 a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/T
