databases/sqldeveloper: Update to 20.4.1.407.0006

- Update to 20.4.1.407.006

And while here, also Reformat Makefile a bit.

PR:		256397
Approved by:	vvd@unislabs.com (maintainer)

(cherry picked from commit a52149b28546dcae017b403ecb0a596f0ec2d1b1)

3 files changed, 168 insertions, 87 deletions

diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 19f21c62a251..b38ff65c8b98 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -1,8 +1,5 @@
-# Created by: jjuanino@gmail.com
-
 PORTNAME=	sqldeveloper
-DISTVERSION=	20.2.0.175.1842
-PORTREVISION=	1
+DISTVERSION=	20.4.1.407.0006
 DISTVERSIONSUFFIX=	-no-jre
 CATEGORIES=	databases java
 # https://www.oracle.com/tools/downloads/sqldev-downloads.html
@@ -12,51 +9,50 @@ DIST_SUBDIR=	oracle
 MAINTAINER=	vvd@unislabs.com
 COMMENT=	Graphical tool for database development
 
-RUN_DEPENDS=	bash:shells/bash
-
-USES=		gnome zip
-
 # https://www.oracle.com/downloads/licenses/sqldev-license.html
 LICENSE_NAME=	OTN
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
 
-USE_JAVA=	yes
-INSTALLS_ICONS=	yes
+RUN_DEPENDS=	bash:shells/bash
 
+USES=		gnome zip
+INSTALLS_ICONS=	yes
+USE_JAVA=	yes
 JAVA_VERSION=	11+
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_BUILD=	yes
+SUB_FILES=	${PORTNAME}.desktop ${PORTNAME}.sh
+SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
+		PORTNAME=${PORTNAME}
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 OPTIONS_DEFINE=		OPENJFX14
 OPTIONS_DEFAULT=	OPENJFX14
 OPENJFX14_DESC=		Use JavaFX 14 (can work without it with some limitations)
 OPENJFX14_RUN_DEPENDS=	openjfx14>=0:java/openjfx14
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}
-SUB_FILES=	${PORTNAME}.desktop ${PORTNAME}.sh
-SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
-		PORTNAME=${PORTNAME}
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENJFX14}
 OPENJFX14_JVM_OPTIONS=	-J--module-path=${LOCALBASE}/openjfx14/lib \
 			-J--add-modules=javafx.swing,javafx.web
 .endif
-SUB_LIST+=	OPENJFX14_JVM_OPTIONS="${OPENJFX14_JVM_OPTIONS}"
+SUB_LIST+=		OPENJFX14_JVM_OPTIONS="${OPENJFX14_JVM_OPTIONS}"
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	due to Oracle license restrictions, you must fetch the source \
-distribution manually. Please access \
-https://www.oracle.com/tools/downloads/sqldev-downloads.html \
-with a web browser and follow the link for the ${DISTFILES}. You will be \
-required to register and log in, but you can create an account on that \
-page. After registration and accepting the Oracle License, download the \
-distribution file, ${DISTFILES}, into ${DISTDIR}/${DIST_SUBDIR}/ and then \
-restart this installation
+IGNORE=		due to Oracle license restrictions, you must fetch the \
+		source distribution manually. Please access \
+		https://www.oracle.com/tools/downloads/sqldev-downloads.html \
+		with a web browser and follow the link for the ${DISTFILES}. \
+		You will be required to register and log in, but you can \
+		create an account on that page. After registration and \
+		accepting the Oracle License, download the distribution file, \
+		${DISTFILES}, into ${DISTDIR}/${DIST_SUBDIR}/ and then restart \
+		this installation
 .endif
 
 do-install:
diff --git a/databases/sqldeveloper/distinfo b/databases/sqldeveloper/distinfo
index dd09b35432e6..67c36d3f0b61 100644
--- a/databases/sqldeveloper/distinfo
+++ b/databases/sqldeveloper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600973894
-SHA256 (oracle/sqldeveloper-20.2.0.175.1842-no-jre.zip) = f6f87fe4a30fdb6039f1a7cb2701739b8614845e7edc9d8f2b0307ebdcc18ab9
-SIZE (oracle/sqldeveloper-20.2.0.175.1842-no-jre.zip) = 433127943
+TIMESTAMP = 1622708099
+SHA256 (oracle/sqldeveloper-20.4.1.407.0006-no-jre.zip) = 941135b2de75ffd27ef277b7e4538de4d8bdc4050dd2a87af05ce31b2bb7d95f
+SIZE (oracle/sqldeveloper-20.4.1.407.0006-no-jre.zip) = 60
diff --git a/databases/sqldeveloper/pkg-plist b/databases/sqldeveloper/pkg-plist
index aa88cf494939..2005410638df 100644
--- a/databases/sqldeveloper/pkg-plist
+++ b/databases/sqldeveloper/pkg-plist
@@ -1,4 +1,4 @@
-bin/sqldeveloper
+@(,,750) bin/sqldeveloper
 share/applications/sqldeveloper.desktop
 share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/configuration/bundles.info
@@ -202,6 +202,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/external/oracle.external.el.jar
 %%DATADIR%%/external/oracle.external.emapi.jar
 %%DATADIR%%/external/oracle.external.glassfish-json.jar
+%%DATADIR%%/external/oracle.external.guava.jar
 %%DATADIR%%/external/oracle.external.http-components.jar
 %%DATADIR%%/external/oracle.external.itext.jar
 %%DATADIR%%/external/oracle.external.jackson-core.jar
@@ -317,6 +318,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/ide/extensions/oracle.ide.webbrowser.jar
 %%DATADIR%%/ide/extensions/oracle.ide.webupdate.jar
 %%DATADIR%%/ide/extensions/oracle.ideimpl.peek.jar
+%%DATADIR%%/ide/lib/TimingFramework-sources.jar
 %%DATADIR%%/ide/lib/TimingFramework.jar
 %%DATADIR%%/ide/lib/annotations.jar
 %%DATADIR%%/ide/lib/ceditor-text-format.jar
@@ -423,27 +425,100 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/j2ee/jaxb-api.jar
 %%DATADIR%%/modules/j2ee/jaxb-runtime.jar
 %%DATADIR%%/modules/j2ee/jaxws-api.jar
-%%DATADIR%%/modules/javafx/linux/javafx-base.jar
-%%DATADIR%%/modules/javafx/linux/javafx-controls.jar
-%%DATADIR%%/modules/javafx/linux/javafx-fxml.jar
-%%DATADIR%%/modules/javafx/linux/javafx-graphics.jar
-%%DATADIR%%/modules/javafx/linux/javafx-media.jar
-%%DATADIR%%/modules/javafx/linux/javafx-swing.jar
-%%DATADIR%%/modules/javafx/linux/javafx-web.jar
-%%DATADIR%%/modules/javafx/mac/javafx-base.jar
-%%DATADIR%%/modules/javafx/mac/javafx-controls.jar
-%%DATADIR%%/modules/javafx/mac/javafx-fxml.jar
-%%DATADIR%%/modules/javafx/mac/javafx-graphics.jar
-%%DATADIR%%/modules/javafx/mac/javafx-media.jar
-%%DATADIR%%/modules/javafx/mac/javafx-swing.jar
-%%DATADIR%%/modules/javafx/mac/javafx-web.jar
-%%DATADIR%%/modules/javafx/win/javafx-base.jar
-%%DATADIR%%/modules/javafx/win/javafx-controls.jar
-%%DATADIR%%/modules/javafx/win/javafx-fxml.jar
-%%DATADIR%%/modules/javafx/win/javafx-graphics.jar
-%%DATADIR%%/modules/javafx/win/javafx-media.jar
-%%DATADIR%%/modules/javafx/win/javafx-swing.jar
-%%DATADIR%%/modules/javafx/win/javafx-web.jar
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.base/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.controls/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.fxml/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.graphics/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.graphics/jpeg_fx.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.graphics/mesa3d.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/directshow.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/glib.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/gstreamer.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/libffi.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.swing/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/COPYRIGHT
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/icu_web.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/libxml2.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/libxslt.md
+%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/webkit.md
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx-swt.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.base.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.controls.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.fxml.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.graphics.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.media.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.properties
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.swing.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.web.jar
+%%DATADIR%%/modules/javafx/linux-x64/lib/src.zip
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.base/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.controls/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.fxml/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.graphics/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.graphics/jpeg_fx.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.graphics/mesa3d.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/directshow.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/glib.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/gstreamer.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/libffi.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.swing/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/COPYRIGHT
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/icu_web.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/libxml2.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/libxslt.md
+%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/webkit.md
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx-swt.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.base.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.controls.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.fxml.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.graphics.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.media.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.properties
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.swing.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.web.jar
+%%DATADIR%%/modules/javafx/osx-x64/lib/libdecora_sse.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libfxplugins.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libglass.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libglib-lite.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libgstreamer-lite.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libjavafx_font.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libjavafx_iio.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libjfxmedia.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libjfxmedia_avf.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libjfxwebkit.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libprism_common.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libprism_es2.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/libprism_sw.dylib
+%%DATADIR%%/modules/javafx/osx-x64/lib/src.zip
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.base/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.controls/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.fxml/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.graphics/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.graphics/jpeg_fx.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.graphics/mesa3d.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/directshow.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/glib.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/gstreamer.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/libffi.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.swing/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/COPYRIGHT
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/icu_web.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/libxml2.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/libxslt.md
+%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/webkit.md
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx-swt.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.base.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.controls.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.fxml.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.graphics.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.media.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.properties
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.swing.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.web.jar
+%%DATADIR%%/modules/javafx/windows-x64/lib/src.zip
 %%DATADIR%%/modules/javax.servlet.javax.servlet-api.jar
 %%DATADIR%%/modules/javax.servlet.jsp.javax.servlet.jsp-api.jar
 %%DATADIR%%/modules/oracle.adf.model/db-ca.jar
@@ -471,6 +546,25 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/oracle.jrf/jrf-api.jar
 %%DATADIR%%/modules/oracle.ldap/ojmisc.jar
 %%DATADIR%%/modules/oracle.logging-utils.jar
+%%DATADIR%%/modules/oracle.osdt/ojdigsig.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_cert.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_cmp.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_cms.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_core.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_jce.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_ldap.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_lib_v11.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_lib_v12.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_ocsp.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_saml.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_saml2.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_smime.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_tsp.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_wss.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_xkms.jar
+%%DATADIR%%/modules/oracle.osdt/osdt_xmlsec.jar
+%%DATADIR%%/modules/oracle.osdt/ospnego.jar
+%%DATADIR%%/modules/oracle.pki/oraclepki.jar
 %%DATADIR%%/modules/oracle.xdk/oraclexsql.jar
 %%DATADIR%%/modules/oracle.xdk/xml.jar
 %%DATADIR%%/modules/oracle.xdk/xmlparserv2.jar
@@ -482,6 +576,29 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/org.codehaus.woodstox/stax2-api.jar
 %%DATADIR%%/modules/org.glassfish.javax.el.jar
 %%DATADIR%%/modules/org.glassfish.javax.json.jar
+%%DATADIR%%/modules/thirdparty/batik-all-1.11.0.0.1.jar
+%%DATADIR%%/modules/thirdparty/commons-codec-1.13.jar
+%%DATADIR%%/modules/thirdparty/commons-io-2.6.jar
+%%DATADIR%%/modules/thirdparty/commons-logging-1.2.0.0.1.jar
+%%DATADIR%%/modules/thirdparty/features/batik-all.jar
+%%DATADIR%%/modules/thirdparty/features/commons-codec.jar
+%%DATADIR%%/modules/thirdparty/features/commons-io.jar
+%%DATADIR%%/modules/thirdparty/features/commons-logging.jar
+%%DATADIR%%/modules/thirdparty/features/httpclient-cache.jar
+%%DATADIR%%/modules/thirdparty/features/httpclient.jar
+%%DATADIR%%/modules/thirdparty/features/httpcore.jar
+%%DATADIR%%/modules/thirdparty/features/httpmime_4.5.1.0.0.jar
+%%DATADIR%%/modules/thirdparty/features/jakarta-commons-el.jar
+%%DATADIR%%/modules/thirdparty/features/jaxen.jar
+%%DATADIR%%/modules/thirdparty/features/jsch.jar
+%%DATADIR%%/modules/thirdparty/features/xml-apis-ext.jar
+%%DATADIR%%/modules/thirdparty/httpclient-4.5.10.jar
+%%DATADIR%%/modules/thirdparty/httpclient-cache-4.5.10.jar
+%%DATADIR%%/modules/thirdparty/httpcore-4.4.12.jar
+%%DATADIR%%/modules/thirdparty/httpmime-4.5.1.jar
+%%DATADIR%%/modules/thirdparty/jakarta-commons-el-1.jar
+%%DATADIR%%/modules/thirdparty/jsch-0.1.55.jar
+%%DATADIR%%/modules/thirdparty/xml-apis-ext-1.4.01.jar
 %%DATADIR%%/netbeans/fcpbridge/config/Modules/com-oracle-jdeveloper-extcache.xml
 %%DATADIR%%/netbeans/fcpbridge/config/Modules/com-oracle-jdeveloper-nbactions.xml
 %%DATADIR%%/netbeans/fcpbridge/config/Modules/com-oracle-jdeveloper-nbbridge.xml
@@ -1068,28 +1185,6 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/netbeans/platform/update_tracking/org-openide-util-ui.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-openide-util.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-openide-windows.xml
-%%DATADIR%%/modules/thirdparty/batik-all-1.11.0.0.1.jar
-%%DATADIR%%/modules/thirdparty/commons-codec-1.13.jar
-%%DATADIR%%/modules/thirdparty/commons-io-2.6.jar
-%%DATADIR%%/modules/thirdparty/commons-logging-1.2.0.0.1.jar
-%%DATADIR%%/modules/thirdparty/features/batik-all.jar
-%%DATADIR%%/modules/thirdparty/features/commons-codec.jar
-%%DATADIR%%/modules/thirdparty/features/commons-io.jar
-%%DATADIR%%/modules/thirdparty/features/commons-logging.jar
-%%DATADIR%%/modules/thirdparty/features/httpclient-cache.jar
-%%DATADIR%%/modules/thirdparty/features/httpclient.jar
-%%DATADIR%%/modules/thirdparty/features/httpcore.jar
-%%DATADIR%%/modules/thirdparty/features/httpmime_4.5.1.0.0.jar
-%%DATADIR%%/modules/thirdparty/features/jakarta-commons-el.jar
-%%DATADIR%%/modules/thirdparty/features/jsch.jar
-%%DATADIR%%/modules/thirdparty/features/xml-apis-ext.jar
-%%DATADIR%%/modules/thirdparty/httpclient-4.5.10.jar
-%%DATADIR%%/modules/thirdparty/httpclient-cache-4.5.10.jar
-%%DATADIR%%/modules/thirdparty/httpcore-4.4.12.jar
-%%DATADIR%%/modules/thirdparty/httpmime-4.5.1.jar
-%%DATADIR%%/modules/thirdparty/jakarta-commons-el-1.jar
-%%DATADIR%%/modules/thirdparty/jsch-0.1.55.jar
-%%DATADIR%%/modules/thirdparty/xml-apis-ext-1.4.01.jar
 %%DATADIR%%/orakafka/orakafka.zip
 %%DATADIR%%/rdbms/jlib/ojdi.jar
 %%DATADIR%%/rdbms/jlib/xdb6.jar
@@ -1987,19 +2082,6 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.gui.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.mysql.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.teradata.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/LICENSE.txt
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/antlr4-runtime.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/commonutil.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/jackson-annotations.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/jackson-core.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/jackson-databind.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/jline.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/guava.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/kvclient.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/reactive-streams.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/sklogger.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/sql.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/rdfgraph_help.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/sdordf.jar
@@ -2049,8 +2131,10 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/editor.jar
 %%DATADIR%%/sqldeveloper/lib/emapi.jar
 %%DATADIR%%/sqldeveloper/lib/ext/dbtools-liquibase.jar
+%%DATADIR%%/sqldeveloper/lib/ext/dbtools-modeler-cli-ext.jar
 %%DATADIR%%/sqldeveloper/lib/ext/dbtools-modeler-common.jar
 %%DATADIR%%/sqldeveloper/lib/ext/liquibase-core.jar
+%%DATADIR%%/sqldeveloper/lib/guava.jar
 %%DATADIR%%/sqldeveloper/lib/hk2-api.jar
 %%DATADIR%%/sqldeveloper/lib/hk2-locator.jar
 %%DATADIR%%/sqldeveloper/lib/hk2-utils.jar
@@ -2063,12 +2147,12 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/jackson-core.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-jr-objects.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-jr-stree.jar
+%%DATADIR%%/sqldeveloper/lib/jansi.jar
 %%DATADIR%%/sqldeveloper/lib/javassist.jar
+%%DATADIR%%/sqldeveloper/lib/javax.activation-api.jar
 %%DATADIR%%/sqldeveloper/lib/javax.annotation-api.jar
 %%DATADIR%%/sqldeveloper/lib/javax.inject.jar
 %%DATADIR%%/sqldeveloper/lib/javax.ws.rs-api.jar
-%%DATADIR%%/sqldeveloper/lib/jansi.jar
-%%DATADIR%%/sqldeveloper/lib/javax.activation-api.jar
 %%DATADIR%%/sqldeveloper/lib/jdbcrest.jar
 %%DATADIR%%/sqldeveloper/lib/jersey-client.jar
 %%DATADIR%%/sqldeveloper/lib/jersey-common.jar
@@ -2126,6 +2210,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/svnkit/svnjavahl.jar
 %%DATADIR%%/svnkit/svnkit.jar
 %%DATADIR%%/svnkit/trilead.jar
+@dir %%DATADIR%%/modules/javafx/windows-x64/bin
 @dir %%DATADIR%%/netbeans/platform/modules/lib/amd64/linux
 @dir %%DATADIR%%/netbeans/platform/modules/lib/i386/linux
 @dir %%DATADIR%%/netbeans/platform/modules/lib/x86