SAK-32119 Upgrade to ical4j 2.0 (sakaiproject#3791)

Mainly just dependency updates, only one change to the actual code of an import.
vishu77 · Jan 26, 2017 · 87cffa1 · 87cffa1
1 parent 44ef6a0
commit 87cffa1
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 27 deletions.
diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml
@@ -81,11 +81,6 @@
             <groupId>org.mnode.ical4j</groupId>
             <artifactId>ical4j</artifactId>
         </dependency>
-        <!-- ical4j is dependent on backport -->
-   		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-		</dependency>
         <dependency>
             <groupId>fop</groupId>
             <artifactId>fop</artifactId>

diff --git a/external-calendaring-service/impl/pom.xml b/external-calendaring-service/impl/pom.xml
@@ -66,11 +66,7 @@
       		<groupId>org.mnode.ical4j</groupId>
       		<artifactId>ical4j</artifactId>
     	</dependency>
-    	<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-		</dependency>
-
+
         <!--  test dependencies -->
     	<dependency>
     		<groupId>org.springframework</groupId>

diff --git a/...ervice/impl/src/java/org/sakaiproject/calendaring/api/ExternalCalendaringServiceImpl.java b/...ervice/impl/src/java/org/sakaiproject/calendaring/api/ExternalCalendaringServiceImpl.java
@@ -39,7 +39,6 @@
 import net.fortuna.ical4j.model.TimeZone;
 import net.fortuna.ical4j.model.TimeZoneRegistry;
 import net.fortuna.ical4j.model.TimeZoneRegistryFactory;
-import net.fortuna.ical4j.model.ValidationException;
 import net.fortuna.ical4j.model.component.VEvent;
 import net.fortuna.ical4j.model.component.VTimeZone;
 import net.fortuna.ical4j.model.parameter.Cn;
@@ -48,6 +47,7 @@
 import net.fortuna.ical4j.model.parameter.Rsvp;
 import net.fortuna.ical4j.model.property.*;
 
+import net.fortuna.ical4j.validate.ValidationException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.sakaiproject.calendar.api.CalendarEvent;

diff --git a/master/pom.xml b/master/pom.xml
@@ -716,10 +716,9 @@
       <dependency>
         <groupId>org.mnode.ical4j</groupId>
         <artifactId>ical4j</artifactId>
-        <version>1.0.7</version>
+        <version>2.0.0</version>
         <scope>provided</scope>
       </dependency>
-      <!-- ical4j is dependent on backport -->
       <dependency>
          <groupId>backport-util-concurrent</groupId>
          <artifactId>backport-util-concurrent</artifactId>

diff --git a/signup/api/pom.xml b/signup/api/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.mnode.ical4j</groupId>
             <artifactId>ical4j</artifactId>
         </dependency>
-        <dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-		</dependency>
     </dependencies>
 
     <build>

diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml
@@ -110,11 +110,6 @@
             <groupId>org.mnode.ical4j</groupId>
             <artifactId>ical4j</artifactId>
         </dependency>
-        <!-- ical4j is dependent on backport -->
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/signup/tool/pom.xml b/signup/tool/pom.xml
@@ -153,11 +153,6 @@
             <groupId>org.mnode.ical4j</groupId>
             <artifactId>ical4j</artifactId>
         </dependency>
-        <!-- ical4j is dependent on backport -->
-   		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-		</dependency>
         <!-- test dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>