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 2021/12/23 15:50:35 UTC
[openmeetings] branch java11-modules updated (c824bb4 -> 7f6f9fd)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch java11-modules
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from c824bb4 Merge branch 'master' into java11-modules Some errors are fixed
add 7a94848 [OPENMEETINGS-2675] libraries, code clean-up
new 7f6f9fd Merge branch 'master' into java11-modules
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 6 +-
openmeetings-web/pom.xml | 6 ++
.../openmeetings/calendar/TestSendIcalMessage.java | 3 +-
.../openmeetings/webservice/TestFileService.java | 2 +-
pom.xml | 16 ++---
11 files changed, 74 insertions(+), 70 deletions(-)
copy openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.properties => openmeetings-util/src/main/resources/ical4j.properties (82%)
[openmeetings] 01/01: Merge branch 'master' into java11-modules
Posted by so...@apache.org.
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 <so...@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;