diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index be693673f39e..ec6a560d315c 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -1,40 +1,40 @@
 # Created by: Roy Boerner
 
 PORTNAME=	squirrel-sql
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.0
 CATEGORIES=	databases java
 MASTER_SITES=	SF/${PORTNAME}/1-stable/${PORTVERSION}-plainzip
 DISTNAME=	squirrelsql-${PORTVERSION}-optional
 
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	Universal SQL Client
 
 LICENSE=	GPLv2
 
 USES=		zip
 
 USE_JAVA=	8+
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 SUB_FILES=	squirrel-sql
 
 DATADIR=	${PREFIX}/share/java/${PKGBASE}
 
 DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"${COMMENT}" \
 		"${DATADIR}/icons/acorn.png" \
 		"squirrel-sql" \
 		"Development;Database;Java;" \
 		false
 
 post-extract:
 	cd "${WRKSRC}" && ${RM} -r *.bat *.sh icons/acorn.png.bak.png mac squirrelcli
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd "${WRKSRC}" && ${FIND} . | ${CPIO} -pdum -R root:wheel ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/squirrel-sql ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index b20764bc0945..30afcc6b963e 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588731476
-SHA256 (squirrelsql-4.1.0-optional.zip) = 0a2ded7cfcae19f9d803bc3bedef3b4cf3a61ca998ed1928b0d7a895eada43f8
-SIZE (squirrelsql-4.1.0-optional.zip) = 68464876
+TIMESTAMP = 1622511901
+SHA256 (squirrelsql-4.2.0-optional.zip) = 664ee4f2cf40b3a6e12ee57cbfa1361a156ee8539862b04fa85ad39c873f1105
+SIZE (squirrelsql-4.2.0-optional.zip) = 59859070
diff --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index 4726bf1b0393..e5c5af262f93 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -1,576 +1,556 @@
 bin/squirrel-sql
 %%DATADIR%%/doc/changes.txt
 %%DATADIR%%/doc/images/add_alias_1.png
 %%DATADIR%%/doc/images/add_exc.gif
 %%DATADIR%%/doc/images/alias_properties.png
 %%DATADIR%%/doc/images/alias_properties_button.png
 %%DATADIR%%/doc/images/alias_properties_dialog.png
 %%DATADIR%%/doc/images/alias_properties_dialog2.png
 %%DATADIR%%/doc/images/alias_properties_dialog3.png
 %%DATADIR%%/doc/images/alias_properties_dialog4.png
 %%DATADIR%%/doc/images/alias_properties_dialog5.png
 %%DATADIR%%/doc/images/alias_window_no_tree.png
 %%DATADIR%%/doc/images/alias_window_with_tree.png
 %%DATADIR%%/doc/images/aliases_tool_window_1.png
 %%DATADIR%%/doc/images/chg_driver_1.png
 %%DATADIR%%/doc/images/chg_driver_2.png
 %%DATADIR%%/doc/images/color-properties.png
 %%DATADIR%%/doc/images/connect_window.png
 %%DATADIR%%/doc/images/createresultwindow.gif
 %%DATADIR%%/doc/images/discovery.gif
 %%DATADIR%%/doc/images/drivers_tool_window_1.png
 %%DATADIR%%/doc/images/error_st_obj.gif
 %%DATADIR%%/doc/images/fonts_menus_demo.png
 %%DATADIR%%/doc/images/fonts_other_demo.png
 %%DATADIR%%/doc/images/fonts_static_text_demo.png
 %%DATADIR%%/doc/images/fonts_status_bar_demo.png
 %%DATADIR%%/doc/images/global_bookmarks.png
 %%DATADIR%%/doc/images/global_data_types_part1.png
 %%DATADIR%%/doc/images/global_data_types_part2.png
 %%DATADIR%%/doc/images/global_fonts.png
 %%DATADIR%%/doc/images/global_general.png
 %%DATADIR%%/doc/images/global_laf.png
 %%DATADIR%%/doc/images/global_proxy.png
 %%DATADIR%%/doc/images/global_sql.png
 %%DATADIR%%/doc/images/global_sqlscripts.png
 %%DATADIR%%/doc/images/history_arrow.png
 %%DATADIR%%/doc/images/history_dialog_icon.png
 %%DATADIR%%/doc/images/last_log_entry_dialog.png
 %%DATADIR%%/doc/images/log_messages_status.png
 %%DATADIR%%/doc/images/logo.jpg
 %%DATADIR%%/doc/images/logo_1.jpg
 %%DATADIR%%/doc/images/mdi_session_layout.png
 %%DATADIR%%/doc/images/ok_st_obj.gif
 %%DATADIR%%/doc/images/plugins_1.png
 %%DATADIR%%/doc/images/scrollable_tabs.png
 %%DATADIR%%/doc/images/session_1.png
 %%DATADIR%%/doc/images/session_2.png
 %%DATADIR%%/doc/images/session_background_color_example.png
 %%DATADIR%%/doc/images/session_props_general.png
 %%DATADIR%%/doc/images/session_props_objecttree.png
 %%DATADIR%%/doc/images/session_props_sql.png
 %%DATADIR%%/doc/images/sql_1.png
 %%DATADIR%%/doc/images/sql_2.png
 %%DATADIR%%/doc/images/sql_history_dialog.png
 %%DATADIR%%/doc/images/sql_history_list.png
 %%DATADIR%%/doc/images/stacked_tabs.png
 %%DATADIR%%/doc/images/tabbed_session_layout.png
 %%DATADIR%%/doc/images/toolspopup.jpg
 %%DATADIR%%/doc/images/update-dialog.png
 %%DATADIR%%/doc/images/update-settings.png
 %%DATADIR%%/doc/images/update_download_progress.png
 %%DATADIR%%/doc/images/update_summary.png
 %%DATADIR%%/doc/images/updates-menu.png
+%%DATADIR%%/doc/licences/Eclipse Distribution License - Version 1.0.txt
 %%DATADIR%%/doc/licences/dean_jones_icons_licence.txt
 %%DATADIR%%/doc/licences/eclipse-icons-licence.html
 %%DATADIR%%/doc/licences/eclipse-icons-licence.txt
 %%DATADIR%%/doc/licences/log4j-licence.txt
 %%DATADIR%%/doc/licences/nano_xml_licence.txt
 %%DATADIR%%/doc/licences/squirrel_licence.txt
 %%DATADIR%%/doc/licences/sun_icons_licence.txt
 %%DATADIR%%/doc/news.txt
 %%DATADIR%%/doc/plugins.html
 %%DATADIR%%/doc/quick_start.html
 %%DATADIR%%/doc/readme.html
 %%DATADIR%%/doc/readme.txt
 %%DATADIR%%/doc/style.css
 %%DATADIR%%/doc/welcome.html
 %%DATADIR%%/icons/acorn.icns
 %%DATADIR%%/icons/acorn.ico
 %%DATADIR%%/icons/acorn.png
 %%DATADIR%%/icons/acorn.xpm
 %%DATADIR%%/icons/splash.jpg
 %%DATADIR%%/lib/RText.jar
 %%DATADIR%%/lib/antlr.jar
 %%DATADIR%%/lib/asm-attrs.jar
 %%DATADIR%%/lib/asm.jar
-%%DATADIR%%/lib/autocomplete.jar
+%%DATADIR%%/lib/autocomplete-3.1.0.jar
 %%DATADIR%%/lib/axis-jaxrpc.jar
 %%DATADIR%%/lib/axis-saaj.jar
 %%DATADIR%%/lib/axis-wsdl4j.jar
 %%DATADIR%%/lib/axis.jar
 %%DATADIR%%/lib/cglib.jar
 %%DATADIR%%/lib/common.jar
 %%DATADIR%%/lib/commons-cli-1.4.jar
 %%DATADIR%%/lib/commons-codec-1.13.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-discovery.jar
 %%DATADIR%%/lib/commons-httpclient.jar
 %%DATADIR%%/lib/commons-lang.jar
 %%DATADIR%%/lib/commons-logging.jar
-%%DATADIR%%/lib/core.jar
-%%DATADIR%%/lib/dom4j.jar
+%%DATADIR%%/lib/dom4j-2.1.3.jar
 %%DATADIR%%/lib/forms.jar
 %%DATADIR%%/lib/hibernate-annotations.jar
 %%DATADIR%%/lib/hibernate-commons-annotations.jar
 %%DATADIR%%/lib/hibernate-entitymanager.jar
 %%DATADIR%%/lib/hibernate.jar
-%%DATADIR%%/lib/icu4j.jar
 %%DATADIR%%/lib/jackson-annotations-2.6.3.jar
 %%DATADIR%%/lib/jackson-core-2.6.3.jar
 %%DATADIR%%/lib/jackson-databind-2.6.3.jar
 %%DATADIR%%/lib/java-diff-utils-4.5.jar
 %%DATADIR%%/lib/javahelp.jar
 %%DATADIR%%/lib/javax.activation.jar
 %%DATADIR%%/lib/jfreechart-1.5.0.jar
 %%DATADIR%%/lib/jgit5.6.0.201912101111-r-with-dependencies.jar
 %%DATADIR%%/lib/jide-oss.jar
-%%DATADIR%%/lib/jmeld.jar
-%%DATADIR%%/lib/jsqlparser-2.2-SNAPSHOT.jar
+%%DATADIR%%/lib/jmeld-3.4.0-jar-with-some-dependencies.jar
+%%DATADIR%%/lib/jsqlparser-3.3-SNAPSHOT.jar
 %%DATADIR%%/lib/log4j.jar
 %%DATADIR%%/lib/markdowngeneratorJava1_6.jar
 %%DATADIR%%/lib/nanoxml.jar
 %%DATADIR%%/lib/org.eclipse.equinox.common.jar
-%%DATADIR%%/lib/osgi.jar
 %%DATADIR%%/lib/poi-ooxml-schemas.jar
 %%DATADIR%%/lib/poi-ooxml.jar
 %%DATADIR%%/lib/poi.jar
-%%DATADIR%%/lib/rstaui-3.0.0.jar
-%%DATADIR%%/lib/rsyntaxtextarea-3.0.3.jar
+%%DATADIR%%/lib/rstaui-3.1.0.jar
+%%DATADIR%%/lib/rsyntaxtextarea-3.1.1.jar
 %%DATADIR%%/lib/sound_jlayer-1.0.1.4.jar
 %%DATADIR%%/lib/sound_jorbis-0.0.17.4.jar
 %%DATADIR%%/lib/sound_mp3spi-1.9.5.4.jar
 %%DATADIR%%/lib/sound_tritonus-all-0.3.7.2.jar
 %%DATADIR%%/lib/sound_vorbisspi-1.0.3-1.jar
-%%DATADIR%%/lib/spring-beans.jar
-%%DATADIR%%/lib/spring-context-support.jar
-%%DATADIR%%/lib/spring-context.jar
-%%DATADIR%%/lib/spring-core.jar
+%%DATADIR%%/lib/sql-formatter-1.0.3.jar
 %%DATADIR%%/lib/stringtemplate.jar
-%%DATADIR%%/lib/swing-worker.jar
 %%DATADIR%%/lib/text-table-formatter-1.2.4.jar
 %%DATADIR%%/lib/treetable.jar
 %%DATADIR%%/lib/versioncheck.jar
-%%DATADIR%%/lib/x86.jar
 %%DATADIR%%/lib/xml-apis.jar
 %%DATADIR%%/lib/xmlbeans.jar
 %%DATADIR%%/log4j.properties
 %%DATADIR%%/plugins/codecompletion.jar
 %%DATADIR%%/plugins/codecompletion/doc/changes.txt
 %%DATADIR%%/plugins/codecompletion/doc/completionpopup.jpg
 %%DATADIR%%/plugins/codecompletion/doc/graph.jpg
 %%DATADIR%%/plugins/codecompletion/doc/licence.txt
 %%DATADIR%%/plugins/codecompletion/doc/readme.html
 %%DATADIR%%/plugins/codecompletion/doc/readme.txt
 %%DATADIR%%/plugins/dataimport.jar
 %%DATADIR%%/plugins/dataimport/doc/TODO.txt
 %%DATADIR%%/plugins/dataimport/doc/changes.txt
 %%DATADIR%%/plugins/dataimport/doc/licence.txt
 %%DATADIR%%/plugins/dataimport/doc/readme.html
 %%DATADIR%%/plugins/db2.jar
 %%DATADIR%%/plugins/db2/doc/changes.txt
 %%DATADIR%%/plugins/db2/doc/images/index_details.jpg
 %%DATADIR%%/plugins/db2/doc/images/mqt_source.jpg
 %%DATADIR%%/plugins/db2/doc/images/procedure_source.jpg
 %%DATADIR%%/plugins/db2/doc/images/sequence_details.jpg
 %%DATADIR%%/plugins/db2/doc/images/trigger_details.jpg
 %%DATADIR%%/plugins/db2/doc/images/trigger_source.jpg
 %%DATADIR%%/plugins/db2/doc/images/udf_details.jpg
 %%DATADIR%%/plugins/db2/doc/images/udf_source.jpg
 %%DATADIR%%/plugins/db2/doc/images/view_source.jpg
 %%DATADIR%%/plugins/db2/doc/licence.txt
 %%DATADIR%%/plugins/db2/doc/readme.html
 %%DATADIR%%/plugins/dbcopy.jar
 %%DATADIR%%/plugins/dbcopy/doc/Compatibility_with_1.2beta6.txt
 %%DATADIR%%/plugins/dbcopy/doc/RemainingTimeCalculator.txt
 %%DATADIR%%/plugins/dbcopy/doc/TODO.txt
 %%DATADIR%%/plugins/dbcopy/doc/changes.txt
 %%DATADIR%%/plugins/dbcopy/doc/command-line.html
 %%DATADIR%%/plugins/dbcopy/doc/copy_small.JPG
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/axion.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/daffodil.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/db2.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/derby.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/firebird.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/frontbase.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/h2.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/hsql.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/maxdb.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/mckoi.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/mysql.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/oracle.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/pointbase.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/postgresql.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/sun_odbc-jdbc-bridge.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/sybase_ase.html
 %%DATADIR%%/plugins/dbcopy/doc/database_jdbc_properties/timesten.html
 %%DATADIR%%/plugins/dbcopy/doc/database_view_definitions/defs.txt
 %%DATADIR%%/plugins/dbcopy/doc/faq.html
 %%DATADIR%%/plugins/dbcopy/doc/install.html
 %%DATADIR%%/plugins/dbcopy/doc/install.txt
 %%DATADIR%%/plugins/dbcopy/doc/license.txt
 %%DATADIR%%/plugins/dbcopy/doc/paste_small.JPG
 %%DATADIR%%/plugins/dbcopy/doc/preferences.html
 %%DATADIR%%/plugins/dbcopy/doc/prefs_bottom.JPG
 %%DATADIR%%/plugins/dbcopy/doc/prefs_top.JPG
 %%DATADIR%%/plugins/dbcopy/doc/progress_small.JPG
 %%DATADIR%%/plugins/dbcopy/doc/readme.html
 %%DATADIR%%/plugins/dbcopy/doc/success_dialog.JPG
 %%DATADIR%%/plugins/dbcopy/doc/usage.html
 %%DATADIR%%/plugins/dbcopy/www/changelog.html
 %%DATADIR%%/plugins/dbcopy/www/dbcopydatatypemapping.html
 %%DATADIR%%/plugins/dbcopy/www/docs/index.html
 %%DATADIR%%/plugins/dbcopy/www/docs/preferences.html
 %%DATADIR%%/plugins/dbcopy/www/docs/readme.html
 %%DATADIR%%/plugins/dbcopy/www/faq.html
 %%DATADIR%%/plugins/dbcopy/www/footer.html
 %%DATADIR%%/plugins/dbcopy/www/header.html
 %%DATADIR%%/plugins/dbcopy/www/home.html
 %%DATADIR%%/plugins/dbcopy/www/images/confirm_delete_records.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/copy_cancelled.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/copy_success.JPG
 %%DATADIR%%/plugins/dbcopy/www/images/copy_table_menu_item.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/dbcopy_preferences.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/dbcopy_preferences1.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/dbcopy_preferences2.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/global_preferences.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/paste_table_menu_item.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/progress_dialog.jpg
 %%DATADIR%%/plugins/dbcopy/www/images/progress_dialog2.jpg
 %%DATADIR%%/plugins/dbcopy/www/index.html
 %%DATADIR%%/plugins/dbcopy/www/index.php
 %%DATADIR%%/plugins/dbcopy/www/left.html
 %%DATADIR%%/plugins/dbcopy/www/meta.html
 %%DATADIR%%/plugins/dbcopy/www/phpinfo.php
 %%DATADIR%%/plugins/dbcopy/www/screenshots.html
 %%DATADIR%%/plugins/dbcopy/www/style.css
 %%DATADIR%%/plugins/dbdiff.jar
 %%DATADIR%%/plugins/dbdiff/doc/changes.txt
 %%DATADIR%%/plugins/dbdiff/doc/images/compare_menu.png
 %%DATADIR%%/plugins/dbdiff/doc/images/differences_dialog.png
 %%DATADIR%%/plugins/dbdiff/doc/images/select_menu.png
 %%DATADIR%%/plugins/dbdiff/doc/licence.txt
 %%DATADIR%%/plugins/dbdiff/doc/readme.html
 %%DATADIR%%/plugins/derby.jar
 %%DATADIR%%/plugins/derby/doc/changes.txt
 %%DATADIR%%/plugins/derby/doc/images/trigger_details.jpg
 %%DATADIR%%/plugins/derby/doc/images/trigger_source.jpg
 %%DATADIR%%/plugins/derby/doc/images/view_source.jpg
 %%DATADIR%%/plugins/derby/doc/licence.txt
 %%DATADIR%%/plugins/derby/doc/readme.html
 %%DATADIR%%/plugins/example.jar
 %%DATADIR%%/plugins/example/doc/changes.txt
 %%DATADIR%%/plugins/example/doc/licence.txt
 %%DATADIR%%/plugins/example/doc/readme.txt
 %%DATADIR%%/plugins/exportconfig.jar
 %%DATADIR%%/plugins/exportconfig/doc/changes.txt
 %%DATADIR%%/plugins/exportconfig/doc/licence.txt
 %%DATADIR%%/plugins/exportconfig/doc/readme.html
 %%DATADIR%%/plugins/favs.jar
 %%DATADIR%%/plugins/favs/doc/changes.txt
 %%DATADIR%%/plugins/favs/doc/licence.txt
 %%DATADIR%%/plugins/favs/doc/readme.txt
 %%DATADIR%%/plugins/firebird.jar
 %%DATADIR%%/plugins/firebird/doc/changes.txt
 %%DATADIR%%/plugins/firebird/doc/licence.txt
 %%DATADIR%%/plugins/firebird/doc/readme.html
 %%DATADIR%%/plugins/graph.jar
 %%DATADIR%%/plugins/graph/doc/best.sql
 %%DATADIR%%/plugins/graph/doc/best_mysql-5.1-linux.sql
 %%DATADIR%%/plugins/graph/doc/changes.txt
 %%DATADIR%%/plugins/graph/doc/graph.png
 %%DATADIR%%/plugins/graph/doc/licence.txt
 %%DATADIR%%/plugins/graph/doc/readme.html
 %%DATADIR%%/plugins/graph/doc/readme.txt
 %%DATADIR%%/plugins/graph/doc/zoomprint.png
 %%DATADIR%%/plugins/greenplum.jar
 %%DATADIR%%/plugins/greenplum/doc/changes.txt
 %%DATADIR%%/plugins/greenplum/doc/licence.txt
 %%DATADIR%%/plugins/h2.jar
 %%DATADIR%%/plugins/h2/doc/changes.txt
 %%DATADIR%%/plugins/h2/doc/images/index_details.jpg
 %%DATADIR%%/plugins/h2/doc/images/index_source.jpg
 %%DATADIR%%/plugins/h2/doc/images/procedure_source.jpg
 %%DATADIR%%/plugins/h2/doc/images/sequence_details.jpg
 %%DATADIR%%/plugins/h2/doc/images/trigger_details.jpg
 %%DATADIR%%/plugins/h2/doc/images/view_source.jpg
 %%DATADIR%%/plugins/h2/doc/licence.txt
 %%DATADIR%%/plugins/h2/doc/readme.html
 %%DATADIR%%/plugins/hibernate.jar
 %%DATADIR%%/plugins/hibernate/doc/changes.txt
 %%DATADIR%%/plugins/hibernate/doc/factory.jpg
 %%DATADIR%%/plugins/hibernate/doc/hibernate.jpg
 %%DATADIR%%/plugins/hibernate/doc/licence.txt
 %%DATADIR%%/plugins/hibernate/doc/readme.html
 %%DATADIR%%/plugins/hibernate/doc/session.png
 %%DATADIR%%/plugins/i18n.jar
 %%DATADIR%%/plugins/i18n/doc/changes.txt
 %%DATADIR%%/plugins/i18n/doc/licence.txt
 %%DATADIR%%/plugins/i18n/doc/readme.txt
 %%DATADIR%%/plugins/informix.jar
 %%DATADIR%%/plugins/informix/doc/changes.txt
 %%DATADIR%%/plugins/informix/doc/images/index_details.jpg
 %%DATADIR%%/plugins/informix/doc/images/procedure_source.jpg
 %%DATADIR%%/plugins/informix/doc/images/sequence_details.jpg
 %%DATADIR%%/plugins/informix/doc/images/trigger_details.jpg
 %%DATADIR%%/plugins/informix/doc/images/trigger_source.jpg
 %%DATADIR%%/plugins/informix/doc/images/view_source.jpg
 %%DATADIR%%/plugins/informix/doc/licence.txt
 %%DATADIR%%/plugins/informix/doc/readme.html
 %%DATADIR%%/plugins/laf.jar
-%%DATADIR%%/plugins/laf/changes.txt
 %%DATADIR%%/plugins/laf/doc/changes.txt
+%%DATADIR%%/plugins/laf/doc/flatlaf-licence.txt
 %%DATADIR%%/plugins/laf/doc/infonode-licence.txt
 %%DATADIR%%/plugins/laf/doc/jgoodies-looks-licence.txt
 %%DATADIR%%/plugins/laf/doc/kunststoff_Licence.txt
 %%DATADIR%%/plugins/laf/doc/laf-plugin-licence.txt
 %%DATADIR%%/plugins/laf/doc/licences.html
 %%DATADIR%%/plugins/laf/doc/napkin-licence.html
 %%DATADIR%%/plugins/laf/doc/nimrod-licence.txt
 %%DATADIR%%/plugins/laf/doc/readme.html
 %%DATADIR%%/plugins/laf/doc/readme.txt
 %%DATADIR%%/plugins/laf/doc/skin_look_and_feel_licence.txt
 %%DATADIR%%/plugins/laf/doc/tinylaf-license.txt
 %%DATADIR%%/plugins/laf/doc/tonic-licence.txt
-%%DATADIR%%/plugins/laf/infonode-licence.txt
-%%DATADIR%%/plugins/laf/jgoodies-looks-licence.txt
-%%DATADIR%%/plugins/laf/kunststoff_Licence.txt
-%%DATADIR%%/plugins/laf/laf-plugin-licence.txt
-%%DATADIR%%/plugins/laf/laf-sources.jar
 %%DATADIR%%/plugins/laf/lafs/JTattoo-1.6.10.jar
+%%DATADIR%%/plugins/laf/lafs/flatlaf-1.0.jar
 %%DATADIR%%/plugins/laf/lafs/ilf-gpl.jar
-%%DATADIR%%/plugins/laf/lafs/kunstoff-laf.jar
-%%DATADIR%%/plugins/laf/lafs/looks.jar
+%%DATADIR%%/plugins/laf/lafs/jgoodies-common-1.8.1.jar
+%%DATADIR%%/plugins/laf/lafs/jgoodies-looks-2.5.3.jar
+%%DATADIR%%/plugins/laf/lafs/kunststoff.jar
 %%DATADIR%%/plugins/laf/lafs/napkinlaf-1.3-SNAPSHOT.jar
 %%DATADIR%%/plugins/laf/lafs/nimrod-laf.jar
 %%DATADIR%%/plugins/laf/lafs/readme.txt
 %%DATADIR%%/plugins/laf/lafs/skinlf.jar
 %%DATADIR%%/plugins/laf/lafs/substance.jar
 %%DATADIR%%/plugins/laf/lafs/swingsetthemes.jar
 %%DATADIR%%/plugins/laf/lafs/tinylaf.jar
 %%DATADIR%%/plugins/laf/lafs/toniclf.jar
-%%DATADIR%%/plugins/laf/licences.html
-%%DATADIR%%/plugins/laf/napkin-licence.html
-%%DATADIR%%/plugins/laf/nimrod-licence.txt
-%%DATADIR%%/plugins/laf/readme.html
-%%DATADIR%%/plugins/laf/readme.txt
-%%DATADIR%%/plugins/laf/skin_look_and_feel_licence.txt
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/BeOSthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/aquathemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/cellshadedthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/fatalEthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/macosthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/modernthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/quickSilverRthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/skinlf-readme.txt
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/tigerGraphitethemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/toxicthemepack.zip
 %%DATADIR%%/plugins/laf/skinlf-theme-packs/whistlerthemepack.zip
-%%DATADIR%%/plugins/laf/tinylaf-license.txt
-%%DATADIR%%/plugins/laf/tonic-licence.txt
 %%DATADIR%%/plugins/mssql.jar
 %%DATADIR%%/plugins/mssql/doc/changes.txt
 %%DATADIR%%/plugins/mssql/doc/licence.txt
 %%DATADIR%%/plugins/mssql/doc/readme.html
 %%DATADIR%%/plugins/multisource.jar
 %%DATADIR%%/plugins/multisource/doc/changes.txt
 %%DATADIR%%/plugins/multisource/doc/img/add_alias_prompt.png
 %%DATADIR%%/plugins/multisource/doc/img/add_mongo.png
 %%DATADIR%%/plugins/multisource/doc/img/add_mongo_driver.png
 %%DATADIR%%/plugins/multisource/doc/img/add_mssql.png
 %%DATADIR%%/plugins/multisource/doc/img/add_mssql_to_virtualization.png
 %%DATADIR%%/plugins/multisource/doc/img/add_multisource_plugin_install.png
 %%DATADIR%%/plugins/multisource/doc/img/add_mysql.png
 %%DATADIR%%/plugins/multisource/doc/img/add_oracle.png
 %%DATADIR%%/plugins/multisource/doc/img/add_oracle_virtualization.png
 %%DATADIR%%/plugins/multisource/doc/img/add_oracle_with_schema.png
 %%DATADIR%%/plugins/multisource/doc/img/add_postgres.png
 %%DATADIR%%/plugins/multisource/doc/img/after_add_mssql.png
 %%DATADIR%%/plugins/multisource/doc/img/after_all_sources_added.png
 %%DATADIR%%/plugins/multisource/doc/img/before_add_mssql.png
 %%DATADIR%%/plugins/multisource/doc/img/connect_virtual_source.png
 %%DATADIR%%/plugins/multisource/doc/img/create_unity.png
 %%DATADIR%%/plugins/multisource/doc/img/create_virtual_source.png
 %%DATADIR%%/plugins/multisource/doc/img/encryption_example.png
 %%DATADIR%%/plugins/multisource/doc/img/example_five_source_query.png
 %%DATADIR%%/plugins/multisource/doc/img/example_four_sources.png
 %%DATADIR%%/plugins/multisource/doc/img/export_source_example.png
 %%DATADIR%%/plugins/multisource/doc/img/file_locations.png
 %%DATADIR%%/plugins/multisource/doc/img/install_after_unzip.png
 %%DATADIR%%/plugins/multisource/doc/img/install_before_unzip.png
 %%DATADIR%%/plugins/multisource/doc/img/install_squirrel_lib.png
 %%DATADIR%%/plugins/multisource/doc/img/install_unityjdbc_jar.png
 %%DATADIR%%/plugins/multisource/doc/img/multisource_plugin_list.png
 %%DATADIR%%/plugins/multisource/doc/img/register_driver.png
 %%DATADIR%%/plugins/multisource/doc/img/remove_source.png
 %%DATADIR%%/plugins/multisource/doc/img/remove_table.png
 %%DATADIR%%/plugins/multisource/doc/img/trim_example.png
 %%DATADIR%%/plugins/multisource/doc/img/trim_translation_example.png
 %%DATADIR%%/plugins/multisource/doc/img/two_source_join.png
 %%DATADIR%%/plugins/multisource/doc/licence.txt
 %%DATADIR%%/plugins/multisource/doc/multisource-style.css
 %%DATADIR%%/plugins/multisource/doc/readme.html
 %%DATADIR%%/plugins/multisource/doc/readme.txt
 %%DATADIR%%/plugins/multisource/doc/unityjdbc.jar
 %%DATADIR%%/plugins/mysql.jar
 %%DATADIR%%/plugins/mysql/doc/changes.txt
 %%DATADIR%%/plugins/mysql/doc/images/create-table.png
 %%DATADIR%%/plugins/mysql/doc/images/open-tables.png
 %%DATADIR%%/plugins/mysql/doc/images/processes.png
 %%DATADIR%%/plugins/mysql/doc/images/status.png
 %%DATADIR%%/plugins/mysql/doc/licence.txt
 %%DATADIR%%/plugins/mysql/doc/readme.html
 %%DATADIR%%/plugins/netezza.jar
 %%DATADIR%%/plugins/netezza/doc/changes.txt
 %%DATADIR%%/plugins/netezza/doc/images/objtree.png
 %%DATADIR%%/plugins/netezza/doc/images/procsrc.png
 %%DATADIR%%/plugins/netezza/doc/images/seqinfo.png
 %%DATADIR%%/plugins/netezza/doc/images/syndet.png
 %%DATADIR%%/plugins/netezza/doc/images/synsrc.png
 %%DATADIR%%/plugins/netezza/doc/images/viewsrc.png
 %%DATADIR%%/plugins/netezza/doc/licence.txt
 %%DATADIR%%/plugins/netezza/doc/readme.html
 %%DATADIR%%/plugins/oracle.jar
 %%DATADIR%%/plugins/oracle/doc/changes.txt
 %%DATADIR%%/plugins/oracle/doc/licence.txt
 %%DATADIR%%/plugins/oracle/doc/readme.html
 %%DATADIR%%/plugins/postgres.jar
 %%DATADIR%%/plugins/postgres/doc/changes.txt
 %%DATADIR%%/plugins/postgres/doc/images/explain/explain_executor_tab.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/index_details.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/index_source.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/procedure_source.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/sequence_details.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/trigger_details.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/trigger_source.jpg
 %%DATADIR%%/plugins/postgres/doc/images/new_tabs/view_source.jpg
 %%DATADIR%%/plugins/postgres/doc/images/vacuum/database_dialog.jpg
 %%DATADIR%%/plugins/postgres/doc/images/vacuum/database_menu.jpg
 %%DATADIR%%/plugins/postgres/doc/images/vacuum/table_dialog.jpg
 %%DATADIR%%/plugins/postgres/doc/images/vacuum/table_menu.jpg
 %%DATADIR%%/plugins/postgres/doc/licence.txt
 %%DATADIR%%/plugins/postgres/doc/readme.html
-%%DATADIR%%/plugins/postgres/doc/style.css
 %%DATADIR%%/plugins/postgres/lib/postgis-jdbc-2.3.0.jar
 %%DATADIR%%/plugins/postgres/lib/postgresql-42.2.9.jar
 %%DATADIR%%/plugins/readme.txt
 %%DATADIR%%/plugins/refactoring.jar
 %%DATADIR%%/plugins/refactoring/doc/TODO.txt
 %%DATADIR%%/plugins/refactoring/doc/changes.txt
 %%DATADIR%%/plugins/refactoring/doc/images/add_autoinc/add_autoinc_sql.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_autoinc/select_column.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_column/1_add_column_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_column/2_add_column_dialog.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_column/3_add_column_show_sql.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_fk/action_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_fk/columns_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_fk/props_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_lookup/lookup_tab_keep.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_lookup/lookup_tab_replace.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_lookup/source_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_lookup/special_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_pk/1_add_pk_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_pk/2_choose_pk_dialog_unslected.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_pk/3_choose_pk_dialog_slected.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_pk/4_add_pk_sql.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_pk/5_add_pk_after_execute.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_unique/columns_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_unique/props_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_view/def_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/add_view/props_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/checkmark.gif
 %%DATADIR%%/plugins/refactoring/doc/images/dialog/buttons.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/dialog/disabled_options.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/dialog/edit_sql.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/dialog/show_sql.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/drop_pk/1_drop_pk_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/drop_pk/2_drop_pk_dialog.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/menu/table_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/menu/table_node_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/menu/view_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/merge_columns/props_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/merge_tables/columns_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/merge_tables/props_tab.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/modify_column/1_modify_column_menu.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/modify_column/2_modify_column_dialog.jpg
 %%DATADIR%%/plugins/refactoring/doc/images/modify_column/3_modify_column_dialog.jpg
 %%DATADIR%%/plugins/refactoring/doc/licence.txt
 %%DATADIR%%/plugins/refactoring/doc/readme.html
-%%DATADIR%%/plugins/refactoring/doc/style.css
 %%DATADIR%%/plugins/sessionscript.jar
 %%DATADIR%%/plugins/sessionscript/doc/changes.txt
 %%DATADIR%%/plugins/sessionscript/doc/licence.txt
 %%DATADIR%%/plugins/sessionscript/doc/readme.txt
 %%DATADIR%%/plugins/smarttools.jar
 %%DATADIR%%/plugins/smarttools/doc/badNullValues.html
 %%DATADIR%%/plugins/smarttools/doc/changeValues.html
 %%DATADIR%%/plugins/smarttools/doc/changes.txt
 %%DATADIR%%/plugins/smarttools/doc/createIndex.html
 %%DATADIR%%/plugins/smarttools/doc/images/Author.jpg
 %%DATADIR%%/plugins/smarttools/doc/images/BadNullValues.jpg
 %%DATADIR%%/plugins/smarttools/doc/images/ChangeValues1.jpg
 %%DATADIR%%/plugins/smarttools/doc/images/ChangeValues2.jpg
 %%DATADIR%%/plugins/smarttools/doc/images/CreateIndex.jpg
 %%DATADIR%%/plugins/smarttools/doc/images/MissingIndices.jpg
 %%DATADIR%%/plugins/smarttools/doc/images/Sessionmenue.jpg
 %%DATADIR%%/plugins/smarttools/doc/licence.txt
 %%DATADIR%%/plugins/smarttools/doc/missingIndices.html
 %%DATADIR%%/plugins/smarttools/doc/readme.html
 %%DATADIR%%/plugins/sqlbookmark.jar
 %%DATADIR%%/plugins/sqlbookmark/doc/bookmarkspopup.jpg
 %%DATADIR%%/plugins/sqlbookmark/doc/changes.txt
 %%DATADIR%%/plugins/sqlbookmark/doc/licence.txt
 %%DATADIR%%/plugins/sqlbookmark/doc/prefs.jpg
 %%DATADIR%%/plugins/sqlbookmark/doc/readme.html
 %%DATADIR%%/plugins/sqlbookmark/doc/toolspopup.jpg
 %%DATADIR%%/plugins/sqlparam.jar
 %%DATADIR%%/plugins/sqlparam/doc/changes.txt
 %%DATADIR%%/plugins/sqlparam/doc/licence.txt
 %%DATADIR%%/plugins/sqlparam/doc/readme.html
 %%DATADIR%%/plugins/sqlparam/doc/readme.txt
 %%DATADIR%%/plugins/sqlreplace.jar
 %%DATADIR%%/plugins/sqlreplace/doc/changes.txt
 %%DATADIR%%/plugins/sqlreplace/doc/licence.txt
 %%DATADIR%%/plugins/sqlreplace/doc/readme.html
 %%DATADIR%%/plugins/sqlreplace/doc/readme.txt
 %%DATADIR%%/plugins/sqlscript.jar
 %%DATADIR%%/plugins/sqlscript/doc/changes.txt
 %%DATADIR%%/plugins/sqlscript/doc/creattable.jpg
 %%DATADIR%%/plugins/sqlscript/doc/licence.txt
 %%DATADIR%%/plugins/sqlscript/doc/readme.html
 %%DATADIR%%/plugins/sqlscript/doc/readme.txt
 %%DATADIR%%/plugins/sqlscript/doc/sql2file.jpg
 %%DATADIR%%/plugins/sqlscript/doc/sql2file_exportController.jpg
 %%DATADIR%%/plugins/sqlscript/doc/sql2file_progress.jpg
 %%DATADIR%%/plugins/sqlscript/doc/toolspopup.jpg
 %%DATADIR%%/plugins/sqlval.jar
 %%DATADIR%%/plugins/sqlval/doc/changes.txt
 %%DATADIR%%/plugins/sqlval/doc/licence.txt
 %%DATADIR%%/plugins/sqlval/doc/readme.html
 %%DATADIR%%/plugins/sqlval/doc/wsdl.xml
 %%DATADIR%%/plugins/swingViolations.jar
 %%DATADIR%%/plugins/swingViolations/doc/changes.txt
 %%DATADIR%%/plugins/swingViolations/doc/licence.txt
 %%DATADIR%%/plugins/swingViolations/doc/readme.txt
 %%DATADIR%%/plugins/sybase.jar
 %%DATADIR%%/plugins/sybase/doc/changes.txt
 %%DATADIR%%/plugins/sybase/doc/licence.txt
 %%DATADIR%%/plugins/sybase/doc/readme.txt
 %%DATADIR%%/plugins/syntax.jar
 %%DATADIR%%/plugins/syntax/doc/RSyntaxTextArea.License.txt
 %%DATADIR%%/plugins/syntax/doc/changes.txt
 %%DATADIR%%/plugins/syntax/doc/configdlg.jpg
 %%DATADIR%%/plugins/syntax/doc/corrabrev.jpg
 %%DATADIR%%/plugins/syntax/doc/licence.txt
 %%DATADIR%%/plugins/syntax/doc/readme.html
 %%DATADIR%%/plugins/syntax/doc/standard-nbm-license.txt
 %%DATADIR%%/plugins/syntax/doc/toolspopup.jpg
 %%DATADIR%%/plugins/vertica.jar
 %%DATADIR%%/plugins/vertica/doc/changes.txt
 %%DATADIR%%/plugins/vertica/doc/images/1-db-objects.png
 %%DATADIR%%/plugins/vertica/doc/images/1-sys-tables.png
 %%DATADIR%%/plugins/vertica/doc/images/2-projections_tab.png
 %%DATADIR%%/plugins/vertica/doc/images/3-source-seq.png
 %%DATADIR%%/plugins/vertica/doc/images/3-source-tab.png
 %%DATADIR%%/plugins/vertica/doc/images/3-source-udf.png
 %%DATADIR%%/plugins/vertica/doc/images/3-source-view.png
 %%DATADIR%%/plugins/vertica/doc/images/4-detail-UDF.png
 %%DATADIR%%/plugins/vertica/doc/images/4-detail-proj.png
 %%DATADIR%%/plugins/vertica/doc/images/4-detail-seq.png
 %%DATADIR%%/plugins/vertica/doc/images/5-content+.png
 %%DATADIR%%/plugins/vertica/doc/licence.txt
 %%DATADIR%%/plugins/vertica/doc/readme.html
 %%DATADIR%%/plugins/wikiTableConfigurations.jar
 %%DATADIR%%/squirrel-sql.jar
 %%DATADIR%%/update-log4j.properties
 @dir %%DATADIR%%/plugins/wikiTableConfigurations