Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dgray16 2016-04-27 15:32:51 +03:00
commit 4134315421
3 changed files with 9 additions and 9 deletions

View file

@ -158,11 +158,11 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>jfree</groupId>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
<groupId>jfree</groupId>
<groupId>org.jfree</groupId>
<artifactId>jcommon</artifactId>
</dependency>
<dependency>

View file

@ -364,11 +364,11 @@
<artifactId>bsh</artifactId>
</dependency>
<dependency>
<groupId>jfree</groupId>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
<dependency>
<groupId>jfree</groupId>
<groupId>org.jfree</groupId>
<artifactId>jcommon</artifactId>
</dependency>

10
pom.xml
View file

@ -467,21 +467,21 @@
<!-- Jfreechart -->
<dependency>
<groupId>jfree</groupId>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.0.13</version>
<version>1.0.19</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
<groupId>org.jfree</groupId>
<artifactId>jcommon</artifactId>
<version>1.0.16</version>
<version>1.0.23</version>
</dependency>
<!-- Joda Time -->
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.3</version>
<version>2.9.3</version>
</dependency>
<!-- LibrePlan ZK Components -->