diff --git a/databases/datamodeler/Makefile b/databases/datamodeler/Makefile
index 5e631a150860..1d0bdfe39670 100644
--- a/databases/datamodeler/Makefile
+++ b/databases/datamodeler/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	datamodeler
-PORTVERSION=	4.1.5.907
+PORTVERSION=	17.4.0.355.2121
 DISTVERSIONSUFFIX=-1
 CATEGORIES=	databases java
 MASTER_SITES=	#http://www.oracle.com/technetwork/developer-tools/datamodeler/downloads/index.html
@@ -31,6 +31,13 @@ SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 OPTIONS_DEFINE=	DOCS
 
+# configure desktop file
+post-patch:
+	@${REINPLACE_CMD} -e \
+	    's|/opt/datamodeler/icon.png|${PREFIX}/share/icons/hicolor/128x128/apps/${PORTNAME}.png|' \
+	    ${WRKSRC}/datamodeler.desktop
+	@${ECHO} "Categories=Utility" >> ${WRKSRC}/datamodeler.desktop
+
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -50,7 +57,7 @@ do-install:
 	@${ECHO_MSG} " [ DONE ]"
 
 .for d in configuration datamodeler dropins dvt equinox external ide \
-    jdbc jdev jlib modules netbeans rdbms sleepycat \
+    jdbc jdev jlib module modules netbeans rdbms sleepycat \
     sqldeveloper svnkit
 	@${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	@cd ${WRKSRC} && ${FIND} ${d} -type d \
@@ -58,15 +65,18 @@ do-install:
 	@cd ${WRKSRC} && ${FIND} ${d} -type f \
 		-not -name "*.orig" \
 		-not -name "*.exe" \
-		-not -name "*.bat" \
 		-not -name "*.bak" \
 		-not -name "*.dll" \
 		-exec ${INSTALL_DATA} \{} ${STAGEDIR}/${DATADIR}/\{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endfor
 
-	@${ECHO_MSG} -n ">> Installing icon ..."
-	@${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${DATADIR}/icon.png
+	@${ECHO_MSG} -n ">> Installing icon and desktop file ..."
+	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/applications/ \
+	    ${STAGEDIR}/${PREFIX}/share/icons/hicolor/128x128/apps/
+	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}/${PREFIX}/share/applications/
+	@${INSTALL_DATA} ${WRKSRC}/icon.png ${STAGEDIR}/${PREFIX}/share/icons/hicolor/128x128/apps/datamodeler.png
+
 	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.post.mk>
diff --git a/databases/datamodeler/distinfo b/databases/datamodeler/distinfo
index 8de7f3d585e4..682c726b4281 100644
--- a/databases/datamodeler/distinfo
+++ b/databases/datamodeler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483105808
-SHA256 (oracle/datamodeler-4.1.5.907-1.noarch.rpm) = 11fc53d9f73a497f8054fd5f518ec07acf9438b6c0f077d5e605035875bd46b6
-SIZE (oracle/datamodeler-4.1.5.907-1.noarch.rpm) = 190110464
+TIMESTAMP = 1514743140
+SHA256 (oracle/datamodeler-17.4.0.355.2121-1.noarch.rpm) = a67d640f70780235a512e18253c2427ea2244d1c88feac103e433f658e17dac7
+SIZE (oracle/datamodeler-17.4.0.355.2121-1.noarch.rpm) = 192608088
diff --git a/databases/datamodeler/pkg-plist b/databases/datamodeler/pkg-plist
index 8d63e11d4eff..299c4df6b260 100644
--- a/databases/datamodeler/pkg-plist
+++ b/databases/datamodeler/pkg-plist
@@ -1,4 +1,6 @@
 bin/datamodeler
+share/applications/datamodeler.desktop
+share/icons/hicolor/128x128/apps/datamodeler.png
 %%DATADIR%%/configuration/bundles.info
 %%DATADIR%%/configuration/oracle.ide.sqldev.bundles.info
 %%DATADIR%%/datamodeler/bin/datamodeler
@@ -54,7 +56,7 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/lib/RSyntaxTextArea.License.txt
 %%DATADIR%%/datamodeler/lib/avalon-framework-4.2.0.jar
 %%DATADIR%%/datamodeler/lib/awxml.jar
-%%DATADIR%%/datamodeler/lib/batik-all-1.7.jar
+%%DATADIR%%/datamodeler/lib/batik-all-1.8.jar
 %%DATADIR%%/datamodeler/lib/commons-io-1.3.1.jar
 %%DATADIR%%/datamodeler/lib/commons-logging-1.0.4.jar
 %%DATADIR%%/datamodeler/lib/dom4j-1.6.1.jar
@@ -63,8 +65,10 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/lib/js.jar
 %%DATADIR%%/datamodeler/lib/log4j.jar
 %%DATADIR%%/datamodeler/lib/olap_api.jar
-%%DATADIR%%/datamodeler/lib/pdfbox-app-1.8.0.jar
-%%DATADIR%%/datamodeler/lib/rsyntaxtextarea.jar
+%%DATADIR%%/datamodeler/lib/oracle.sqldeveloper.homesupport.jar
+%%DATADIR%%/datamodeler/lib/pdfbox-app-2.0.2.jar
+%%DATADIR%%/datamodeler/lib/rsyntaxtextarea-3.0.0-SNAPSHOT.jar
+%%DATADIR%%/datamodeler/lib/saxon-9.1.0.8.jar
 %%DATADIR%%/datamodeler/lib/serializer-2.7.0.jar
 %%DATADIR%%/datamodeler/lib/xalan-2.7.0.jar
 %%DATADIR%%/datamodeler/lib/xml-apis-ext.jar
@@ -80,6 +84,7 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM3.1_DM3.3.sql
 %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM3.3_DM4.0.sql
 %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM4.0_DM4.1.sql
+%%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM4.1.6_DM4.1.7.sql
 %%DATADIR%%/datamodeler/reports/DMRS_Upgrade_Script_DM4.1Beta_DM4.1.sql
 %%DATADIR%%/datamodeler/reports/Pkg_Osdm_Utils.sql
 %%DATADIR%%/datamodeler/reports/Pkg_Osdm_Utils_body.sql
@@ -95,7 +100,13 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/reports/Reporting_Schema_Permissions.sql
 %%DATADIR%%/datamodeler/reports/Reporting_Schema_Upgrade_Readme.txt
 %%DATADIR%%/datamodeler/reports/Reports_Info.txt
+%%DATADIR%%/datamodeler/reports/css/osddm_main.css
+%%DATADIR%%/datamodeler/reports/css/osddm_toc_tree.css
+%%DATADIR%%/datamodeler/reports/css/osddm_vs.css
 %%DATADIR%%/datamodeler/reports/fop.xconf
+%%DATADIR%%/datamodeler/reports/img/disclosecollapsed_ena.png
+%%DATADIR%%/datamodeler/reports/img/discloseexpanded_ena.png
+%%DATADIR%%/datamodeler/reports/js/toc_filter.js
 %%DATADIR%%/datamodeler/reports/oracle.sqldeveloper.datamodeler_reports.59.46.zip
 %%DATADIR%%/datamodeler/reports/osddm_upgr.sql
 %%DATADIR%%/datamodeler/reports/osddm_upgrerr.sql
@@ -112,12 +123,18 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/reports/xslt/10/AllEntitiesDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllEntitiesDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllEntitiesDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/AllEntitiesViewsDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/AllEntitiesViewsDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/AllEntitiesViewsDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllStructuredTypesDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllStructuredTypesDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllStructuredTypesDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllTablesDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllTablesDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/AllTablesDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/AllTablesViewsDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/AllTablesViewsDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/AllTablesViewsDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/ChangeRequestsDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/ChangeRequestsDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/ChangeRequestsDetails_rtf.xslt
@@ -142,12 +159,18 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleEntityDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleEntityDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleEntityDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/SingleEntityViewDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/SingleEntityViewDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/SingleEntityViewDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleStructuredTypeDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleStructuredTypeDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleStructuredTypeDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleTableDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleTableDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/SingleTableDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/SingleTableViewDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/SingleTableViewDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/10/SingleTableViewDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/UserDefinedProperties_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/UserDefinedProperties_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/10/UserDefinedProperties_rtf.xslt
@@ -163,12 +186,18 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/reports/xslt/20/AllEntitiesDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllEntitiesDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllEntitiesDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/AllEntitiesViewsDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/AllEntitiesViewsDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/AllEntitiesViewsDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllStructuredTypesDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllStructuredTypesDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllStructuredTypesDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllTablesDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllTablesDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/AllTablesDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/AllTablesViewsDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/AllTablesViewsDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/AllTablesViewsDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/ChangeRequestsDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/ChangeRequestsDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/ChangeRequestsDetails_rtf.xslt
@@ -193,12 +222,18 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleEntityDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleEntityDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleEntityDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/SingleEntityViewDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/SingleEntityViewDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/SingleEntityViewDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleStructuredTypeDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleStructuredTypeDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleStructuredTypeDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleTableDetails_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleTableDetails_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/SingleTableDetails_rtf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/SingleTableViewDetails_html.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/SingleTableViewDetails_pdf.xslt
+%%DATADIR%%/datamodeler/reports/xslt/20/SingleTableViewDetails_rtf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/UserDefinedProperties_html.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/UserDefinedProperties_pdf.xslt
 %%DATADIR%%/datamodeler/reports/xslt/20/UserDefinedProperties_rtf.xslt
@@ -630,6 +665,7 @@ bin/datamodeler
 %%DATADIR%%/datamodeler/xmlmetadata/StructuredTypeProxyUDB.xml
 %%DATADIR%%/datamodeler/xmlmetadata/StructuredTypeProxyUDBv81.xml
 %%DATADIR%%/datamodeler/xmlmetadata/SubsetCO.xml
+%%DATADIR%%/datamodeler/xmlmetadata/SupplementalLogGroup.xml
 %%DATADIR%%/datamodeler/xmlmetadata/SynonymDB2.xml
 %%DATADIR%%/datamodeler/xmlmetadata/SynonymOracle.xml
 %%DATADIR%%/datamodeler/xmlmetadata/SynonymOraclev10g.xml
@@ -754,19 +790,23 @@ bin/datamodeler
 %%DATADIR%%/external/oracle.adf-share-base.jar
 %%DATADIR%%/external/oracle.adf-share-ca.jar
 %%DATADIR%%/external/oracle.db-ca.jar
+%%DATADIR%%/external/oracle.dvt-jclient-reports.jar
 %%DATADIR%%/external/oracle.dvt-jclient.jar
 %%DATADIR%%/external/oracle.dvt-utils.jar
 %%DATADIR%%/external/oracle.external.antlr.jar
+%%DATADIR%%/external/oracle.external.apache.commons-codec.jar
+%%DATADIR%%/external/oracle.external.apache.commons-collections4.jar
+%%DATADIR%%/external/oracle.external.apache.commons-logging.jar
 %%DATADIR%%/external/oracle.external.apache_httpclient.jar
 %%DATADIR%%/external/oracle.external.apexlistener.jar
 %%DATADIR%%/external/oracle.external.aqb.jar
 %%DATADIR%%/external/oracle.external.avalon-framework.jar
-%%DATADIR%%/external/oracle.external.avro.jar
 %%DATADIR%%/external/oracle.external.awxml.jar
 %%DATADIR%%/external/oracle.external.balishare.jar
 %%DATADIR%%/external/oracle.external.batik.all.jar
 %%DATADIR%%/external/oracle.external.batik.jar
 %%DATADIR%%/external/oracle.external.berkeleydb.jar
+%%DATADIR%%/external/oracle.external.cloudstorage.jar
 %%DATADIR%%/external/oracle.external.commons-httpclient.jar
 %%DATADIR%%/external/oracle.external.commons-io.jar
 %%DATADIR%%/external/oracle.external.el-for-uix2.jar
@@ -777,8 +817,6 @@ bin/datamodeler
 %%DATADIR%%/external/oracle.external.http-components.jar
 %%DATADIR%%/external/oracle.external.itext.jar
 %%DATADIR%%/external/oracle.external.jackson.jar
-%%DATADIR%%/external/oracle.external.jaxb.jar
-%%DATADIR%%/external/oracle.external.jcommander.jar
 %%DATADIR%%/external/oracle.external.jdbc.jar
 %%DATADIR%%/external/oracle.external.jfxrt.jar
 %%DATADIR%%/external/oracle.external.jline.jar
@@ -788,25 +826,25 @@ bin/datamodeler
 %%DATADIR%%/external/oracle.external.jxlayer.jar
 %%DATADIR%%/external/oracle.external.ldap.jar
 %%DATADIR%%/external/oracle.external.log4j.jar
-%%DATADIR%%/external/oracle.external.logging.jar
 %%DATADIR%%/external/oracle.external.miglayout.jar
 %%DATADIR%%/external/oracle.external.nlsrtl.jar
 %%DATADIR%%/external/oracle.external.objectweb-asm.jar
 %%DATADIR%%/external/oracle.external.odl.jar
 %%DATADIR%%/external/oracle.external.olap_api.jar
-%%DATADIR%%/external/oracle.external.onsd.jar
 %%DATADIR%%/external/oracle.external.oracle-ice.jar
 %%DATADIR%%/external/oracle.external.oracle-jrf-adminserver.jar
 %%DATADIR%%/external/oracle.external.oracle-jrf-dms.jar
 %%DATADIR%%/external/oracle.external.oracle-jrf-logging.jar
+%%DATADIR%%/external/oracle.external.osdt.jar
 %%DATADIR%%/external/oracle.external.pdfbox.jar
+%%DATADIR%%/external/oracle.external.pki.jar
 %%DATADIR%%/external/oracle.external.poi.jar
 %%DATADIR%%/external/oracle.external.qb.jar
 %%DATADIR%%/external/oracle.external.rsyntaxtextarea.jar
 %%DATADIR%%/external/oracle.external.servlet-runtime.jar
 %%DATADIR%%/external/oracle.external.sqldev.jsch.jar
-%%DATADIR%%/external/oracle.external.sqlinform.jar
 %%DATADIR%%/external/oracle.external.sqlj-rt.jar
+%%DATADIR%%/external/oracle.external.stringtemplate.jar
 %%DATADIR%%/external/oracle.external.sunjaxb.jar
 %%DATADIR%%/external/oracle.external.svnkit.jar
 %%DATADIR%%/external/oracle.external.timing.jar
@@ -816,6 +854,7 @@ bin/datamodeler
 %%DATADIR%%/external/oracle.external.xmlgraphics-commons.jar
 %%DATADIR%%/external/oracle.external.xmlparser.jar
 %%DATADIR%%/external/oracle.external.xquery.jar
+%%DATADIR%%/external/oracle.external.xsql.jar
 %%DATADIR%%/external/oracle.icons.jar
 %%DATADIR%%/external/oracle.javamodel-rt.jar
 %%DATADIR%%/external/oracle.javatools-jndi-local.jar
@@ -825,9 +864,7 @@ bin/datamodeler
 %%DATADIR%%/external/oracle.jewt-olaf2.jar
 %%DATADIR%%/external/oracle.orahelp-helpshare.jar
 %%DATADIR%%/external/oracle.orahelp-ohj.jar
-%%DATADIR%%/external/oracle.sqldeveloper.utils-nodeps.jar
 %%DATADIR%%/external/oracle.xmlef.jar
-%%DATADIR%%/icon.png
 %%DATADIR%%/ide/bin/SplashFontBranding.png
 %%DATADIR%%/ide/bin/edt.properties
 %%DATADIR%%/ide/bin/encodings.xml
@@ -885,7 +922,6 @@ bin/datamodeler
 %%DATADIR%%/ide/lib/annotations.jar
 %%DATADIR%%/ide/lib/ceditor-text-format.jar
 %%DATADIR%%/ide/lib/commons-codec-1.3.jar
-%%DATADIR%%/ide/lib/commons-httpclient-3.1.jar
 %%DATADIR%%/ide/lib/commons-io-1.2.jar
 %%DATADIR%%/ide/lib/commons-logging-1.1.1.jar
 %%DATADIR%%/ide/lib/dbapi-impl.jar
@@ -908,7 +944,6 @@ bin/datamodeler
 %%DATADIR%%/ide/lib/xml-factory.jar
 %%DATADIR%%/ide/macros/external-jdbc.properties
 %%DATADIR%%/ide/macros/external-nlsrtl.properties
-%%DATADIR%%/ide/macros/external-objectweb-asm.properties
 %%DATADIR%%/ide/macros/external-xdb.properties
 %%DATADIR%%/ide/macros/external-xmlparser.properties
 %%DATADIR%%/ide/macros/ide-boot.properties
@@ -916,15 +951,17 @@ bin/datamodeler
 %%DATADIR%%/ide/themes/creating_themes.html
 %%DATADIR%%/ide/themes/fusionblue.jar
 %%DATADIR%%/ide/themes/sizingmargins.png
-%%DATADIR%%/jdbc/lib/ojdbc7.jar
+%%DATADIR%%/jdbc/lib/ojdbc8.jar
 %%DATADIR%%/jdev/bin/ojwebupdate
 %%DATADIR%%/jdev/bin/ojwebupdate-logging.conf
 %%DATADIR%%/jdev/bin/ojwebupdate.boot
 %%DATADIR%%/jdev/bin/ojwebupdate.conf
 %%DATADIR%%/jdev/doc/extension/extension.xsd
 %%DATADIR%%/jdev/extensions/oracle.deploy.core.jar
+%%DATADIR%%/jdev/extensions/oracle.deploy.jdeveloper.dt.gallery.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.audit.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.db.explorer.jar
+%%DATADIR%%/jdev/extensions/oracle.ide.gallery-template.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.library.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.macros.jar
 %%DATADIR%%/jdev/extensions/oracle.ide.status.jar
@@ -964,16 +1001,15 @@ bin/datamodeler
 %%DATADIR%%/jlib/orai18n-utility.jar
 %%DATADIR%%/jlib/orai18n.jar
 %%DATADIR%%/jlib/schemas.zip
+%%DATADIR%%/module/el-api-2.2.1-b04.jar
+%%DATADIR%%/module/javax.el-2.2.5.jar
 %%DATADIR%%/modules/asm-3.1.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-core.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-impl.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-jxc.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-xjc.jar
-%%DATADIR%%/modules/el-api-2.2.1-b04.jar
-%%DATADIR%%/modules/javax.el-2.2.5.jar
 %%DATADIR%%/modules/javax.servlet.javax.servlet-api.jar
 %%DATADIR%%/modules/javax.servlet.jsp.javax.servlet.jsp-api.jar
-%%DATADIR%%/modules/javax.xml.stream_1.1.1.0.jar
 %%DATADIR%%/modules/oracle.adf.model/db-ca.jar
 %%DATADIR%%/modules/oracle.adf.model/jdev-cm.jar
 %%DATADIR%%/modules/oracle.adf.share.ca/adf-share-base.jar
@@ -999,6 +1035,7 @@ bin/datamodeler
 %%DATADIR%%/modules/oracle.adf.view/batik-transcoder.jar
 %%DATADIR%%/modules/oracle.adf.view/batik-util.jar
 %%DATADIR%%/modules/oracle.adf.view/batik-xml.jar
+%%DATADIR%%/modules/oracle.adf.view/dvt-jclient-reports.jar
 %%DATADIR%%/modules/oracle.adf.view/dvt-jclient.jar
 %%DATADIR%%/modules/oracle.adf.view/dvt-utils.jar
 %%DATADIR%%/modules/oracle.adf.view/xml-apis-ext.jar
@@ -1010,6 +1047,7 @@ bin/datamodeler
 %%DATADIR%%/modules/oracle.help/ohj.jar
 %%DATADIR%%/modules/oracle.help/oracle_ice.jar
 %%DATADIR%%/modules/oracle.javatools/javamodel-rt.jar
+%%DATADIR%%/modules/oracle.javatools/javatools-exports.jar
 %%DATADIR%%/modules/oracle.javatools/javatools-jndi-local.jar
 %%DATADIR%%/modules/oracle.javatools/javatools-nodeps.jar
 %%DATADIR%%/modules/oracle.javatools/oicons.jar
@@ -1024,10 +1062,10 @@ bin/datamodeler
 %%DATADIR%%/modules/oracle.xdk/xsqlserializers.jar
 %%DATADIR%%/modules/oracle.xdk/xsu12.jar
 %%DATADIR%%/modules/oracle.xmlef/xmlef.jar
-%%DATADIR%%/modules/org.apache.http.components.httpclient-4.2.6.jar
-%%DATADIR%%/modules/org.apache.http.components.httpclient-cache-4.2.6.jar
-%%DATADIR%%/modules/org.apache.http.components.httpcore-4.1.2.jar
-%%DATADIR%%/modules/org.apache.http.components.httpmime-4.1.2.jar
+%%DATADIR%%/modules/org.apache.http.components.httpclient-4.5.1.jar
+%%DATADIR%%/modules/org.apache.http.components.httpclient-cache-4.5.1.jar
+%%DATADIR%%/modules/org.apache.http.components.httpcore-4.4.3.jar
+%%DATADIR%%/modules/org.apache.http.components.httpmime-4.5.1.jar
 %%DATADIR%%/modules/org.glassfish.javax.el.jar
 %%DATADIR%%/modules/org.glassfish.javax.json.jar
 %%DATADIR%%/netbeans/fcpbridge/.lastModified
@@ -1045,12 +1083,12 @@ bin/datamodeler
 %%DATADIR%%/netbeans/fcpbridge/modules/locale/org-netbeans-core-windows_jdev.jar
 %%DATADIR%%/netbeans/fcpbridge/modules/locale/org-netbeans-swing-plaf_jdev.jar
 %%DATADIR%%/netbeans/fcpbridge/modules/locale/org-openide-awt_jdev.jar
-%%DATADIR%%/netbeans/fcpbridge/modules/org-netbeans-core-dynamicconfig.jar
 %%DATADIR%%/netbeans/fcpbridge/update_tracking/com-oracle-jdeveloper-extcache.xml
 %%DATADIR%%/netbeans/fcpbridge/update_tracking/com-oracle-jdeveloper-nbactions.xml
 %%DATADIR%%/netbeans/fcpbridge/update_tracking/com-oracle-jdeveloper-nbbridge.xml
 %%DATADIR%%/netbeans/fcpbridge/update_tracking/com-oracle-jdeveloper-nbwindowsystem.xml
 %%DATADIR%%/netbeans/fcpbridge/update_tracking/org-netbeans-core-dynamicconfig.xml
+%%DATADIR%%/netbeans/ide/.lastModified
 %%DATADIR%%/netbeans/ide/config/Modules/com-googlecode-javaewah-JavaEWAH.xml
 %%DATADIR%%/netbeans/ide/config/Modules/com-jcraft-jsch.xml
 %%DATADIR%%/netbeans/ide/config/Modules/com-jcraft-jzlib.xml
@@ -1073,6 +1111,9 @@ bin/datamodeler
 %%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-libs-jsch-agentproxy_ja.jar
 %%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-libs-jsch-agentproxy_pt_BR.jar
 %%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-libs-jsch-agentproxy_zh_CN.jar
+%%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-modules-editor-document_ja.jar
+%%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-modules-editor-document_pt_BR.jar
+%%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-modules-editor-document_zh_CN.jar
 %%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-modules-editor-guards_de.jar
 %%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-modules-editor-guards_es.jar
 %%DATADIR%%/netbeans/ide/modules/locale/org-netbeans-modules-editor-guards_fr.jar
@@ -1104,6 +1145,7 @@ bin/datamodeler
 %%DATADIR%%/netbeans/ide/update_tracking/org-netbeans-modules-editor-util.xml
 %%DATADIR%%/netbeans/platform/.lastModified
 %%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-netbeans-api-progress.xml
+%%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-netbeans-core-startup.xml
 %%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-netbeans-core.xml
 %%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-netbeans-modules-masterfs.xml
 %%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-netbeans-modules-options-api.xml
@@ -1116,6 +1158,7 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-openide-text.xml
 %%DATADIR%%/netbeans/platform/config/ModuleAutoDeps/org-openide-util.xml
 %%DATADIR%%/netbeans/platform/config/Modules/org-netbeans-api-annotations-common.xml
+%%DATADIR%%/netbeans/platform/config/Modules/org-netbeans-api-intent.xml
 %%DATADIR%%/netbeans/platform/config/Modules/org-netbeans-api-io.xml
 %%DATADIR%%/netbeans/platform/config/Modules/org-netbeans-api-progress-nb.xml
 %%DATADIR%%/netbeans/platform/config/Modules/org-netbeans-api-progress.xml
@@ -1151,6 +1194,7 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/config/Modules/org-openide-text.xml
 %%DATADIR%%/netbeans/platform/config/Modules/org-openide-windows.xml
 %%DATADIR%%/netbeans/platform/core/asm-all-5.0.1.jar
+%%DATADIR%%/netbeans/platform/core/core-base.jar
 %%DATADIR%%/netbeans/platform/core/core.jar
 %%DATADIR%%/netbeans/platform/core/locale/core_de.jar
 %%DATADIR%%/netbeans/platform/core/locale/core_es.jar
@@ -1161,6 +1205,13 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/core/locale/core_pt_BR.jar
 %%DATADIR%%/netbeans/platform/core/locale/core_zh_CN.jar
 %%DATADIR%%/netbeans/platform/core/locale/core_zh_TW.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_de.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_es.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_fr.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_it.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_ja.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_pt_BR.jar
+%%DATADIR%%/netbeans/platform/core/locale/org-netbeans-libs-asm_zh_CN.jar
 %%DATADIR%%/netbeans/platform/core/locale/org-openide-filesystems_de.jar
 %%DATADIR%%/netbeans/platform/core/locale/org-openide-filesystems_es.jar
 %%DATADIR%%/netbeans/platform/core/locale/org-openide-filesystems_fr.jar
@@ -1199,28 +1250,33 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-lookup_ko.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-lookup_pt_BR.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-lookup_zh_CN.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_de.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_es.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_fr.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_it.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_ja.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_pt_BR.jar
+%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util-ui_zh_CN.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_de.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_es.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_fr.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_it.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_ja.jar
-%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_ko.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_pt_BR.jar
 %%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_zh_CN.jar
-%%DATADIR%%/netbeans/platform/lib/locale/org-openide-util_zh_TW.jar
 %%DATADIR%%/netbeans/platform/lib/org-openide-modules.jar
 %%DATADIR%%/netbeans/platform/lib/org-openide-util-lookup.jar
 %%DATADIR%%/netbeans/platform/lib/org-openide-util-ui.jar
 %%DATADIR%%/netbeans/platform/lib/org-openide-util.jar
-%%DATADIR%%/netbeans/platform/modules/ext/jna-4.1.0.jar
-%%DATADIR%%/netbeans/platform/modules/ext/jna-platform-4.1.0.jar
+%%DATADIR%%/netbeans/platform/modules/ext/jna-4.2.2-stripped.jar
+%%DATADIR%%/netbeans/platform/modules/ext/jna-platform-4.2.2.jar
 %%DATADIR%%/netbeans/platform/modules/ext/nsProxyAutoConfig.js
 %%DATADIR%%/netbeans/platform/modules/ext/org.eclipse.osgi_3.9.1.v20140110-1610.jar
 %%DATADIR%%/netbeans/platform/modules/ext/osgi.cmpn-4.2.jar
 %%DATADIR%%/netbeans/platform/modules/ext/osgi.core-5.0.0.jar
-%%DATADIR%%/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-410.so
-%%DATADIR%%/netbeans/platform/modules/lib/i386/linux/libjnidispatch-410.so
-%%DATADIR%%/netbeans/platform/modules/lib/libjnidispatch-410.jnilib
+%%DATADIR%%/netbeans/platform/modules/lib/amd64/linux/libjnidispatch-422.so
+%%DATADIR%%/netbeans/platform/modules/lib/i386/linux/libjnidispatch-422.so
+%%DATADIR%%/netbeans/platform/modules/lib/libjnidispatch-422.jnilib
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-annotations-common_de.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-annotations-common_es.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-annotations-common_fr.jar
@@ -1230,6 +1286,27 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-annotations-common_pt_BR.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-annotations-common_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-annotations-common_zh_TW.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_de.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_es.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_fr.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_it.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_ja.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_pt_BR.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-intent_zh_CN.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_de.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_es.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_fr.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_it.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_ja.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_pt_BR.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-io_zh_CN.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_de.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_es.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_fr.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_it.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_ja.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_pt_BR.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress-nb_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress_de.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress_es.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress_fr.jar
@@ -1239,6 +1316,13 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress_pt_BR.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-progress_zh_TW.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_de.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_es.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_fr.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_it.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_ja.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_pt_BR.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-api-templates_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-netigso_de.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-netigso_es.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-netigso_fr.jar
@@ -1254,6 +1338,15 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-network_ja.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-network_pt_BR.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-network_zh_CN.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_de.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_es.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_fr.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_it.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_ja.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_ko.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_pt_BR.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_zh_CN.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core-windows_zh_TW.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core_de.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core_es.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-netbeans-core_fr.jar
@@ -1435,6 +1528,13 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-explorer_pt_BR.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-explorer_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-explorer_zh_TW.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_de.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_es.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_fr.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_it.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_ja.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_pt_BR.jar
+%%DATADIR%%/netbeans/platform/modules/locale/org-openide-filesystems-nb_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-io_de.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-io_es.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-io_fr.jar
@@ -1481,6 +1581,7 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-windows_zh_CN.jar
 %%DATADIR%%/netbeans/platform/modules/locale/org-openide-windows_zh_TW.jar
 %%DATADIR%%/netbeans/platform/modules/org-netbeans-api-annotations-common.jar
+%%DATADIR%%/netbeans/platform/modules/org-netbeans-api-intent.jar
 %%DATADIR%%/netbeans/platform/modules/org-netbeans-api-io.jar
 %%DATADIR%%/netbeans/platform/modules/org-netbeans-api-progress-nb.jar
 %%DATADIR%%/netbeans/platform/modules/org-netbeans-api-progress.jar
@@ -1516,6 +1617,7 @@ bin/datamodeler
 %%DATADIR%%/netbeans/platform/modules/org-openide-text.jar
 %%DATADIR%%/netbeans/platform/modules/org-openide-windows.jar
 %%DATADIR%%/netbeans/platform/update_tracking/org-netbeans-api-annotations-common.xml
+%%DATADIR%%/netbeans/platform/update_tracking/org-netbeans-api-intent.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-netbeans-api-io.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-netbeans-api-progress-nb.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-netbeans-api-progress.xml
@@ -1565,39 +1667,70 @@ bin/datamodeler
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.filenavigator.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.jdbcproxy.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/avro.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/jackson-core-asl.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/jackson-mapper-asl.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/kvclient.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.onsd/lib/threetenbp.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.ssh.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar
-%%DATADIR%%/sqldeveloper/lib/SQLinForm.jar
 %%DATADIR%%/sqldeveloper/lib/antlr-all-2.7.6.jar
 %%DATADIR%%/sqldeveloper/lib/antlr-runtime-3.1.3.jar
-%%DATADIR%%/sqldeveloper/lib/avro-1.7.6.jar
+%%DATADIR%%/sqldeveloper/lib/antlr-runtime.jar
+%%DATADIR%%/sqldeveloper/lib/aopalliance-repackaged.jar
+%%DATADIR%%/sqldeveloper/lib/asm.jar
 %%DATADIR%%/sqldeveloper/lib/common.jar
-%%DATADIR%%/sqldeveloper/lib/commons-codec-1.6.jar
-%%DATADIR%%/sqldeveloper/lib/commons-logging-1.1.1.jar
-%%DATADIR%%/sqldeveloper/lib/dom4j-1.6.1.jar
+%%DATADIR%%/sqldeveloper/lib/commons-codec.jar
+%%DATADIR%%/sqldeveloper/lib/commons-collections4.jar
+%%DATADIR%%/sqldeveloper/lib/commons-logging.jar
+%%DATADIR%%/sqldeveloper/lib/curvesapi.jar
 %%DATADIR%%/sqldeveloper/lib/emapi.jar
-%%DATADIR%%/sqldeveloper/lib/geronimo-stax-api_1.0_spec-1.0.jar
-%%DATADIR%%/sqldeveloper/lib/httpclient-4.2.6.jar
-%%DATADIR%%/sqldeveloper/lib/httpclient-cache-4.2.6.jar
-%%DATADIR%%/sqldeveloper/lib/httpcore-4.2.5.jar
-%%DATADIR%%/sqldeveloper/lib/httpmime-4.2.6.jar
-%%DATADIR%%/sqldeveloper/lib/itextpdf-5.5.3.jar
-%%DATADIR%%/sqldeveloper/lib/jackson-core-asl-1.9.3.jar
-%%DATADIR%%/sqldeveloper/lib/jackson-mapper-asl-1.9.3.jar
-%%DATADIR%%/sqldeveloper/lib/jcommander.jar
-%%DATADIR%%/sqldeveloper/lib/jline-2.12.1.jar
-%%DATADIR%%/sqldeveloper/lib/jsch-0.1.51.jar
-%%DATADIR%%/sqldeveloper/lib/kvclient.jar
-%%DATADIR%%/sqldeveloper/lib/kvstore.jar
+%%DATADIR%%/sqldeveloper/lib/hk2-api.jar
+%%DATADIR%%/sqldeveloper/lib/hk2-locator.jar
+%%DATADIR%%/sqldeveloper/lib/hk2-utils.jar
+%%DATADIR%%/sqldeveloper/lib/httpclient.jar
+%%DATADIR%%/sqldeveloper/lib/httpcore.jar
+%%DATADIR%%/sqldeveloper/lib/httpmime.jar
+%%DATADIR%%/sqldeveloper/lib/itextpdf.jar
+%%DATADIR%%/sqldeveloper/lib/jackson-annotations.jar
+%%DATADIR%%/sqldeveloper/lib/jackson-core.jar
+%%DATADIR%%/sqldeveloper/lib/jackson-databind.jar
+%%DATADIR%%/sqldeveloper/lib/javassist.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/jersey-client.jar
+%%DATADIR%%/sqldeveloper/lib/jersey-common.jar
+%%DATADIR%%/sqldeveloper/lib/jersey-guava.jar
+%%DATADIR%%/sqldeveloper/lib/jline.jar
+%%DATADIR%%/sqldeveloper/lib/jsch.jar
+%%DATADIR%%/sqldeveloper/lib/json.jar
+%%DATADIR%%/sqldeveloper/lib/jzlib.jar
+%%DATADIR%%/sqldeveloper/lib/log4j-1.2-api.jar
+%%DATADIR%%/sqldeveloper/lib/log4j-api.jar
+%%DATADIR%%/sqldeveloper/lib/log4j-core.jar
+%%DATADIR%%/sqldeveloper/lib/low-level-api.jar
 %%DATADIR%%/sqldeveloper/lib/oracle.dbtools-common.jar
-%%DATADIR%%/sqldeveloper/lib/oracle.sqldeveloper.homesupport.jar
-%%DATADIR%%/sqldeveloper/lib/poi-3.10.1-20140818.jar
-%%DATADIR%%/sqldeveloper/lib/poi-ooxml-3.10.1-20140818.jar
-%%DATADIR%%/sqldeveloper/lib/poi-ooxml-schemas-3.10.1-20140818.jar
+%%DATADIR%%/sqldeveloper/lib/oracle.dbtools.http.jar
+%%DATADIR%%/sqldeveloper/lib/oracle.sqldeveloper.jfx-nodeps.jar
+%%DATADIR%%/sqldeveloper/lib/oraclepki.jar
+%%DATADIR%%/sqldeveloper/lib/osdt_cert.jar
+%%DATADIR%%/sqldeveloper/lib/osdt_core.jar
+%%DATADIR%%/sqldeveloper/lib/osgi-resource-locator.jar
+%%DATADIR%%/sqldeveloper/lib/plugin-api.jar
+%%DATADIR%%/sqldeveloper/lib/poi-ooxml-schemas.jar
+%%DATADIR%%/sqldeveloper/lib/poi-ooxml.jar
+%%DATADIR%%/sqldeveloper/lib/poi.jar
 %%DATADIR%%/sqldeveloper/lib/resource-templates.jar
+%%DATADIR%%/sqldeveloper/lib/slf4j-api.jar
+%%DATADIR%%/sqldeveloper/lib/stax-api.jar
 %%DATADIR%%/sqldeveloper/lib/stringtemplate-3.1b1.jar
-%%DATADIR%%/sqldeveloper/lib/xmlbeans-2.3.0.jar
+%%DATADIR%%/sqldeveloper/lib/stringtemplate.jar
+%%DATADIR%%/sqldeveloper/lib/xmlbeans.jar
 %%DATADIR%%/svnkit/antlr-runtime.jar
 %%DATADIR%%/svnkit/licenses/ANTLR-LICENSE
 %%DATADIR%%/svnkit/licenses/COPYING
@@ -1613,4 +1746,5 @@ bin/datamodeler
 %%DATADIR%%/svnkit/svnkit.jar
 %%DATADIR%%/svnkit/trilead.jar
 @dir %%DATADIR%%/datamodeler/log
+@dir %%DATADIR%%/datamodeler/reports/xslt/10/css
 @dir %%DATADIR%%/netbeans/platform/modules/lib/x86