RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade ZK version to 5.0.7

Browse source 
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
This commit is contained in:
Óscar González Fernández 2011-07-22 18:41:28 +02:00
parent 3e44be3899
commit 3cc756bbc3
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -21,6 +21,7 @@
package org.navalplanner.web.planner.company; package org.navalplanner.web.planner.company;
import static java.util.Arrays.asList;
import static org.navalplanner.web.I18nHelper._; import static org.navalplanner.web.I18nHelper._;
import java.io.IOException; import java.io.IOException;
@ -374,10 +375,8 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
e.printStackTrace(); e.printStackTrace();
} }
Clients.response("aa", Clients.response("aa",
new AuInsertAfter( new AuInsertAfter(chartComponent.getTabpanels()
chartComponent.getTabpanels().getFirstChild(), .getFirstChild(), asList(out.toString())));
out.toString()
));
return null; return null;
} }
}); });

14
pom.xml
View file

@ -433,17 +433,17 @@
<dependency> <dependency>
<groupId>org.zkoss.zk</groupId> <groupId>org.zkoss.zk</groupId>
<artifactId>zul</artifactId> <artifactId>zul</artifactId>
<version>5.0.5</version> <version>5.0.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.zkoss.zk</groupId> <groupId>org.zkoss.zk</groupId>
<artifactId>zkplus</artifactId> <artifactId>zkplus</artifactId>
<version>5.0.5</version> <version>5.0.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.zkoss.zk</groupId> <groupId>org.zkoss.zk</groupId>
<artifactId>zk</artifactId> <artifactId>zk</artifactId>
<version>5.0.5</version> <version>5.0.7</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.jruby</groupId> <groupId>org.jruby</groupId>
@ -454,7 +454,7 @@
<dependency> <dependency>
<groupId>org.zkoss.zk</groupId> <groupId>org.zkoss.zk</groupId>
<artifactId>zkex</artifactId> <artifactId>zkex</artifactId>
<version>5.0.5</version> <version>5.0.7</version>
</dependency> </dependency>
<!-- JGraphT --> <!-- JGraphT -->
<dependency> <dependency>
@ -577,6 +577,12 @@
<groupId>org.zkoss.zkforge</groupId> <groupId>org.zkoss.zkforge</groupId>
<artifactId>timelinez</artifactId> <artifactId>timelinez</artifactId>
<version>2.3.1_50</version> <version>2.3.1_50</version>
<exclusions>
<exclusion>
<groupId>org.zkoss.common</groupId>
<artifactId>zcommon</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>