From: Jim Procter <j.procter@dundee.ac.uk>
Date: Mon, 8 Aug 2022 17:01:19 +0000 (+0100)
Subject: Merge branch 'task/JAL-3991_check_actual_JAVA_VERSION_against_build_properties_in_app... 
X-Git-Tag: Release_2_11_2_6~28
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=53fe06e7ae7a8c00ec902413391cea15362bdbf2;p=jalview.git

Merge branch 'task/JAL-3991_check_actual_JAVA_VERSION_against_build_properties_in_application_startup' into develop
---

53fe06e7ae7a8c00ec902413391cea15362bdbf2
diff --cc src/jalview/bin/Jalview.java
index fd1783a,9574e7e..d1056bf
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -45,7 -44,7 +45,8 @@@ import java.util.logging.ConsoleHandler
  import java.util.logging.Level;
  import java.util.logging.Logger;
  
+ import javax.swing.JOptionPane;
 +import javax.swing.SwingUtilities;
  import javax.swing.UIManager;
  import javax.swing.UIManager.LookAndFeelInfo;