Repository: openmeetings Updated Branches: refs/heads/master 8c04ed41b -> 0b87f42cf
[OPENMEETINGS-1738] ical4j version is reverted to stable one Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0b87f42c Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0b87f42c Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0b87f42c Branch: refs/heads/master Commit: 0b87f42cf38e386a4dcf442e08a6a73b48d91085 Parents: 8c04ed4 Author: Maxim Solodovnik <[email protected]> Authored: Wed Nov 8 17:28:48 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Nov 8 17:29:09 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/util/mail/IcalHandler.java | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b87f42c/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java index 7b1216b..2564e7f 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java @@ -64,6 +64,7 @@ public class IcalHandler { private static final Logger log = Red5LoggerFactory.getLogger(IcalHandler.class, getWebAppRootKey()); static { System.setProperty("net.fortuna.ical4j.timezone.update.enabled", "false"); + System.setProperty("net.fortuna.ical4j.timezone.cache.impl", "net.fortuna.ical4j.util.MapTimeZoneCache"); } /** ICal instance */ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b87f42c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 449db7e..82408b5 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ <spring.version>4.3.12.RELEASE</spring.version> <mina.version>2.0.16</mina.version> <tomcat.version>9.0.1</tomcat.version> - <ical4j.version>2.1.3</ical4j.version> + <ical4j.version>2.1.1</ical4j.version> <cxf.version>3.2.1</cxf.version> <selenium.version>3.7.1</selenium.version> <simple-xml.version>2.7.1</simple-xml.version>
