You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2023/04/11 08:26:02 UTC
[openmeetings] 03/05: 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 7dd9fa0454b10df42b54d1a1350043de209629ca
Author: Maxim Solodovnik <so...@gmail.com>
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 @@
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.openmeetings</groupId>
<artifactId>openmeetings-db</artifactId>
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/TextNotifier.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java
index 0dded20c0..9eea5728e 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/notifier/TextNotifier.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.service.notifier;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REMINDER_MESSAGE;
-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-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
index 0c6abfe50..c8f1d07c2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OtpManager.java
@@ -24,7 +24,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationN
import java.net.UnknownHostException;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
index 6b460fe3f..7e6f9bfca 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/TimerService.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import org.apache.openmeetings.core.sip.SipManager;
import org.apache.openmeetings.core.util.WebSocketHelper;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index a960c99d3..28c5201f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -109,6 +109,7 @@ public class SignInPage extends BaseInitedPage {
};
RegisterDialog r = new RegisterDialog("register");
private final OtpDialog otpDialog = new OtpDialog("otpDialog", Model.of());
+
@Inject
private ConfigurationDao cfgDao;
@Inject
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
index 1c50a99e0..a069c52cd 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/applicationContext.xml
@@ -39,10 +39,10 @@
<bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
<tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true" />
- <context:annotation-config />
<!-- Start annotation Prometheus metrics
<aop:aspectj-autoproxy/>
End annotation -->
+ <context:annotation-config />
<context:component-scan base-package="org.apache.openmeetings" />
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 1db37f87c..f7a4cfb0f 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -34,7 +34,7 @@ import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import org.apache.openmeetings.webservice.util.RateLimited;
import org.slf4j.Logger;
diff --git a/pom.xml b/pom.xml
index 750d5f593..e3e7c05ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
<openjpa.version>3.2.2</openjpa.version>
<jakarta.persistence.version>3.1.0</jakarta.persistence.version>
<jakarta.transaction.version>2.0.1</jakarta.transaction.version>
+ <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<asterisk-java.version>3.37.0</asterisk-java.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-dbcp.version>2.9.0</commons-dbcp.version>
@@ -845,6 +846,11 @@
<artifactId>jakarta.transaction-api</artifactId>
<version>${jakarta.transaction.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>