[openmeetings] 01/01: Merge branch 'master' into java11-modules

[solomax]

This is an automated email from the ASF dual-hosted git repository.

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

commit 7f6f9fdb5677bb2139123a15539964555ee879b5
Merge: c824bb4 7a94848
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Thu Dec 23 22:50:18 2021 +0700

    Merge branch 'master' into java11-modules

 openmeetings-install/pom.xml                       |  6 ++
 openmeetings-server/pom.xml                        |  2 +-
 .../calendar/caldav/AppointmentManager.java        |  7 --
 .../service/calendar/caldav/IcalUtils.java         |  8 +--
 openmeetings-util/pom.xml                          |  6 --
 .../apache/openmeetings/util/mail/IcalHandler.java | 82 +++++++++++++---------
 .../src/main/resources/ical4j.properties           | 21 ++++++
 openmeetings-web/pom.xml                           |  6 ++
 .../openmeetings/calendar/TestSendIcalMessage.java |  3 +-
 .../openmeetings/webservice/TestFileService.java   |  2 +-
 pom.xml                                            | 16 ++---
 11 files changed, 92 insertions(+), 67 deletions(-)

diff --cc 
openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
index d16c730,02d5f19..13ae412
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
@@@ -27,8 -27,7 +27,6 @@@ import java.util.Calendar
  import java.util.Date;
  import java.util.TimeZone;
  
- import javax.activation.DataHandler;
- 
 -import org.apache.openmeetings.AbstractOmServerTest;
  import org.apache.openmeetings.core.mail.MailHandler;
  import org.apache.openmeetings.util.mail.ByteArrayDataSource;
  import org.apache.openmeetings.util.mail.IcalHandler;
diff --cc 
openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
index d297299,dd94f41..818c837
--- 
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
+++ 
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
@@@ -20,11 -20,11 +20,11 @@@ package org.apache.openmeetings.webserv
  
  import static java.nio.charset.StandardCharsets.UTF_8;
  import static java.util.UUID.randomUUID;
 -import static 
org.apache.openmeetings.AbstractOmServerTest.UNIT_TEST_ARAB_EXT_TYPE;
 -import static org.apache.openmeetings.AbstractOmServerTest.createUser;
 -import static org.apache.openmeetings.AbstractOmServerTest.getUser;
 +import static 
org.apache.openmeetings.web.test.AbstractOmServerTest.UNIT_TEST_ARAB_EXT_TYPE;
 +import static 
org.apache.openmeetings.web.test.AbstractOmServerTest.createUser;
 +import static org.apache.openmeetings.web.test.AbstractOmServerTest.getUser;
- import static org.junit.jupiter.api.Assertions.assertFalse;
  import static org.junit.jupiter.api.Assertions.assertEquals;
+ import static org.junit.jupiter.api.Assertions.assertFalse;
  import static org.junit.jupiter.api.Assertions.assertNotNull;
  
  import java.awt.Graphics;