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/07/27 12:03:50 UTC
[openmeetings] branch jakarta-spring-6 updated: [OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are updated
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
The following commit(s) were added to refs/heads/jakarta-spring-6 by this push:
new b4f605225 [OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are updated
b4f605225 is described below
commit b4f60522528a8054a24fe9390573911feeb2316b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 27 19:03:39 2023 +0700
[OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are updated
---
.../java/org/apache/openmeetings/db/dao/user/UserDao.java | 1 -
.../apache/openmeetings/web/admin/backup/BackupPanel.java | 3 ---
.../web/admin/backup/BackupUploadResourceReference.java | 14 +++++++++-----
.../web/admin/connection/ConnectionsPanel.java | 6 ------
.../java/org/apache/openmeetings/web/common/MainPanel.java | 3 ---
.../web/common/upload/UploadResourceReference.java | 2 +-
.../org/apache/openmeetings/web/pages/auth/SignInPage.java | 3 ---
.../web/room/sidebar/RoomFileUploadResourceReference.java | 9 +++++++--
.../apache/openmeetings/web/room/sidebar/RoomSidebar.java | 3 ---
.../org/apache/openmeetings/web/user/MessageDialog.java | 3 ---
.../openmeetings/web/user/calendar/AppointmentDialog.java | 3 ---
.../openmeetings/web/user/calendar/CalendarDialog.java | 3 ---
.../openmeetings/web/user/calendar/CalendarPanel.java | 3 ---
.../web/user/record/RecordingResourceReference.java | 3 ---
.../org/apache/openmeetings/web/user/record/VideoInfo.java | 3 ---
pom.xml | 10 +++++-----
16 files changed, 22 insertions(+), 50 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index aff76369c..9b2a51cc8 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -46,7 +46,6 @@ import java.util.Set;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
-import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index f2d1bf158..634ec85ea 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -27,7 +27,6 @@ import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.openmeetings.backup.BackupExport;
-import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.admin.AdminBasePanel;
@@ -74,8 +73,6 @@ public class BackupPanel extends AdminBasePanel {
@Inject
private BackupExport backupExport;
- @Inject
- private BackupImport backupImport;
public BackupPanel(String id) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
index 1127a1b81..0c7f86973 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
@@ -21,15 +21,15 @@ package org.apache.openmeetings.web.admin.backup;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName;
import static org.apache.openmeetings.web.util.ThreadHelper.startRunnable;
+import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
import org.apache.openmeetings.backup.BackupImport;
-import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.upload.UploadResourceReference;
@@ -44,8 +44,6 @@ public class BackupUploadResourceReference extends UploadResourceReference {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(BackupUploadResourceReference.class);
- @Inject
- private FileItemDao fileDao;
@Inject
private BackupImport backupImport;
@@ -91,7 +89,13 @@ public class BackupUploadResourceReference extends UploadResourceReference {
log.error("Exception on panel backup download ", e);
sendError(c, uuid, e.getMessage() == null ? "Unexpected error" : e.getMessage());
} finally {
- fileItems.forEach(FileItem::delete);
+ fileItems.forEach(fi -> {
+ try {
+ fi.delete();
+ } catch (IOException e) {
+ log.error("IOException while deleting FileItem ", e);
+ }
+ });
timer.cancel();
}
sendProgress(c, uuid, lastProgress, 100);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index bcfce306c..6c313514c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -28,7 +28,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Stream;
-import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.web.admin.AdminBasePanel;
@@ -45,7 +44,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.ResourceModel;
-import org.apache.openmeetings.mediaserver.KurentoHandler;
import org.apache.openmeetings.mediaserver.StreamProcessor;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
@@ -59,11 +57,7 @@ public class ConnectionsPanel extends AdminBasePanel {
@Inject
private ClientManager cm;
@Inject
- private KurentoHandler kHandler;
- @Inject
private StreamProcessor streamProcessor;
- @Inject
- private IUserManager userManager;
public ConnectionsPanel(String id) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 26348915c..4e6d12daf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -35,7 +35,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
@@ -109,8 +108,6 @@ public class MainPanel extends Panel {
@Inject
private ClientManager cm;
@Inject
- private ConfigurationDao cfgDao;
- @Inject
private UserDao userDao;
@Inject
private RoomDao roomDao;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadResourceReference.java
index a669b6212..0d03e4a5a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/upload/UploadResourceReference.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import jakarta.inject.Inject;
import jakarta.ws.rs.core.MediaType;
-import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.web.app.Application;
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 28c5201f4..14644728e 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
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.isAllowRegister
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.user.User;
@@ -110,8 +109,6 @@ public class SignInPage extends BaseInitedPage {
RegisterDialog r = new RegisterDialog("register");
private final OtpDialog otpDialog = new OtpDialog("otpDialog", Model.of());
- @Inject
- private ConfigurationDao cfgDao;
@Inject
private UserManager userManager;
@Inject
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
index 5fb346aaf..a77192847 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomFileUploadResourceReference.java
@@ -21,12 +21,13 @@ package org.apache.openmeetings.web.room.sidebar;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
import static org.apache.openmeetings.web.util.ThreadHelper.startRunnable;
+import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.DoubleConsumer;
-import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
import org.apache.openmeetings.core.data.file.FileProcessor;
import org.apache.openmeetings.core.util.WebSocketHelper;
import org.apache.openmeetings.db.dao.file.FileItemDao;
@@ -149,7 +150,11 @@ public class RoomFileUploadResourceReference extends UploadResourceReference {
log.error("Unexpected error while processing uploaded file", e);
sendError(c, uuid, e.getMessage() == null ? "Unexpected error" : e.getMessage());
} finally {
- curItem.delete();
+ try {
+ curItem.delete();
+ } catch (IOException e) {
+ log.error("IOException while deleting FileItem ", e);
+ }
}
currentSize += size;
sendProgress(c, uuid, progress, (int)(100 * currentSize / totalSize));
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index f06571fc6..309188915 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -39,7 +39,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.util.string.Strings;
-import org.apache.openmeetings.mediaserver.StreamProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,8 +64,6 @@ public class RoomSidebar extends Panel {
@Inject
private ClientManager cm;
- @Inject
- private StreamProcessor streamProcessor;
public RoomSidebar(String id, final RoomPanel room) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 08b21c41e..750fc5a0f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -36,7 +36,6 @@ import java.util.Date;
import java.util.List;
import org.apache.openmeetings.core.mail.MailHandler;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
@@ -97,8 +96,6 @@ public class MessageDialog extends Modal<PrivateMessage> {
@Inject
private UserDao userDao;
@Inject
- private ConfigurationDao cfgDao;
- @Inject
private AppointmentDao apptDao;
@Inject
private PrivateMessageDao msgDao;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 1c6c2d66d..18c2bd33d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -33,7 +33,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
@@ -129,8 +128,6 @@ public class AppointmentDialog extends Modal<Appointment> {
private GroupUserDao groupUserDao;
@Inject
private AppointmentManager apptManager;
- @Inject
- private ConfigurationDao cfgDao;
public AppointmentDialog(String id, CalendarPanel calendarPanel, CompoundPropertyModel<Appointment> model) {
super(id, model);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index a8602bf25..db8500706 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.HttpClient;
import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
@@ -79,8 +78,6 @@ public class CalendarDialog extends Modal<OmCalendar> {
@Inject
private UserDao userDao;
@Inject
- private AppointmentDao apptDao;
- @Inject
private AppointmentManager apptManager;
public enum DIALOG_TYPE {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index 1b1cf9939..afcb41f71 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -34,7 +34,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.HttpClient;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -112,8 +111,6 @@ public class CalendarPanel extends UserBasePanel {
private AppointmentManager apptManager;
@Inject
private UserDao userDao;
- @Inject
- private ConfigurationDao cfgDao;
public CalendarPanel(String id) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
index 3a6440332..a518e6bc2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.file.BaseFileItem.Type;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -47,8 +46,6 @@ public abstract class RecordingResourceReference extends FileItemResourceReferen
private ClientManager cm;
@Inject
private GroupUserDao groupUserDao;
- @Inject
- private UserDao userDao;
protected RecordingResourceReference(String name) {
super(name);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
index 8a336859e..b8c8df344 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.user.record;
import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
-import org.apache.openmeetings.db.dao.record.RecordingChunkDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -43,8 +42,6 @@ public class VideoInfo extends Panel {
@Inject
private RoomDao roomDao;
- @Inject
- private RecordingChunkDao chunkDao;
public VideoInfo(String id) {
super(id);
diff --git a/pom.xml b/pom.xml
index ac12ac5e1..c1f3ac506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,8 @@
<!-- dependency versions -->
<junit.version>5.10.0</junit.version>
- <wicket.version>10.0.0-M1</wicket.version>
- <wicket-jquery-ui.version>9.12.0</wicket-jquery-ui.version>
+ <wicket.version>10.0.0-M2-SNAPSHOT</wicket.version>
+ <wicket-jquery-ui.version>10.0.0-M1</wicket-jquery-ui.version>
<wicketstuff.version>10.0.0-M1</wicketstuff.version>
<wicket-bootstrap.version>7.0.0</wicket-bootstrap.version>
<font-awesome.version>6.4.0</font-awesome.version>
@@ -123,20 +123,20 @@
<xstream.version>1.4.20</xstream.version>
<api-all.version>2.1.3</api-all.version>
<caldav4j.version>1.0.5</caldav4j.version>
- <jackrabbit-webdav.version>2.21.16-SNAPSHOT</jackrabbit-webdav.version>
+ <jackrabbit-webdav.version>2.21.19-SNAPSHOT</jackrabbit-webdav.version>
<tika-parsers.version>2.8.0</tika-parsers.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.4.8</logback.version>
<jetty.version>11.0.15</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
- <bcprov.version>1.73</bcprov.version>
+ <bcprov.version>1.75</bcprov.version>
<mockito.version>5.2.0</mockito.version>
<quartz.version>2.3.2</quartz.version>
<kurento.version>7.0.0</kurento.version>
<jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! -->
<jasny-bootstrap.version>3.1.3-2</jasny-bootstrap.version>
<jodconverter.version>4.4.6</jodconverter.version>
- <jaxb-runtime.version>4.0.2</jaxb-runtime.version>
+ <jaxb-runtime.version>4.0.3</jaxb-runtime.version>
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
<jquery-ui-touch-punch.version>0.2.3-2</jquery-ui-touch-punch.version>
<apacheds-test-framework.version>2.0.0.AM26</apacheds-test-framework.version>