diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml
index 267fce233..9a35a120b 100644
--- a/jsprit-analysis/pom.xml
+++ b/jsprit-analysis/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.jfree</groupId>
             <artifactId>jfreechart</artifactId>
-            <version>1.0.19</version>
+            <version>1.5.6</version>
         </dependency>
 
         <dependency>
diff --git a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java
index 47ee3550d..1b0f0cb3e 100644
--- a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java
+++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/Plotter.java
@@ -31,12 +31,12 @@
 import org.jfree.chart.renderer.xy.XYItemRenderer;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.chart.title.LegendTitle;
+import org.jfree.chart.ui.RectangleEdge;
+import org.jfree.chart.util.ShapeUtils;
 import org.jfree.data.Range;
 import org.jfree.data.xy.XYDataItem;
 import org.jfree.data.xy.XYSeries;
 import org.jfree.data.xy.XYSeriesCollection;
-import org.jfree.ui.RectangleEdge;
-import org.jfree.util.ShapeUtilities;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -90,7 +90,7 @@ private static class MyActivityRenderer extends XYLineAndShapeRenderer {
         public Shape getItemShape(int seriesIndex, int itemIndex) {
             XYDataItem dataItem = seriesCollection.getSeries(seriesIndex).getDataItem(itemIndex);
             if (firstActivities.contains(dataItem)) {
-                return ShapeUtilities.createUpTriangle(4.0f);
+                return ShapeUtils.createUpTriangle(4.0f);
             }
             return ELLIPSE;
         }
@@ -331,7 +331,7 @@ public LegendItemCollection getLegendItems() {
                 }
                 if (routes != null) {
                     LegendItem item = new LegendItem("firstActivity", Color.BLACK);
-                    Shape upTriangle = ShapeUtilities.createUpTriangle(3.0f);
+                    Shape upTriangle = ShapeUtils.createUpTriangle(3.0f);
                     item.setShape(upTriangle);
                     item.setOutlinePaint(Color.BLACK);
 
@@ -377,12 +377,12 @@ private XYItemRenderer getShipmentRenderer(XYSeriesCollection shipments) {
 
     private MyActivityRenderer getProblemRenderer(final XYSeriesCollection problem) {
         MyActivityRenderer problemRenderer = new MyActivityRenderer(problem, activitiesByDataItem, firstActivities);
-        problemRenderer.setBaseItemLabelGenerator((arg0, arg1, arg2) -> {
+        problemRenderer.setDefaultItemLabelGenerator((arg0, arg1, arg2) -> {
             XYDataItem item = problem.getSeries(arg1).getDataItem(arg2);
             return labelsByDataItem.get(item);
         });
-        problemRenderer.setBaseItemLabelsVisible(true);
-        problemRenderer.setBaseItemLabelPaint(Color.BLACK);
+        problemRenderer.setDefaultItemLabelsVisible(true);
+        problemRenderer.setDefaultItemLabelPaint(Color.BLACK);
 
         return problemRenderer;
     }
@@ -446,7 +446,7 @@ private XYItemRenderer getRouteRenderer(XYSeriesCollection solutionColl) {
 
     private void save(JFreeChart chart, String pngFile) {
         try {
-            ChartUtilities.saveChartAsPNG(new File(pngFile), chart, 1000, 600);
+            ChartUtils.saveChartAsPNG(new File(pngFile), chart, 1000, 600);
         } catch (IOException e) {
             log.error("cannot plot");
             log.error(e.toString());
diff --git a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java
index 8e456e7a1..441c3a5d7 100644
--- a/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java
+++ b/jsprit-analysis/src/main/java/com/graphhopper/jsprit/analysis/toolbox/XYLineChartBuilder.java
@@ -18,7 +18,7 @@
 package com.graphhopper.jsprit.analysis.toolbox;
 
 import org.jfree.chart.ChartFactory;
-import org.jfree.chart.ChartUtilities;
+import org.jfree.chart.ChartUtils;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.PlotOrientation;
 import org.jfree.chart.plot.XYPlot;
@@ -43,7 +43,7 @@ public class XYLineChartBuilder {
      */
     public static void saveChartAsPNG(JFreeChart chart, String pngFilename) {
         try {
-            ChartUtilities.saveChartAsPNG(new File(pngFilename), chart, 1000, 600);
+            ChartUtils.saveChartAsPNG(new File(pngFilename), chart, 1000, 600);
         } catch (IOException e) {
             e.printStackTrace();
         }