From 3cc756bbc3aef38a79c8654894e6bd857510377a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 22 Jul 2011 18:41:28 +0200
Subject: [PATCH] Upgrade ZK version to 5.0.7

A dependency from timelinez must be excluded, otherwise it would
include a previous version of zcommon not compatible with the new ZK
version.

FEA: ItEr75S04BugFixing
---
 .../web/planner/company/CompanyPlanningModel.java  |  7 +++----
 pom.xml                                            | 14 ++++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index ce93f4405..b4cf846e2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -21,6 +21,7 @@
 
 package org.navalplanner.web.planner.company;
 
+import static java.util.Arrays.asList;
 import static org.navalplanner.web.I18nHelper._;
 
 import java.io.IOException;
@@ -374,10 +375,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
                     e.printStackTrace();
                 }
                 Clients.response("aa",
-                        new AuInsertAfter(
-                                chartComponent.getTabpanels().getFirstChild(),
-                                out.toString()
-                                ));
+                        new AuInsertAfter(chartComponent.getTabpanels()
+                                .getFirstChild(), asList(out.toString())));
                 return null;
             }
         });
diff --git a/pom.xml b/pom.xml
index 445b7c967..9e4edd8d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,17 +433,17 @@
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zul</artifactId>
-                <version>5.0.5</version>
+                <version>5.0.7</version>
             </dependency>
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zkplus</artifactId>
-                <version>5.0.5</version>
+                <version>5.0.7</version>
             </dependency>
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zk</artifactId>
-                <version>5.0.5</version>
+                <version>5.0.7</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.jruby</groupId>
@@ -454,7 +454,7 @@
             <dependency>
                 <groupId>org.zkoss.zk</groupId>
                 <artifactId>zkex</artifactId>
-                <version>5.0.5</version>
+                <version>5.0.7</version>
             </dependency>
             <!-- JGraphT -->
             <dependency>
@@ -577,6 +577,12 @@
                 <groupId>org.zkoss.zkforge</groupId>
                 <artifactId>timelinez</artifactId>
                 <version>2.3.1_50</version>
+                <exclusions>
+                <exclusion>
+                    <groupId>org.zkoss.common</groupId>
+                    <artifactId>zcommon</artifactId>
+                </exclusion>
+            </exclusions>
             </dependency>
             <dependency>
                 <groupId>net.sf.ehcache</groupId>