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 2017/11/08 10:28:58 UTC
openmeetings git commit: [OPENMEETINGS-1738] ical4j version is
reverted to stable one
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 81efc3123 -> 7c545533f
[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/7c545533
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7c545533
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7c545533
Branch: refs/heads/4.0.x
Commit: 7c545533fb725096a3aabff5358a75ffb45ad54c
Parents: 81efc31
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Nov 8 17:28:48 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Nov 8 17:28:48 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/7c545533/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/7c545533/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d99c94f..89fd2b4 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>