Author: solomax
Date: Fri Nov 6 12:54:10 2015
New Revision: 1712955
URL: http://svn.apache.org/viewvc?rev=1712955&view=rev
Log:
[OPENMEETINGS-980] ical4j version is updated
Modified:
openmeetings/trunk/singlewebapp/LICENSE
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/LICENSE
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1712955&r1=1712954&r2=1712955&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Fri Nov 6 12:54:10 2015
@@ -641,15 +641,6 @@ Copyright (c) 2004-2008 QOS.ch
======================================================================================================================
- For backport-util-concurrent-jar-3.1.jar
-
- This software is released to the public domain, in the spirit of the original
code written by Doug Lea.
- The code can be used for any purpose, modified, and redistributed without
acknowledgment.
- No warranty is provided, either express or implied.
-
-
-
======================================================================================================================
-
For xmlpull-1.1.3.1.jar
For xpp3_min-1.1.4c.jar
@@ -1544,7 +1535,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
======================================================================================================================
iCal4j - License
-webapps/openmeetings/WEB-INF/lib/ical4j-jar-1.0.6.jar
+webapps/openmeetings/WEB-INF/lib/ical4j-2.0-beta1.jar
======================================================================================================================
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1712955&r1=1712954&r2=1712955&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Fri Nov 6 12:54:10 2015
@@ -48,7 +48,7 @@
<red5-client.version>1.0.6-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
- <ical4j.version>1.0.6</ical4j.version>
+ <ical4j.version>2.0-beta1</ical4j.version>
<cxf.version>3.1.3</cxf.version>
<selenium.version>2.48.2</selenium.version>
<simple-xml.version>2.7.1</simple-xml.version>
@@ -506,12 +506,6 @@
<groupId>org.mnode.ical4j</groupId>
<artifactId>ical4j</artifactId>
<version>${ical4j.version}</version>
- <exclusions>
- <exclusion>
-
<groupId>commons-logging</groupId>
-
<artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
