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 22ed168956ba4d2d0cf2c7c21f3649b3d30f1f66
Author: Maxim Solodovnik <solomax...@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 -
.../web/admin/backup/BackupUploadResourceReference.java | 11 +++++++++--
.../openmeetings/web/admin/connection/ConnectionsPanel.java | 5 -----
.../java/org/apache/openmeetings/web/common/MainPanel.java | 2 --
.../web/common/upload/UploadResourceReference.java | 2 +-
.../org/apache/openmeetings/web/pages/auth/SignInPage.java | 2 --
.../web/room/sidebar/RoomFileUploadResourceReference.java | 9 +++++++--
.../java/org/apache/openmeetings/web/user/MessageDialog.java | 2 --
pom.xml | 6 +++---
9 files changed, 20 insertions(+), 20 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/BackupUploadResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
index 12a579554..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,13 +21,14 @@ 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.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
@@ -88,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 a48306326..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
@@ -44,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;
@@ -58,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 f7b0a06ee..7e1e88fab 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
@@ -109,8 +109,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 90d958acf..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
@@ -109,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/user/MessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 11a70d2db..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
@@ -96,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/pom.xml b/pom.xml
index 727fee7d5..92bff63b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,8 +83,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>
<spring.version>6.0.11</spring.version>
@@ -134,7 +134,7 @@
<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>
