Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application
authorJim Procter <j.procter@dundee.ac.uk>
Thu, 17 Feb 2022 17:04:14 +0000 (17:04 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Thu, 17 Feb 2022 17:04:14 +0000 (17:04 +0000)
1  2 
gradle.properties

diff --combined gradle.properties
@@@ -114,12 -114,12 +114,12 @@@ flexmark_css = utils/doc/github.cs
  channel_properties_dir = utils/channels
  channel_props = channel.props
  
 -install4j_home_dir = ~/buildtools/install4j8
 +install4j_home_dir = ~/buildtools/install4j9
  install4j_copyright_message = ...
  install4j_bundle_id = org.jalview.jalview-desktop
  install4j_utils_dir = utils/install4j
  install4j_images_dir = utils/install4j
 -install4j_template = install4j8_template.install4j
 +install4j_template = install4j9_template.install4j
  install4j_info_plist_file_associations = file_associations_auto-Info_plist.xml
  install4j_installer_file_associations = file_associations_auto-install4j8.xml
  #install4j_DMG_uninstaller_app_files = uninstall_old_jalview_files.xml
@@@ -223,7 -223,7 +223,7 @@@ j2s.excluded.paths = test;testng;uti
  #j2s.compiler.nonqualified.classes = null
  #j2s.compiler.mode = debug
  #a semicolon-separated list of package (foo.) or class (foo.bar) replacements to be made 
- j2s.class.replacements = org.apache.log4j.->jalview.javascript.log4j.
+ #j2s.class.replacements = org.apache.logging.log4j.->jalview.javascript.log4j.
  j2s.template.html = utils/jalviewjs/template.html
  j2s_coretemplate_html = utils/jalviewjs/coretemplate.html
  #output file name for logging methods declared - delete the file to regenerate a listing