diff --git a/pom.xml b/pom.xml
index 9ad75d6..07f5d01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,13 +46,13 @@
     <dependency>
       <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
-      <version>1.0.17</version>
+      <version>1.5.1</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.hdrhistogram/HdrHistogram -->
     <dependency>
       <groupId>org.hdrhistogram</groupId>
       <artifactId>HdrHistogram</artifactId>
-      <version>2.1.11</version>
+      <version>2.1.12</version>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.xerial/sqlite-jdbc -->
     <dependency>
@@ -71,8 +71,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>21</source>
+          <target>21</target>
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
diff --git a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/AboutDialog.java b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/AboutDialog.java
index f3b15a0..6053206 100644
--- a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/AboutDialog.java
+++ b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/AboutDialog.java
@@ -15,7 +15,6 @@
 import javax.swing.JFrame;
 import javax.swing.JScrollPane;
 
-
 public class AboutDialog extends JDialog {
 
     private static String _azulCopyrightString = "Copyright 2016, Azul Systems, Inc. All Rights Reserved.";
diff --git a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/Application.java b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/Application.java
index 73989c0..1858fb1 100644
--- a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/Application.java
+++ b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/applicationlayer/Application.java
@@ -35,7 +35,7 @@
 import org.HdrHistogram.HistogramLogAnalyzer.datalayer.HistogramModel;
 import org.HdrHistogram.HistogramLogAnalyzer.properties.*;
 import org.jfree.chart.ChartPanel;
-import org.jfree.chart.ChartUtilities;
+import org.jfree.chart.ChartUtils;
 import org.jfree.chart.plot.XYPlot;
 
 public class Application implements ActionListener {
@@ -202,8 +202,8 @@ private void get_snapshot(String snapfile) {
             f3[k] = new File(((Long) System.currentTimeMillis()).toString()
                     + ((Integer) k).toString());
             try {
-                ChartUtilities.saveChartAsPNG(f1, cp1.getChart(), snapshot_w, snapshot_h);
-                ChartUtilities.saveChartAsPNG(f2, cp2.getChart(), snapshot_w, snapshot_h);
+                ChartUtils.saveChartAsPNG(f1, cp1.getChart(), snapshot_w, snapshot_h);
+                ChartUtils.saveChartAsPNG(f2, cp2.getChart(), snapshot_w, snapshot_h);
                 // load source images
                 BufferedImage img1 = ImageIO.read(getaborder(brdr_thickness, f1));
                 BufferedImage img2 = ImageIO.read(getaborder(brdr_thickness, f2));
diff --git a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/BucketsChartBuilder.java b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/BucketsChartBuilder.java
index 9656c23..0cbecca 100644
--- a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/BucketsChartBuilder.java
+++ b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/BucketsChartBuilder.java
@@ -187,7 +187,7 @@ private JFreeChart createBucketsDrawable(List<HistogramModel> histogramModels, A
             }
         }
 
-        renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
+        renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());
 
         plot.setDomainGridlinesVisible(false);
         plot.setDomainPannable(true);
diff --git a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/PercentileChartBuilder.java b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/PercentileChartBuilder.java
index c4c16e5..ae1f967 100644
--- a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/PercentileChartBuilder.java
+++ b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/PercentileChartBuilder.java
@@ -284,7 +284,7 @@ public StringBuffer format(double number, StringBuffer toAppendTo,
         }
 
         plot.setDomainGridlinesVisible(false);
-        renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
+        renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());
 
         plot.setDomainPannable(true);
         plot.setRangePannable(true);
diff --git a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/TimelineChartBuilder.java b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/TimelineChartBuilder.java
index 317ddd8..2265933 100644
--- a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/TimelineChartBuilder.java
+++ b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/charts/TimelineChartBuilder.java
@@ -23,9 +23,9 @@
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.chart.title.LegendTitle;
 
+import org.jfree.chart.ui.RectangleEdge;
 import org.jfree.data.Range;
 import org.jfree.data.xy.*;
-import org.jfree.ui.RectangleEdge;
 
 import javax.swing.*;
 import java.awt.*;
@@ -306,7 +306,7 @@ public void axisChanged(AxisChangeEvent axisChangeEvent) {
         LegendTitle legend = drawable.getLegend();
         legend.setPosition(RectangleEdge.TOP);
         plot.setDomainGridlinesVisible(false);
-        renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator());
+        renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator());
         plot.setDomainPannable(true);
         plot.setRangePannable(true);
         plot.setRenderer(renderer);
diff --git a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/properties/DateProperties.java b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/properties/DateProperties.java
index bc73472..036755b 100644
--- a/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/properties/DateProperties.java
+++ b/src/main/java/org/HdrHistogram/HistogramLogAnalyzer/properties/DateProperties.java
@@ -9,7 +9,6 @@
 import org.HdrHistogram.HistogramLogAnalyzer.datalayer.HistogramModel;
 import org.jfree.data.Range;
 import org.jfree.data.time.DateRange;
-import sun.util.calendar.ZoneInfo;
 
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
@@ -122,7 +121,7 @@ public TimeZone getTimeZone(List<HistogramModel> models) {
             return timezone;
         }
 
-        return ZoneInfo.getDefault();
+        return TimeZone.getDefault();
     }
 
     public static String getShortTimezoneString(TimeZone timeZone, Date date) {