Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Snapshot of APIs as of NetBeans 17 #5395

Merged
merged 1 commit into from
Feb 23, 2023
Merged

Snapshot of APIs as of NetBeans 17 #5395

merged 1 commit into from
Feb 23, 2023

Conversation

neilcsmith-net
Copy link
Member

@neilcsmith-net neilcsmith-net commented Jan 31, 2023 •
edited
Loading

Snapshot of APIs as of NetBeans 17. For review purposes only at this stage. Not to be merged as / until release vote completes and updated if necessary.

Built in the usual way ... 
# checkout branch (or release tag)
git checkout release170
git clean -dxf
ant build
ant gen-sigtests-release
git add -A
git stash
git checkout master
git checkout -b apis-nb170
git stash pop
git add -A
git commit -m "Snapshot of APIs as of NetBeans 17"
# remove getPeer() calls
find . -name "*.sig" -exec sed -i '/java.awt.peer.ComponentPeer/{N;d;}' {} \;
# check git diff
git add -A
git commit --amend

Filtered diff created using -

curl -L https://github.com/apache/netbeans/pull/<PR_ID>.diff | filterdiff -#2- > filtered-apis-nb170.txt

Filtered diffs below - too long for single comment.

@neilcsmith-net neilcsmith-net added do not merge Don't merge this PR, it is not ready or just demonstration purposes. Release process PRs (eg. versions, sync) that are part of the release process and can be ignored in release notes. labels Jan 31, 2023
@neilcsmith-net
Copy link
Member Author

neilcsmith-net commented Jan 31, 2023 •
edited
Loading

Filtered API diff (without version changes - pt1) 
diff --git a/enterprise/cloud.common/nbproject/org-netbeans-modules-cloud-common.sig b/enterprise/cloud.common/nbproject/org-netbeans-modules-cloud-common.sig
index 4ef794114630..5a4e88ad2b74 100644
--- a/enterprise/cloud.common/nbproject/org-netbeans-modules-cloud-common.sig
+++ b/enterprise/cloud.common/nbproject/org-netbeans-modules-cloud-common.sig
@@ -379,6 +379,12 @@ CLSS public abstract interface java.io.Serializable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -409,6 +415,32 @@ meth public final void wait(long,int) throws java.lang.InterruptedException
 meth public int hashCode()
 meth public java.lang.String toString()
 
+CLSS public abstract interface java.lang.annotation.Annotation
+meth public abstract boolean equals(java.lang.Object)
+meth public abstract int hashCode()
+meth public abstract java.lang.Class<? extends java.lang.annotation.Annotation> annotationType()
+meth public abstract java.lang.String toString()
+
+CLSS public abstract interface !annotation java.lang.annotation.Documented
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
+intf java.lang.annotation.Annotation
+
+CLSS public abstract interface !annotation java.lang.annotation.Retention
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
+intf java.lang.annotation.Annotation
+meth public abstract java.lang.annotation.RetentionPolicy value()
+
+CLSS public abstract interface !annotation java.lang.annotation.Target
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
+intf java.lang.annotation.Annotation
+meth public abstract java.lang.annotation.ElementType[] value()
+
 CLSS public abstract interface javax.accessibility.Accessible
 meth public abstract javax.accessibility.AccessibleContext getAccessibleContext()
 
@@ -721,6 +753,7 @@ supr java.lang.Object
 hfds desc,icon,name,type
 
 CLSS public abstract interface org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory
+ anno 0 java.lang.Deprecated()
 meth public abstract org.openide.nodes.Node getManagerNode(org.openide.util.Lookup)
 meth public abstract org.openide.nodes.Node getTargetNode(org.openide.util.Lookup)
 
diff --git a/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig b/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig
index 3229653b6e80..a69e11096532 100644
--- a/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig
+++ b/enterprise/glassfish.common/nbproject/org-netbeans-modules-glassfish-common.sig
@@ -1392,10 +1392,10 @@ fld public final static java.lang.String EE6_DEPLOYER_FRAGMENT = "deployer:gfv3e
 fld public final static java.lang.String EE7_DEPLOYER_FRAGMENT = "deployer:gfv4ee7"
 fld public final static java.lang.String EE8_DEPLOYER_FRAGMENT = "deployer:gfv5ee8"
 fld public final static java.lang.String GLASSFISH_AUTOREGISTERED_INSTANCE = "glassfish_autoregistered_instance"
+fld public final static java.lang.String JAKARTAEE10_DEPLOYER_FRAGMENT = "deployer:gfv700ee10"
 fld public final static java.lang.String JAKARTAEE8_DEPLOYER_FRAGMENT = "deployer:gfv510ee8"
-fld public final static java.lang.String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9"
 fld public final static java.lang.String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9"
-fld public final static java.lang.String JAKARTAEE10_DEPLOYER_FRAGMENT = "deployer:gfv700ee10"
+fld public final static java.lang.String JAKARTAEE9_DEPLOYER_FRAGMENT = "deployer:gfv6ee9"
 fld public final static java.lang.String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"
 fld public final static java.util.Set<java.lang.String> activeRegistrationSet
 fld public static java.lang.String EE6WC_DEFAULT_NAME
@@ -1421,7 +1421,7 @@ meth public void addServerInstance(org.netbeans.modules.glassfish.common.Glassfi
 meth public void removeChangeListener(javax.swing.event.ChangeListener)
 meth public void resultChanged(org.openide.util.LookupEvent)
 supr java.lang.Object
-hfds AUTOINSTANCECOPIED,EE6WC_INSTANCES_PATH,EE6_INSTANCES_PATH,EE7_INSTANCES_PATH,EE8_INSTANCES_PATH,JAKARTAEE8_INSTANCES_PATH,JAKARTAEE91_INSTANCES_PATH,JAKARTAEE9_INSTANCES_PATH,JAKARTAEE10_INSTANCES_PATH,LOGGER,activeDisplayNames,cf,displayName,glassFishProvider,instanceMap,instancesDirNames,lookupResult,needsJdk6,noPasswordOptions,support,uriFragments
+hfds AUTOINSTANCECOPIED,EE6WC_INSTANCES_PATH,EE6_INSTANCES_PATH,EE7_INSTANCES_PATH,EE8_INSTANCES_PATH,JAKARTAEE10_INSTANCES_PATH,JAKARTAEE8_INSTANCES_PATH,JAKARTAEE91_INSTANCES_PATH,JAKARTAEE9_INSTANCES_PATH,LOGGER,activeDisplayNames,cf,displayName,glassFishProvider,instanceMap,instancesDirNames,lookupResult,needsJdk6,noPasswordOptions,support,uriFragments
 
 CLSS public org.netbeans.modules.glassfish.common.Installer
 cons public init()
@@ -2233,10 +2233,10 @@ meth public static java.util.List<java.lang.String> filterByManifest(java.util.L
 meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getEe6Utilities()
 meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getEe7Utilities()
 meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getEe8Utilities()
+meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe10Utilities()
 meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe8Utilities()
 meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe91Utilities()
 meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe9Utilities()
-meth public static org.netbeans.modules.glassfish.spi.ServerUtilities getJakartaEe10Utilities()
 meth public static org.openide.WizardDescriptor$InstantiatingIterator getInstantiatingIterator()
 supr java.lang.Object
 hfds gip,gwp
diff --git a/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig b/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig
index e927c9960787..15a2750011bd 100644
--- a/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig
+++ b/enterprise/glassfish.eecommon/nbproject/org-netbeans-modules-glassfish-eecommon.sig
@@ -869,6 +869,7 @@ supr java.lang.Object
 hfds destFolder,ext,name,result,source
 
 CLSS public final org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion
+fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_10_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_1_3
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_1_4
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_5_0
@@ -876,12 +877,12 @@ fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppCl
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_7_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_8_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_9_0
-fld public final static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion APP_CLIENT_10_0
 meth public int compareTo(java.lang.Object)
 meth public static org.netbeans.modules.glassfish.eecommon.api.config.AppClientVersion getAppClientVersion(java.lang.String)
 supr org.netbeans.modules.glassfish.eecommon.api.config.J2EEBaseVersion
 
 CLSS public final org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion
+fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_10_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_1_3
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_1_4
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_5_0
@@ -889,7 +890,6 @@ fld public final static org.netbeans.modules.glassfish.eecommon.api.config.Appli
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_7_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_8_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_9_0
-fld public final static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion APPLICATION_10_0
 meth public int compareTo(java.lang.Object)
 meth public static org.netbeans.modules.glassfish.eecommon.api.config.ApplicationVersion getApplicationVersion(java.lang.String)
 supr org.netbeans.modules.glassfish.eecommon.api.config.J2EEBaseVersion
@@ -1194,10 +1194,10 @@ hfds j2eeModuleVersion,numericModuleVersion,numericSpecVersion
 CLSS public final org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion J2EE_1_3
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion J2EE_1_4
+fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_10_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_8_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_9_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_9_1
-fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAKARTAEE_10_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAVAEE_5_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAVAEE_6_0
 fld public final static org.netbeans.modules.glassfish.eecommon.api.config.J2EEVersion JAVAEE_7_0
diff --git a/enterprise/glassfish.javaee/nbproject/org-netbeans-modules-glassfish-javaee.sig b/enterprise/glassfish.javaee/nbproject/org-netbeans-modules-glassfish-javaee.sig
index 467c9c84fd18..45765e03d3dc 100644
--- a/enterprise/glassfish.javaee/nbproject/org-netbeans-modules-glassfish-javaee.sig
+++ b/enterprise/glassfish.javaee/nbproject/org-netbeans-modules-glassfish-javaee.sig
@@ -777,12 +777,12 @@ meth public javax.enterprise.deploy.spi.DeploymentManager getDisconnectedDeploym
 meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createEe6()
 meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createEe7()
 meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createEe8()
+meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createJakartaEe10()
 meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createJakartaEe8()
 meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createJakartaEe9()
 meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createJakartaEe91()
-meth public static javax.enterprise.deploy.spi.factories.DeploymentFactory createJakartaEe10()
 supr java.lang.Object
-hfds displayName,ee6Instance,ee7Instance,ee8Instance,jakartaee8Instance,jakartaee91Instance,jakartaee9Instance,preludeInstance,su,uriFragments,version
+hfds displayName,ee6Instance,ee7Instance,ee8Instance,jakartaee10Instance,jakartaee8Instance,jakartaee91Instance,jakartaee9Instance,preludeInstance,su,uriFragments,version
 
 CLSS public org.netbeans.modules.glassfish.javaee.Hk2DeploymentManager
 cons public init(java.lang.String,java.lang.String,java.lang.String,org.netbeans.modules.glassfish.spi.ServerUtilities)
@@ -827,7 +827,7 @@ cons public init()
 meth public org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl getJ2eePlatformImpl(javax.enterprise.deploy.spi.DeploymentManager)
 meth public static org.netbeans.modules.glassfish.javaee.Hk2JavaEEPlatformFactory getFactory()
 supr org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformFactory
-hfds V3_LOOKUP_KEY,V4_LOOKUP_KEY,V510_LOOKUP_KEY,V5_LOOKUP_KEY,V610_LOOKUP_KEY,V6_LOOKUP_KEY,instance
+hfds V3_LOOKUP_KEY,V4_LOOKUP_KEY,V510_LOOKUP_KEY,V5_LOOKUP_KEY,V610_LOOKUP_KEY,V6_LOOKUP_KEY,V7_LOOKUP_KEY,instance
 
 CLSS public org.netbeans.modules.glassfish.javaee.Hk2JavaEEPlatformImpl
 cons public init(org.netbeans.modules.glassfish.javaee.Hk2DeploymentManager,java.lang.String[],org.netbeans.api.j2ee.core.Profile[],org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type[],java.lang.String,java.lang.String,java.lang.String)
@@ -970,10 +970,10 @@ meth public org.openide.WizardDescriptor$InstantiatingIterator getAddInstanceIte
 meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createEe6()
 meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createEe7()
 meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createEe8()
+meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createJakartaEe10()
 meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createJakartaEe8()
 meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createJakartaEe9()
 meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createJakartaEe91()
-meth public static org.netbeans.modules.glassfish.javaee.Hk2OptionalFactory createJakartaEe10()
 supr org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory
 hfds commonUtilities,df,hasWizard
 hcls J2eeInstantiatingIterator
@@ -1075,7 +1075,7 @@ meth public boolean isModuleSupported(java.lang.String,java.util.Properties)
 meth public java.lang.Object createModule(org.openide.util.Lookup)
 meth public static org.netbeans.modules.glassfish.spi.GlassfishModuleFactory getDefault()
 supr java.lang.Object
-hfds CLASSPATH_VOLUME,CLASS_LIBRARY_TYPE,COMET_JAR_2_MATCHER,COMET_JAR_MATCHER,COMET_LIB,COMET_LIB_2,ECLIPSE_LINK_LIB,ECLIPSE_LINK_LIB_2,EL_CORE_JAR_MATCHER,GRIZZLY_OPTIONAL_JAR_MATCHER,JAKARTA_EE_8_JAVADOC,JAKARTA_EE_9_JAVADOC,JAVADOC_VOLUME,JAVA_EE_5_LIB,JAVA_EE_6_LIB,JAVA_EE_JAVADOC,JAXRS_LIBRARIES,JAXRS_LIBRARIES_31,JERSEY_GF_SERVER,LOG,PERSISTENCE_API_JAR_MATCHER_1,PERSISTENCE_API_JAR_MATCHER_2,PERSISTENCE_JAVADOC,RP,SOURCE_VOLUME,singleton
+hfds CLASSPATH_VOLUME,CLASS_LIBRARY_TYPE,COMET_JAR_2_MATCHER,COMET_JAR_MATCHER,COMET_LIB,COMET_LIB_2,ECLIPSE_LINK_LIB,ECLIPSE_LINK_LIB_2,EL_CORE_JAR_MATCHER,GRIZZLY_OPTIONAL_JAR_MATCHER,JAKARTA_EE_10_JAVADOC,JAKARTA_EE_8_JAVADOC,JAKARTA_EE_9_JAVADOC,JAVADOC_VOLUME,JAVA_EE_5_LIB,JAVA_EE_6_LIB,JAVA_EE_JAVADOC,JAXRS_LIBRARIES,JAXRS_LIBRARIES_31,JERSEY_GF_SERVER,LOG,PERSISTENCE_API_JAR_MATCHER_1,PERSISTENCE_API_JAR_MATCHER_2,PERSISTENCE_JAVADOC,RP,SOURCE_VOLUME,singleton
 hcls InitializeLibrary
 
 CLSS public org.netbeans.modules.glassfish.javaee.ModuleConfigurationImpl
@@ -1141,12 +1141,14 @@ hfds nameKey,properties,resourceData
 
 CLSS public org.netbeans.modules.glassfish.javaee.RunTimeDDCatalog
 cons public init()
+fld public final static java.lang.String APPCLIENT_10_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/application-client_10.xsd"
 fld public final static java.lang.String APPCLIENT_1_4_ID = "SCHEMA:http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
 fld public final static java.lang.String APPCLIENT_5_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
 fld public final static java.lang.String APPCLIENT_6_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/application-client_6.xsd"
 fld public final static java.lang.String APPCLIENT_7_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd"
 fld public final static java.lang.String APPCLIENT_8_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/application-client_8.xsd"
 fld public final static java.lang.String APPCLIENT_9_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/application-client_9.xsd"
+fld public final static java.lang.String APP_10_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/application_10.xsd"
 fld public final static java.lang.String APP_1_4_ID = "SCHEMA:http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
 fld public final static java.lang.String APP_5_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/application_5.xsd"
 fld public final static java.lang.String APP_6_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/application_6.xsd"
@@ -1185,14 +1187,17 @@ fld public final static java.lang.String WEBAPP_3_0_ID = "SCHEMA:http://java.sun
 fld public final static java.lang.String WEBAPP_3_1_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 fld public final static java.lang.String WEBAPP_4_0_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
 fld public final static java.lang.String WEBAPP_5_0_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+fld public final static java.lang.String WEBAPP_6_0_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
 fld public final static java.lang.String WEBCOMMON_3_0_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd"
 fld public final static java.lang.String WEBCOMMON_3_1_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/web-common_3_1.xsd"
 fld public final static java.lang.String WEBCOMMON_4_0_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/web-common_4_0.xsd"
 fld public final static java.lang.String WEBCOMMON_5_0_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/web-common_5_0.xsd"
+fld public final static java.lang.String WEBCOMMON_6_0_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/web-common_6_0.xsd"
 fld public final static java.lang.String WEBFRAGMENT_3_0_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
 fld public final static java.lang.String WEBFRAGMENT_3_1_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/web-fragment_3_1.xsd"
 fld public final static java.lang.String WEBFRAGMENT_4_0_ID = "SCHEMA:http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"
 fld public final static java.lang.String WEBFRAGMENT_5_0_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
+fld public final static java.lang.String WEBFRAGMENT_6_0_ID = "SCHEMA:https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
 fld public final static java.lang.String WEBSERVICES_1_1_ID = "SCHEMA:http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
 fld public final static java.lang.String WEBSERVICES_1_2_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
 fld public final static java.lang.String WEBSERVICES_1_3_ID = "SCHEMA:http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"
@@ -1229,7 +1234,7 @@ meth public void removeCatalogListener(org.netbeans.modules.xml.catalog.spi.Cata
 meth public void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public void setInstanceProvider(org.netbeans.spi.server.ServerInstanceProvider)
 supr org.netbeans.modules.xml.api.model.GrammarQueryManager
-hfds APPCLIENT_1_4,APPCLIENT_1_4_XSD,APPCLIENT_5,APPCLIENT_5_XSD,APPCLIENT_6,APPCLIENT_6_XSD,APPCLIENT_7,APPCLIENT_7_XSD,APPCLIENT_8,APPCLIENT_8_XSD,APPCLIENT_9,APPCLIENT_9_XSD,APPCLIENT_TAG,APP_1_4,APP_1_4_XSD,APP_5,APP_5_XSD,APP_6,APP_6_XSD,APP_7,APP_7_XSD,APP_8,APP_8_XSD,APP_9,APP_9_XSD,APP_TAG,EJBJAR_2_1,EJBJAR_2_1_XSD,EJBJAR_3_0,EJBJAR_3_0_XSD,EJBJAR_3_1,EJBJAR_3_1_XSD,EJBJAR_3_2,EJBJAR_3_2_XSD,EJBJAR_4_0,EJBJAR_4_0_XSD,EJB_JAR_TAG,JavaEE6SchemaToURLMap,JavaEE6TypeToURLMap,PERSISTENCE,PERSISTENCEORM,PERSISTENCEORM_2_0,PERSISTENCEORM_2_0_XSD,PERSISTENCEORM_2_1,PERSISTENCEORM_2_1_XSD,PERSISTENCEORM_2_2,PERSISTENCEORM_2_2_XSD,PERSISTENCEORM_3_0,PERSISTENCEORM_3_0_XSD,PERSISTENCEORM_TAG,PERSISTENCEORM_XSD,PERSISTENCE_2_0,PERSISTENCE_2_0_XSD,PERSISTENCE_2_1,PERSISTENCE_2_1_XSD,PERSISTENCE_2_2,PERSISTENCE_2_2_XSD,PERSISTENCE_3_0,PERSISTENCE_3_0_XSD,PERSISTENCE_TAG,PERSISTENCE_XSD,SCHEMASLOCATION,SchemaToURLMap,TypeToURLMap,WEBAPP_2_5,WEBAPP_2_5_XSD,WEBAPP_3_0,WEBAPP_3_0_XSD,WEBAPP_3_1,WEBAPP_3_1_XSD,WEBAPP_4_0,WEBAPP_4_0_XSD,WEBAPP_5_0,WEBAPP_5_0_XSD,WEBAPP_TAG,WEBCOMMON_3_0,WEBCOMMON_3_0_XSD,WEBCOMMON_3_1,WEBCOMMON_3_1_XSD,WEBCOMMON_4_0,WEBCOMMON_4_0_XSD,WEBCOMMON_5_0,WEBCOMMON_5_0_XSD,WEBFRAGMENT_3_0,WEBFRAGMENT_3_0_XSD,WEBFRAGMENT_3_1,WEBFRAGMENT_3_1_XSD,WEBFRAGMENT_4_0,WEBFRAGMENT_4_0_XSD,WEBFRAGMENT_5_0,WEBFRAGMENT_5_0_XSD,WEBSERVICES_1_1,WEBSERVICES_1_1_XSD,WEBSERVICES_1_2,WEBSERVICES_1_2_XSD,WEBSERVICES_1_3,WEBSERVICES_1_3_XSD,WEBSERVICES_1_4,WEBSERVICES_1_4_XSD,WEBSERVICES_2_0,WEBSERVICES_2_0_XSD,WEBSERVICES_CLIENT_1_1,WEBSERVICES_CLIENT_1_1_XSD,WEBSERVICES_CLIENT_1_2,WEBSERVICES_CLIENT_1_2_XSD,WEBSERVICES_CLIENT_1_3,WEBSERVICES_CLIENT_1_3_XSD,WEBSERVICES_CLIENT_1_4,WEBSERVICES_CLIENT_1_4_XSD,WEBSERVICES_CLIENT_2_0,WEBSERVICES_CLIENT_2_0_XSD,WEBSERVICES_TAG,XMLNS_ATTR,XML_XSD,XML_XSD_DEF,catalogListeners,ddCatalogMap,displayNameKey,hasAdditionalMap,javaEE6DDCatalog,platformRootDir,shortDescriptionKey
+hfds APPCLIENT_10,APPCLIENT_10_XSD,APPCLIENT_1_4,APPCLIENT_1_4_XSD,APPCLIENT_5,APPCLIENT_5_XSD,APPCLIENT_6,APPCLIENT_6_XSD,APPCLIENT_7,APPCLIENT_7_XSD,APPCLIENT_8,APPCLIENT_8_XSD,APPCLIENT_9,APPCLIENT_9_XSD,APPCLIENT_TAG,APP_10,APP_10_XSD,APP_1_4,APP_1_4_XSD,APP_5,APP_5_XSD,APP_6,APP_6_XSD,APP_7,APP_7_XSD,APP_8,APP_8_XSD,APP_9,APP_9_XSD,APP_TAG,EJBJAR_2_1,EJBJAR_2_1_XSD,EJBJAR_3_0,EJBJAR_3_0_XSD,EJBJAR_3_1,EJBJAR_3_1_XSD,EJBJAR_3_2,EJBJAR_3_2_XSD,EJBJAR_4_0,EJBJAR_4_0_XSD,EJB_JAR_TAG,JavaEE6SchemaToURLMap,JavaEE6TypeToURLMap,PERSISTENCE,PERSISTENCEORM,PERSISTENCEORM_2_0,PERSISTENCEORM_2_0_XSD,PERSISTENCEORM_2_1,PERSISTENCEORM_2_1_XSD,PERSISTENCEORM_2_2,PERSISTENCEORM_2_2_XSD,PERSISTENCEORM_3_0,PERSISTENCEORM_3_0_XSD,PERSISTENCEORM_TAG,PERSISTENCEORM_XSD,PERSISTENCE_2_0,PERSISTENCE_2_0_XSD,PERSISTENCE_2_1,PERSISTENCE_2_1_XSD,PERSISTENCE_2_2,PERSISTENCE_2_2_XSD,PERSISTENCE_3_0,PERSISTENCE_3_0_XSD,PERSISTENCE_TAG,PERSISTENCE_XSD,SCHEMASLOCATION,SchemaToURLMap,TypeToURLMap,WEBAPP_2_5,WEBAPP_2_5_XSD,WEBAPP_3_0,WEBAPP_3_0_XSD,WEBAPP_3_1,WEBAPP_3_1_XSD,WEBAPP_4_0,WEBAPP_4_0_XSD,WEBAPP_5_0,WEBAPP_5_0_XSD,WEBAPP_6_0,WEBAPP_6_0_XSD,WEBAPP_TAG,WEBCOMMON_3_0,WEBCOMMON_3_0_XSD,WEBCOMMON_3_1,WEBCOMMON_3_1_XSD,WEBCOMMON_4_0,WEBCOMMON_4_0_XSD,WEBCOMMON_5_0,WEBCOMMON_5_0_XSD,WEBCOMMON_6_0,WEBCOMMON_6_0_XSD,WEBFRAGMENT_3_0,WEBFRAGMENT_3_0_XSD,WEBFRAGMENT_3_1,WEBFRAGMENT_3_1_XSD,WEBFRAGMENT_4_0,WEBFRAGMENT_4_0_XSD,WEBFRAGMENT_5_0,WEBFRAGMENT_5_0_XSD,WEBFRAGMENT_6_0,WEBFRAGMENT_6_0_XSD,WEBSERVICES_1_1,WEBSERVICES_1_1_XSD,WEBSERVICES_1_2,WEBSERVICES_1_2_XSD,WEBSERVICES_1_3,WEBSERVICES_1_3_XSD,WEBSERVICES_1_4,WEBSERVICES_1_4_XSD,WEBSERVICES_2_0,WEBSERVICES_2_0_XSD,WEBSERVICES_CLIENT_1_1,WEBSERVICES_CLIENT_1_1_XSD,WEBSERVICES_CLIENT_1_2,WEBSERVICES_CLIENT_1_2_XSD,WEBSERVICES_CLIENT_1_3,WEBSERVICES_CLIENT_1_3_XSD,WEBSERVICES_CLIENT_1_4,WEBSERVICES_CLIENT_1_4_XSD,WEBSERVICES_CLIENT_2_0,WEBSERVICES_CLIENT_2_0_XSD,WEBSERVICES_TAG,XMLNS_ATTR,XML_XSD,XML_XSD_DEF,catalogListeners,ddCatalogMap,displayNameKey,hasAdditionalMap,javaEE6DDCatalog,platformRootDir,shortDescriptionKey
 
 CLSS public org.netbeans.modules.glassfish.javaee.SunMessageDestination
 cons public init(java.lang.String,org.netbeans.modules.j2ee.deployment.common.api.MessageDestination$Type)
@@ -1473,6 +1478,7 @@ fld public final static java.lang.String PROP_DISPLAY_NAME = "displayName"
 fld public final static java.lang.String PROP_LIBRARIES = "libraries"
 fld public final static java.lang.String PROP_SERVER_LIBRARIES = "serverLibraries"
 meth public abstract boolean isToolSupported(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public abstract java.awt.Image getIcon()
 meth public abstract java.io.File[] getPlatformRoots()
 meth public abstract java.io.File[] getToolClasspathEntries(java.lang.String)
@@ -1484,9 +1490,13 @@ meth public final void addPropertyChangeListener(java.beans.PropertyChangeListen
 meth public final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
 meth public final void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public java.lang.String getToolProperty(java.lang.String,java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set getSupportedModuleTypes()
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<java.lang.String> getSupportedSpecVersions()
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<java.lang.String> getSupportedSpecVersions(java.lang.Object)
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<org.netbeans.api.j2ee.core.Profile> getSupportedProfiles()
 meth public java.util.Set<org.netbeans.api.j2ee.core.Profile> getSupportedProfiles(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type)
 meth public java.util.Set<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type> getSupportedTypes()
diff --git a/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig b/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig
index 555e786c59b6..35cd80b929dc 100644
--- a/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig
+++ b/enterprise/glassfish.tooling/nbproject/org-netbeans-modules-glassfish-tooling.sig
@@ -1411,6 +1411,7 @@ fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVer
 fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_6_2_3
 fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_6_2_4
 fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_6_2_5
+fld public final static org.netbeans.modules.glassfish.tooling.data.GlassFishVersion GF_7_0_0
 meth public boolean equals(org.netbeans.modules.glassfish.tooling.data.GlassFishVersion)
 meth public boolean equalsMajorMinor(org.netbeans.modules.glassfish.tooling.data.GlassFishVersion)
 meth public java.lang.String toFullString()
@@ -1712,7 +1713,7 @@ meth public static java.net.URL getBuilderConfig(org.netbeans.modules.glassfish.
 meth public static org.netbeans.modules.glassfish.tooling.server.config.ConfigBuilder getBuilder(org.netbeans.modules.glassfish.tooling.data.GlassFishServer)
 meth public static void destroyBuilder(org.netbeans.modules.glassfish.tooling.data.GlassFishServer)
 supr java.lang.Object
-hfds CONFIG_V3,CONFIG_V4,CONFIG_V4_1,CONFIG_V5,CONFIG_V5_0_1,CONFIG_V5_1,CONFIG_V6,CONFIG_V6_1_0,CONFIG_V6_2_0,CONFIG_V6_2_1,CONFIG_V6_2_2,CONFIG_V6_2_3,CONFIG_V6_2_4,CONFIG_V6_2_5,builders,config
+hfds CONFIG_V3,CONFIG_V4,CONFIG_V4_1,CONFIG_V5,CONFIG_V5_0_1,CONFIG_V5_1,CONFIG_V6,CONFIG_V6_1_0,CONFIG_V6_2_0,CONFIG_V6_2_1,CONFIG_V6_2_2,CONFIG_V6_2_3,CONFIG_V6_2_4,CONFIG_V6_2_5,CONFIG_V7_0_0,builders,config
 
 CLSS public org.netbeans.modules.glassfish.tooling.server.config.ConfigUtils
 cons public init()
@@ -1753,6 +1754,8 @@ hfds lib
 CLSS public final !enum org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile
 fld public final static char TYPE_SEPARATOR = '-'
 fld public final static int length
+fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v10_0_0
+fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v10_0_0_web
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v1_2
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v1_3
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v1_4
@@ -1769,8 +1772,6 @@ fld public final static org.netbeans.modules.glassfish.tooling.server.config.Jav
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v9_0_0_web
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v9_1_0
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v9_1_0_web
-fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v10_0_0
-fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile v10_0_0_web
 innr public final static !enum Type
 innr public final static !enum Version
 meth public java.lang.String toString()
@@ -1794,6 +1795,7 @@ hfds name
 
 CLSS public final static !enum org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version
  outer org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile
+fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v10_0_0
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v1_2
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v1_3
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v1_4
@@ -1804,7 +1806,6 @@ fld public final static org.netbeans.modules.glassfish.tooling.server.config.Jav
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v8_0_0
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v9_0_0
 fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v9_1_0
-fld public final static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version v10_0_0
 meth public java.lang.String toString()
 meth public static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version valueOf(java.lang.String)
 meth public static org.netbeans.modules.glassfish.tooling.server.config.JavaEEProfile$Version[] values()
diff --git a/enterprise/j2ee.common/nbproject/org-netbeans-modules-j2ee-common.sig b/enterprise/j2ee.common/nbproject/org-netbeans-modules-j2ee-common.sig
index 3c413b781ec2..3956042ea970 100644
--- a/enterprise/j2ee.common/nbproject/org-netbeans-modules-j2ee-common.sig
+++ b/enterprise/j2ee.common/nbproject/org-netbeans-modules-j2ee-common.sig
@@ -639,6 +639,7 @@ meth public boolean isCdi10Supported()
 meth public boolean isCdi11Supported()
 meth public boolean isCdi20Supported()
 meth public boolean isCdi30Supported()
+meth public boolean isCdi40Supported()
 meth public boolean isEjb30Supported()
 meth public boolean isEjb31LiteSupported()
 meth public boolean isEjb31Supported()
diff --git a/enterprise/j2ee.core/nbproject/org-netbeans-modules-j2ee-core.sig b/enterprise/j2ee.core/nbproject/org-netbeans-modules-j2ee-core.sig
index dcee72ea1d1f..366329917045 100644
--- a/enterprise/j2ee.core/nbproject/org-netbeans-modules-j2ee-core.sig
+++ b/enterprise/j2ee.core/nbproject/org-netbeans-modules-j2ee-core.sig
@@ -19,6 +19,14 @@ CLSS public final org.netbeans.api.j2ee.core.Profile
 fld public final static java.util.Comparator<org.netbeans.api.j2ee.core.Profile> UI_COMPARATOR
 fld public final static org.netbeans.api.j2ee.core.Profile J2EE_13
 fld public final static org.netbeans.api.j2ee.core.Profile J2EE_14
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_10_FULL
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_10_WEB
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_8_FULL
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_8_WEB
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_1_FULL
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_1_WEB
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_FULL
+fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_WEB
 fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_5
 fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_6_FULL
 fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_6_WEB
@@ -26,14 +34,6 @@ fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_7_FULL
 fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_7_WEB
 fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_8_FULL
 fld public final static org.netbeans.api.j2ee.core.Profile JAVA_EE_8_WEB
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_8_FULL
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_8_WEB
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_FULL
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_WEB
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_1_FULL
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_9_1_WEB
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_10_FULL
-fld public final static org.netbeans.api.j2ee.core.Profile JAKARTA_EE_10_WEB
 meth public boolean isAtLeast(org.netbeans.api.j2ee.core.Profile)
  anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public java.lang.String getDisplayName()
diff --git a/enterprise/j2ee.dd/nbproject/org-netbeans-modules-j2ee-dd.sig b/enterprise/j2ee.dd/nbproject/org-netbeans-modules-j2ee-dd.sig
index a492e07d13fa..f1c525d98037 100644
--- a/enterprise/j2ee.dd/nbproject/org-netbeans-modules-j2ee-dd.sig
+++ b/enterprise/j2ee.dd/nbproject/org-netbeans-modules-j2ee-dd.sig
@@ -88,6 +88,7 @@ fld public final static java.lang.String MODULE = "Module"
 fld public final static java.lang.String PROPERTY_STATUS = "dd_status"
 fld public final static java.lang.String PROPERTY_VERSION = "dd_version"
 fld public final static java.lang.String SECURITY_ROLE = "SecurityRole"
+fld public final static java.lang.String VERSION_10 = "10"
 fld public final static java.lang.String VERSION_1_4 = "1.4"
 fld public final static java.lang.String VERSION_5 = "5"
 fld public final static java.lang.String VERSION_6 = "6"
@@ -175,13 +176,13 @@ fld public final static int STATE_INVALID_UNPARSABLE = 2
 fld public final static int STATE_VALID = 0
 fld public final static java.lang.String PROPERTY_STATUS = "dd_status"
 fld public final static java.lang.String PROPERTY_VERSION = "dd_version"
+fld public final static java.lang.String VERSION_10_0 = "10"
 fld public final static java.lang.String VERSION_1_4 = "1.4"
 fld public final static java.lang.String VERSION_5_0 = "5"
 fld public final static java.lang.String VERSION_6_0 = "6"
 fld public final static java.lang.String VERSION_7_0 = "7"
 fld public final static java.lang.String VERSION_8_0 = "8"
 fld public final static java.lang.String VERSION_9_0 = "9"
-fld public final static java.lang.String VERSION_10_0 = "10"
 intf org.netbeans.modules.j2ee.dd.api.common.RootInterface
 meth public abstract int addEjbRef(org.netbeans.modules.j2ee.dd.api.common.EjbRef)
 meth public abstract int addEnvEntry(org.netbeans.modules.j2ee.dd.api.common.EnvEntry)
diff --git a/enterprise/j2ee.sun.appsrv/nbproject/org-netbeans-modules-j2ee-sun-appsrv.sig b/enterprise/j2ee.sun.appsrv/nbproject/org-netbeans-modules-j2ee-sun-appsrv.sig
index ad34c5896f0f..4cbabf2622f5 100644
--- a/enterprise/j2ee.sun.appsrv/nbproject/org-netbeans-modules-j2ee-sun-appsrv.sig
+++ b/enterprise/j2ee.sun.appsrv/nbproject/org-netbeans-modules-j2ee-sun-appsrv.sig
@@ -1029,8 +1029,10 @@ meth public static org.netbeans.modules.j2ee.sun.dd.api.serverresources.Resource
 meth public static org.openide.filesystems.FileObject getResourceDirectory(org.openide.filesystems.FileObject)
 meth public static org.openide.filesystems.FileObject setUpExists(org.openide.filesystems.FileObject)
 meth public static void createFile(java.io.File,org.netbeans.modules.j2ee.sun.dd.api.serverresources.Resources,java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public static void createFile(org.netbeans.modules.j2ee.sun.ide.sunresources.wizards.ResourceConfigData,org.netbeans.modules.j2ee.sun.dd.api.serverresources.Resources,java.lang.String)
 meth public static void createFile(org.openide.filesystems.FileObject,org.netbeans.modules.j2ee.sun.dd.api.serverresources.Resources,java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public static void createResource(java.lang.String,java.lang.Object[],org.netbeans.modules.j2ee.sun.api.ServerInterface) throws java.lang.Exception
 meth public static void createSampleDataSource(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider)
 meth public static void migrateResources(java.io.File,java.lang.String)
diff --git a/enterprise/j2ee.sun.dd/nbproject/org-netbeans-modules-j2ee-sun-dd.sig b/enterprise/j2ee.sun.dd/nbproject/org-netbeans-modules-j2ee-sun-dd.sig
index 8f95c481c4e7..757534fd35a9 100644
--- a/enterprise/j2ee.sun.dd/nbproject/org-netbeans-modules-j2ee-sun-dd.sig
+++ b/enterprise/j2ee.sun.dd/nbproject/org-netbeans-modules-j2ee-sun-dd.sig
@@ -53,6 +53,7 @@ CLSS public final org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion
 fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion GLASSFISH_5_0
 fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion GLASSFISH_5_1
 fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion GLASSFISH_6
+fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion GLASSFISH_7
 fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion SUN_APPSERVER_10_0
 fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion SUN_APPSERVER_10_1
 fld public final static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion SUN_APPSERVER_7_0
@@ -149,6 +150,7 @@ meth public org.netbeans.modules.j2ee.sun.dd.api.web.SunWebApp getWebDDRoot(java
 meth public org.netbeans.modules.j2ee.sun.dd.api.web.SunWebApp getWebDDRoot(org.w3c.dom.Document) throws org.netbeans.modules.j2ee.sun.dd.api.DDException
 meth public org.netbeans.modules.j2ee.sun.dd.api.web.SunWebApp getWebDDRoot(org.xml.sax.InputSource) throws java.io.IOException,org.netbeans.modules.j2ee.sun.dd.api.DDException,org.xml.sax.SAXException
 meth public static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion getASDDVersion(org.netbeans.modules.j2ee.sun.dd.api.RootInterface)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion getASDDVersion(org.netbeans.modules.j2ee.sun.dd.api.RootInterface,org.netbeans.modules.j2ee.sun.dd.api.ASDDVersion)
 meth public static org.netbeans.modules.j2ee.sun.dd.api.DDProvider getDefault()
 meth public void merge(org.netbeans.modules.j2ee.sun.dd.api.RootInterface,java.io.Reader)
diff --git a/enterprise/j2ee.sun.ddui/nbproject/org-netbeans-modules-j2ee-sun-ddui.sig b/enterprise/j2ee.sun.ddui/nbproject/org-netbeans-modules-j2ee-sun-ddui.sig
index 3778a3a5eb1d..a48b440e1c33 100644
--- a/enterprise/j2ee.sun.ddui/nbproject/org-netbeans-modules-j2ee-sun-ddui.sig
+++ b/enterprise/j2ee.sun.ddui/nbproject/org-netbeans-modules-j2ee-sun-ddui.sig
@@ -1924,8 +1924,10 @@ CLSS public org.netbeans.modules.j2ee.sun.share.configbean.SunONEDeploymentConfi
 cons public init(javax.enterprise.deploy.model.DeployableObject)
  anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule,java.lang.String) throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule,java.lang.String,org.netbeans.modules.glassfish.tooling.data.GlassFishVersion) throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
 cons public init(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule,org.netbeans.modules.j2ee.sun.api.SunDeploymentManagerInterface) throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule,org.netbeans.modules.j2ee.sun.api.SunDeploymentManagerInterface,org.netbeans.modules.glassfish.tooling.data.GlassFishVersion) throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
 intf javax.enterprise.deploy.spi.DeploymentConfiguration
 meth public boolean supportsCreateDatasource()
diff --git a/enterprise/j2eeserver/nbproject/org-netbeans-modules-j2eeserver.sig b/enterprise/j2eeserver/nbproject/org-netbeans-modules-j2eeserver.sig
index d5cc466cfe72..8e285dd98a4b 100644
--- a/enterprise/j2eeserver/nbproject/org-netbeans-modules-j2eeserver.sig
+++ b/enterprise/j2eeserver/nbproject/org-netbeans-modules-j2eeserver.sig
@@ -297,29 +297,39 @@ innr public final static !enum Mode
 innr public final static DeploymentException
 meth public boolean canFileDeploy(java.lang.String,org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule)
 meth public boolean isRunning(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public final void addInstanceListener(org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener)
 meth public final void removeInstanceListener(org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener)
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,boolean,java.lang.String,java.lang.String,boolean) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,boolean,java.lang.String,java.lang.String,boolean,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Logger) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Mode,java.lang.String,java.lang.String,boolean) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Mode,java.lang.String,java.lang.String,boolean,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Logger) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Mode,java.lang.String,java.lang.String,boolean,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Logger,java.util.concurrent.Callable<java.lang.Void>) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
  anno 7 org.netbeans.api.annotations.common.NullAllowed()
 meth public java.lang.String getDefaultServerInstanceID()
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getServerDisplayName(java.lang.String)
 meth public java.lang.String getServerID(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getServerInstanceDisplayName(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getInstancesOfServer(java.lang.String)
 meth public java.lang.String[] getServerIDs()
 meth public java.lang.String[] getServerInstanceIDs()
 meth public java.lang.String[] getServerInstanceIDs(java.lang.Object[])
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getServerInstanceIDs(java.lang.Object[],java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getServerInstanceIDs(java.lang.Object[],java.lang.String,java.lang.String[])
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getServerInstanceIDs(java.util.Collection<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type>)
 meth public java.lang.String[] getServerInstanceIDs(java.util.Collection<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type>,org.netbeans.api.j2ee.core.Profile)
 meth public java.lang.String[] getServerInstanceIDs(java.util.Collection<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type>,org.netbeans.api.j2ee.core.Profile,java.lang.String[])
 meth public org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform getJ2eePlatform(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance getServerInstance(java.lang.String)
 meth public static org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment getDefault()
 meth public void disableCompileOnSaveSupport(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider)
@@ -363,18 +373,26 @@ hfds impl,impl2
 
 CLSS public org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule
 fld public final static java.lang.Object CLIENT
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.Object CONN
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.Object EAR
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.Object EJB
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.Object WAR
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String APP_XML = "META-INF/application.xml"
 fld public final static java.lang.String CLIENT_XML = "META-INF/application-client.xml"
 fld public final static java.lang.String CONNECTOR_XML = "META-INF/ra.xml"
 fld public final static java.lang.String EJBJAR_XML = "META-INF/ejb-jar.xml"
 fld public final static java.lang.String EJBSERVICES_XML = "META-INF/webservices.xml"
 fld public final static java.lang.String J2EE_13 = "1.3"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String J2EE_14 = "1.4"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String JAVA_EE_5 = "1.5"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String MIME_J2EE_MODULE_TARGET = "MIME-org-nb-j2eeserver-J2eeModule-BuildTarget"
 fld public final static java.lang.String PROP_MODULE_VERSION = "moduleVersion"
 fld public final static java.lang.String PROP_RESOURCE_DIRECTORY = "resourceDir"
@@ -386,6 +404,7 @@ meth public <%0 extends java.lang.Object> org.netbeans.modules.j2ee.metadata.mod
 meth public java.io.File getDeploymentConfigurationFile(java.lang.String)
 meth public java.io.File getResourceDirectory()
 meth public java.lang.Object getModuleType()
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public java.lang.String getModuleVersion()
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -442,6 +461,7 @@ fld public final static java.lang.String TOOL_WSIT = "wsit"
 intf org.openide.util.Lookup$Provider
 meth public boolean equals(java.lang.Object)
 meth public boolean isToolSupported(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public boolean supportsProfiling()
 meth public int hashCode()
 meth public java.awt.Image getIcon()
@@ -456,14 +476,19 @@ meth public java.io.File[] getClasspathEntries()
 meth public java.io.File[] getClasspathEntries(java.util.Set<org.netbeans.modules.j2ee.deployment.plugins.api.ServerLibraryDependency>)
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public java.io.File[] getPlatformRoots()
+ anno 0 java.lang.Deprecated()
 meth public java.io.File[] getToolClasspathEntries(java.lang.String)
 meth public java.lang.String getDisplayName()
 meth public java.lang.String getToolProperty(java.lang.String,java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String toString()
 meth public java.util.Set getSupportedJavaPlatformVersions()
 meth public java.util.Set getSupportedModuleTypes()
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set getSupportedSpecVersions()
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<java.lang.String> getSupportedSpecVersions(java.lang.Object)
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<org.netbeans.api.j2ee.core.Profile> getSupportedProfiles()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public java.util.Set<org.netbeans.api.j2ee.core.Profile> getSupportedProfiles(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type)
@@ -554,6 +579,7 @@ CLSS public final org.netbeans.modules.j2ee.deployment.devmodules.api.ServerMana
 meth public static java.lang.String showAddServerInstanceWizard()
 meth public static java.lang.String showAddServerInstanceWizard(java.util.Map<java.lang.String,java.lang.String>)
 meth public static void showCustomizer(java.lang.String)
+ anno 0 java.lang.Deprecated()
 supr java.lang.Object
 
 CLSS public abstract interface org.netbeans.modules.j2ee.deployment.devmodules.spi.ArtifactListener
@@ -590,6 +616,7 @@ meth public abstract void instanceAdded(java.lang.String)
 meth public abstract void instanceRemoved(java.lang.String)
 
 CLSS public abstract interface org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationImplementation
+ anno 0 java.lang.Deprecated()
 intf org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation
 meth public abstract org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule[] getModules()
 meth public abstract void addModuleListener(org.netbeans.modules.j2ee.deployment.devmodules.api.ModuleListener)
@@ -623,12 +650,15 @@ meth public abstract void removePropertyChangeListener(java.beans.PropertyChange
 
 CLSS public org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleFactory
 meth public static org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeApplication createJ2eeApplication(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationImplementation)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeApplication createJ2eeApplication(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeApplicationImplementation2)
 meth public static org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule createJ2eeModule(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule createJ2eeModule(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation2)
 supr java.lang.Object
 
 CLSS public abstract interface org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleImplementation
+ anno 0 java.lang.Deprecated()
 intf org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleBase
 meth public abstract java.lang.Object getModuleType()
 
@@ -662,6 +692,7 @@ meth public final void removeInstanceListener(org.netbeans.modules.j2ee.deployme
 meth public java.io.File[] getRequiredLibraries()
 meth public java.lang.String getDeploymentName()
 meth public java.util.Set<org.netbeans.modules.j2ee.deployment.common.api.Datasource> getModuleDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<org.netbeans.modules.j2ee.deployment.common.api.Datasource> getServerDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
 meth public org.netbeans.modules.j2ee.deployment.common.api.SourceFileMap getSourceFileMap()
 meth public org.netbeans.modules.j2ee.deployment.devmodules.api.ResourceChangeReporter getResourceChangeReporter()
@@ -671,6 +702,7 @@ meth public org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvid
 meth public org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties getInstanceProperties()
 meth public org.openide.filesystems.FileObject[] getSourceRoots()
 meth public void deployDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException,org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException
+ anno 0 java.lang.Deprecated()
 meth public void verify(org.openide.filesystems.FileObject,java.io.OutputStream) throws org.netbeans.modules.j2ee.deployment.common.api.ValidationException
 supr java.lang.Object
 hfds LOGGER,configFilesListener,configSupportImpl,configSupportImplLock,listeners
@@ -796,11 +828,13 @@ meth protected void firePropertyChange(java.beans.PropertyChangeEvent)
 meth public abstract java.lang.String getProperty(java.lang.String)
 meth public abstract java.util.Enumeration propertyNames()
 meth public abstract javax.enterprise.deploy.spi.DeploymentManager getDeploymentManager()
+ anno 0 java.lang.Deprecated()
 meth public abstract void refreshServerInstance()
 meth public abstract void setProperties(java.util.Properties)
 meth public abstract void setProperty(java.lang.String,java.lang.String)
 meth public static java.lang.String[] getInstanceList()
 meth public static org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties createInstanceProperties(java.lang.String,java.lang.String,java.lang.String) throws org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties createInstanceProperties(java.lang.String,java.lang.String,java.lang.String,java.lang.String) throws org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException
 meth public static org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties createInstanceProperties(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Map<java.lang.String,java.lang.String>) throws org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException
 meth public static org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties createInstancePropertiesNonPersistent(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Map<java.lang.String,java.lang.String>) throws org.netbeans.modules.j2ee.deployment.plugins.api.InstanceCreationException
@@ -996,6 +1030,7 @@ fld public final static java.lang.String PROP_DISPLAY_NAME = "displayName"
 fld public final static java.lang.String PROP_LIBRARIES = "libraries"
 fld public final static java.lang.String PROP_SERVER_LIBRARIES = "serverLibraries"
 meth public abstract boolean isToolSupported(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public abstract java.awt.Image getIcon()
 meth public abstract java.io.File[] getPlatformRoots()
 meth public abstract java.io.File[] getToolClasspathEntries(java.lang.String)
@@ -1007,9 +1042,13 @@ meth public final void addPropertyChangeListener(java.beans.PropertyChangeListen
 meth public final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
 meth public final void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public java.lang.String getToolProperty(java.lang.String,java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set getSupportedModuleTypes()
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<java.lang.String> getSupportedSpecVersions()
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<java.lang.String> getSupportedSpecVersions(java.lang.Object)
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<org.netbeans.api.j2ee.core.Profile> getSupportedProfiles()
 meth public java.util.Set<org.netbeans.api.j2ee.core.Profile> getSupportedProfiles(org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type)
 meth public java.util.Set<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type> getSupportedTypes()
@@ -1088,6 +1127,7 @@ meth public void finishServerInitialization() throws org.netbeans.modules.j2ee.d
 supr java.lang.Object
 
 CLSS public abstract interface org.netbeans.modules.j2ee.deployment.plugins.spi.RegistryNodeFactory
+ anno 0 java.lang.Deprecated()
 meth public abstract org.openide.nodes.Node getManagerNode(org.openide.util.Lookup)
 meth public abstract org.openide.nodes.Node getTargetNode(org.openide.util.Lookup)
 
diff --git a/enterprise/maven.j2ee/nbproject/org-netbeans-modules-maven-j2ee.sig b/enterprise/maven.j2ee/nbproject/org-netbeans-modules-maven-j2ee.sig
index 645a59a9af0c..b0cd42f07a60 100644
--- a/enterprise/maven.j2ee/nbproject/org-netbeans-modules-maven-j2ee.sig
+++ b/enterprise/maven.j2ee/nbproject/org-netbeans-modules-maven-j2ee.sig
@@ -643,29 +643,39 @@ innr public final static !enum Mode
 innr public final static DeploymentException
 meth public boolean canFileDeploy(java.lang.String,org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule)
 meth public boolean isRunning(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public final void addInstanceListener(org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener)
 meth public final void removeInstanceListener(org.netbeans.modules.j2ee.deployment.devmodules.spi.InstanceListener)
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,boolean,java.lang.String,java.lang.String,boolean) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,boolean,java.lang.String,java.lang.String,boolean,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Logger) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Mode,java.lang.String,java.lang.String,boolean) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Mode,java.lang.String,java.lang.String,boolean,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Logger) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
 meth public java.lang.String deploy(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Mode,java.lang.String,java.lang.String,boolean,org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$Logger,java.util.concurrent.Callable<java.lang.Void>) throws org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment$DeploymentException
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
  anno 7 org.netbeans.api.annotations.common.NullAllowed()
 meth public java.lang.String getDefaultServerInstanceID()
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getServerDisplayName(java.lang.String)
 meth public java.lang.String getServerID(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getServerInstanceDisplayName(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getInstancesOfServer(java.lang.String)
 meth public java.lang.String[] getServerIDs()
 meth public java.lang.String[] getServerInstanceIDs()
 meth public java.lang.String[] getServerInstanceIDs(java.lang.Object[])
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getServerInstanceIDs(java.lang.Object[],java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getServerInstanceIDs(java.lang.Object[],java.lang.String,java.lang.String[])
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String[] getServerInstanceIDs(java.util.Collection<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type>)
 meth public java.lang.String[] getServerInstanceIDs(java.util.Collection<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type>,org.netbeans.api.j2ee.core.Profile)
 meth public java.lang.String[] getServerInstanceIDs(java.util.Collection<org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule$Type>,org.netbeans.api.j2ee.core.Profile,java.lang.String[])
 meth public org.netbeans.modules.j2ee.deployment.devmodules.api.J2eePlatform getJ2eePlatform(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.modules.j2ee.deployment.devmodules.api.ServerInstance getServerInstance(java.lang.String)
 meth public static org.netbeans.modules.j2ee.deployment.devmodules.api.Deployment getDefault()
 meth public void disableCompileOnSaveSupport(org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvider)
@@ -727,6 +737,7 @@ meth public final void removeInstanceListener(org.netbeans.modules.j2ee.deployme
 meth public java.io.File[] getRequiredLibraries()
 meth public java.lang.String getDeploymentName()
 meth public java.util.Set<org.netbeans.modules.j2ee.deployment.common.api.Datasource> getModuleDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
+ anno 0 java.lang.Deprecated()
 meth public java.util.Set<org.netbeans.modules.j2ee.deployment.common.api.Datasource> getServerDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException
 meth public org.netbeans.modules.j2ee.deployment.common.api.SourceFileMap getSourceFileMap()
 meth public org.netbeans.modules.j2ee.deployment.devmodules.api.ResourceChangeReporter getResourceChangeReporter()
@@ -736,6 +747,7 @@ meth public org.netbeans.modules.j2ee.deployment.devmodules.spi.J2eeModuleProvid
 meth public org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties getInstanceProperties()
 meth public org.openide.filesystems.FileObject[] getSourceRoots()
 meth public void deployDatasources() throws org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException,org.netbeans.modules.j2ee.deployment.common.api.DatasourceAlreadyExistsException
+ anno 0 java.lang.Deprecated()
 meth public void verify(org.openide.filesystems.FileObject,java.io.OutputStream) throws org.netbeans.modules.j2ee.deployment.common.api.ValidationException
 supr java.lang.Object
 hfds LOGGER,configFilesListener,configSupportImpl,configSupportImplLock,listeners
diff --git a/enterprise/payara.eecommon/nbproject/org-netbeans-modules-payara-eecommon.sig b/enterprise/payara.eecommon/nbproject/org-netbeans-modules-payara-eecommon.sig
index eeb8bb750d34..9446f4581040 100644
--- a/enterprise/payara.eecommon/nbproject/org-netbeans-modules-payara-eecommon.sig
+++ b/enterprise/payara.eecommon/nbproject/org-netbeans-modules-payara-eecommon.sig
@@ -896,6 +896,7 @@ supr java.lang.Object
 hfds destFolder,ext,name,result,source
 
 CLSS public final org.netbeans.modules.payara.eecommon.api.config.AppClientVersion
+fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_10_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_1_3
 fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_1_4
 fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_5_0
@@ -903,12 +904,12 @@ fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClien
 fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_7_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_8_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_9_0
-fld public final static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion APP_CLIENT_10_0
 meth public int compareTo(java.lang.Object)
 meth public static org.netbeans.modules.payara.eecommon.api.config.AppClientVersion getAppClientVersion(java.lang.String)
 supr org.netbeans.modules.payara.eecommon.api.config.J2EEBaseVersion
 
 CLSS public final org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion
+fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_10_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_1_3
 fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_1_4
 fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_5_0
@@ -916,7 +917,6 @@ fld public final static org.netbeans.modules.payara.eecommon.api.config.Applicat
 fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_7_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_8_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_9_0
-fld public final static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion APPLICATION_10_0
 meth public int compareTo(java.lang.Object)
 meth public static org.netbeans.modules.payara.eecommon.api.config.ApplicationVersion getApplicationVersion(java.lang.String)
 supr org.netbeans.modules.payara.eecommon.api.config.J2EEBaseVersion
@@ -1145,6 +1145,7 @@ hfds j2eeModuleVersion,numericModuleVersion,numericSpecVersion
 CLSS public final org.netbeans.modules.payara.eecommon.api.config.J2EEVersion
 fld public final static org.netbeans.modules.payara.eecommon.api.config.J2EEVersion J2EE_1_3
 fld public final static org.netbeans.modules.payara.eecommon.api.config.J2EEVersion J2EE_1_4
+fld public final static org.netbeans.modules.payara.eecommon.api.config.J2EEVersion JAKARTAEE_10_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.J2EEVersion JAKARTAEE_8_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.J2EEVersion JAKARTAEE_9_0
 fld public final static org.netbeans.modules.payara.eecommon.api.config.J2EEVersion JAKARTAEE_9_1
diff --git a/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig b/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
index cde53fda794d..6637d0a177da 100644
--- a/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
+++ b/enterprise/payara.tooling/nbproject/org-netbeans-modules-payara-tooling.sig
@@ -1230,6 +1230,7 @@ supr org.netbeans.modules.payara.tooling.PayaraIdeException
 hfds INVALID_ADMIN_INTERFACE,INVALID_CONTAINER,SERVER_HOME_NONEXISTENT,SERVER_HOME_NO_VERSION,SERVER_HOME_NULL,SERVER_ROOT_NONEXISTENT,SERVER_ROOT_NULL,SERVER_URL_NULL
 
 CLSS public org.netbeans.modules.payara.tooling.data.IdeContext
+ anno 0 java.lang.Deprecated()
 cons public init()
 supr java.lang.Object
 
@@ -1844,6 +1845,8 @@ hfds filesets,links,lookups,paths
 CLSS public final !enum org.netbeans.modules.payara.tooling.server.config.JavaEEProfile
 fld public final static char TYPE_SEPARATOR = '-'
 fld public final static int length
+fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v10_0_0
+fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v10_0_0_web
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v1_2
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v1_3
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v1_4
@@ -1860,8 +1863,6 @@ fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEE
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v9_0_0_web
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v9_1_0
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v9_1_0_web
-fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v10_0_0
-fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile v10_0_0_web
 innr public final static !enum Type
 innr public final static !enum Version
 meth public java.lang.String toString()
@@ -1885,6 +1886,7 @@ hfds name
 
 CLSS public final static !enum org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version
  outer org.netbeans.modules.payara.tooling.server.config.JavaEEProfile
+fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v10_0_0
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v1_2
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v1_3
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v1_4
@@ -1895,7 +1897,6 @@ fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEE
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v8_0_0
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v9_0_0
 fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v9_1_0
-fld public final static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version v10_0_0
 meth public java.lang.String toString()
 meth public static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version valueOf(java.lang.String)
 meth public static org.netbeans.modules.payara.tooling.server.config.JavaEEProfile$Version[] values()
diff --git a/enterprise/web.core/nbproject/org-netbeans-modules-web-core.sig b/enterprise/web.core/nbproject/org-netbeans-modules-web-core.sig
index 91a666fe3588..4b6f4804a9dd 100644
--- a/enterprise/web.core/nbproject/org-netbeans-modules-web-core.sig
+++ b/enterprise/web.core/nbproject/org-netbeans-modules-web-core.sig
@@ -687,7 +687,7 @@ meth public boolean isTagLibRegistered(java.lang.String)
 meth public boolean isXMLSyntax()
 meth public java.lang.String toString()
 meth public java.util.Map getPrefixMapper()
-meth public void applyParsedData(java.util.Map,java.util.Map,boolean,boolean,boolean)
+meth public void applyParsedData(java.util.Map,java.util.Map<java.lang.String,java.lang.String>,boolean,boolean,boolean)
 meth public void parsingStarted()
 supr java.beans.PropertyChangeSupport
 hfds elIgnored,initialized,prefixMapper,taglibs,xmlSyntax
diff --git a/enterprise/web.el/nbproject/org-netbeans-modules-web-el.sig b/enterprise/web.el/nbproject/org-netbeans-modules-web-el.sig
index ea0c2f63ae8e..cf8923ee86f6 100644
--- a/enterprise/web.el/nbproject/org-netbeans-modules-web-el.sig
+++ b/enterprise/web.el/nbproject/org-netbeans-modules-web-el.sig
@@ -45,8 +45,11 @@ meth public abstract java.lang.String getLineCommentPrefix()
 meth public abstract java.lang.String getPreferredExtension()
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
 meth public abstract java.util.Set<java.lang.String> getBinaryLibraryPathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Set<java.lang.String> getLibraryPathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Set<java.lang.String> getSourcePathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract org.netbeans.api.lexer.Language getLexerLanguage()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 
diff --git a/enterprise/web.jsf/nbproject/org-netbeans-modules-web-jsf.sig b/enterprise/web.jsf/nbproject/org-netbeans-modules-web-jsf.sig
index 16a8d64de143..b8dbe282fb3d 100644
--- a/enterprise/web.jsf/nbproject/org-netbeans-modules-web-jsf.sig
+++ b/enterprise/web.jsf/nbproject/org-netbeans-modules-web-jsf.sig
@@ -1128,6 +1128,7 @@ fld public final static org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion J
 fld public final static org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion JSF_2_2
 fld public final static org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion JSF_2_3
 fld public final static org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion JSF_3_0
+fld public final static org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion JSF_4_0
 meth public boolean isAtLeast(org.netbeans.modules.web.jsf.api.facesmodel.JSFVersion)
  anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public java.lang.String getShortName()
diff --git a/enterprise/web.project/nbproject/org-netbeans-modules-web-project.sig b/enterprise/web.project/nbproject/org-netbeans-modules-web-project.sig
index 2b2c129fd523..8747b448a9b0 100644
--- a/enterprise/web.project/nbproject/org-netbeans-modules-web-project.sig
+++ b/enterprise/web.project/nbproject/org-netbeans-modules-web-project.sig
@@ -27,6 +27,7 @@ meth public java.io.File[] getTestFolders()
 meth public java.lang.String getBuildfile()
 meth public java.lang.String getContextPath()
 meth public java.lang.String getJavaEEVersion()
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getJavaPlatformName()
 meth public java.lang.String getLibrariesDefinition()
 meth public java.lang.String getName()
@@ -44,6 +45,7 @@ meth public void setContextPath(java.lang.String)
 meth public void setDocBase(org.openide.filesystems.FileObject)
 meth public void setJavaEEProfile(org.netbeans.api.j2ee.core.Profile)
 meth public void setJavaEEVersion(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public void setJavaPlatformName(java.lang.String)
 meth public void setJavaSourceBased(boolean)
 meth public void setLibFolder(org.openide.filesystems.FileObject)
diff --git a/enterprise/websvc.clientapi/nbproject/org-netbeans-modules-websvc-clientapi.sig b/enterprise/websvc.clientapi/nbproject/org-netbeans-modules-websvc-clientapi.sig
index fb905f079d5c..505fe5d216d1 100644
--- a/enterprise/websvc.clientapi/nbproject/org-netbeans-modules-websvc-clientapi.sig
+++ b/enterprise/websvc.clientapi/nbproject/org-netbeans-modules-websvc-clientapi.sig
@@ -211,10 +211,10 @@ meth public abstract org.netbeans.modules.websvc.api.jaxws.client.JAXWSClientVie
 
 CLSS public abstract org.netbeans.modules.websvc.spi.jaxws.client.ProjectJAXWSClientSupport
 cons public init(org.netbeans.api.project.Project,org.netbeans.spi.project.support.ant.AntProjectHelper)
+fld protected final static java.lang.String JAKARTA_EE_VERSION_10 = "jakarta-ee-version-10"
 fld protected final static java.lang.String JAKARTA_EE_VERSION_8 = "jakarta-ee-version-8"
 fld protected final static java.lang.String JAKARTA_EE_VERSION_9 = "jakarta-ee-version-9"
 fld protected final static java.lang.String JAKARTA_EE_VERSION_91 = "jakarta-ee-version-91"
-fld protected final static java.lang.String JAKARTA_EE_VERSION_10 = "jakarta-ee-version-10"
 fld protected final static java.lang.String JAVA_EE_VERSION_15 = "java-ee-version-15"
 fld protected final static java.lang.String JAVA_EE_VERSION_16 = "java-ee-version-16"
 fld protected final static java.lang.String JAVA_EE_VERSION_17 = "java-ee-version-17"
diff --git a/enterprise/websvc.jaxwsapi/nbproject/org-netbeans-modules-websvc-jaxwsapi.sig b/enterprise/websvc.jaxwsapi/nbproject/org-netbeans-modules-websvc-jaxwsapi.sig
index 2738b25331b9..fc9ac79afeb4 100644
--- a/enterprise/websvc.jaxwsapi/nbproject/org-netbeans-modules-websvc-jaxwsapi.sig
+++ b/enterprise/websvc.jaxwsapi/nbproject/org-netbeans-modules-websvc-jaxwsapi.sig
@@ -138,10 +138,10 @@ meth public abstract org.netbeans.modules.websvc.jaxws.api.JAXWSView findJAXWSVi
 
 CLSS public abstract org.netbeans.modules.websvc.jaxws.spi.ProjectJAXWSSupport
 cons public init(org.netbeans.api.project.Project,org.netbeans.spi.project.support.ant.AntProjectHelper)
+fld protected final static java.lang.String JAKARTA_EE_VERSION_10 = "jakarta-ee-version-10"
 fld protected final static java.lang.String JAKARTA_EE_VERSION_8 = "jakarta-ee-version-8"
 fld protected final static java.lang.String JAKARTA_EE_VERSION_9 = "jakarta-ee-version-9"
 fld protected final static java.lang.String JAKARTA_EE_VERSION_91 = "jakarta-ee-version-91"
-fld protected final static java.lang.String JAKARTA_EE_VERSION_10 = "jakarta-ee-version-10"
 fld protected final static java.lang.String JAVA_EE_VERSION_15 = "java-ee-version-15"
 fld protected final static java.lang.String JAVA_EE_VERSION_16 = "java-ee-version-16"
 fld protected final static java.lang.String JAVA_EE_VERSION_17 = "java-ee-version-17"
diff --git a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
index 4ed6c48e9156..46ec4905d4c1 100644
--- a/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
+++ b/extide/gradle/nbproject/org-netbeans-modules-gradle.sig
@@ -570,7 +570,7 @@ meth public static java.net.URI getWrapperDistributionURI(java.io.File) throws j
 meth public static org.netbeans.modules.gradle.api.execute.GradleDistributionManager get()
 meth public static org.netbeans.modules.gradle.api.execute.GradleDistributionManager get(java.io.File)
 supr java.lang.Object
-hfds CACHE,DIST_VERSION_PATTERN,DOWNLOAD_URI,JAVA_VERSION,JDK_COMPAT,MINIMUM_SUPPORTED_VERSION,RP,VERSION_BLACKLIST,gradleUserHome
+hfds CACHE,DIST_VERSION_PATTERN,DOWNLOAD_URI,JDK_COMPAT,MINIMUM_SUPPORTED_VERSION,RP,VERSION_BLACKLIST,gradleUserHome
 hcls DownloadTask,GradleVersionRange
 
 CLSS public final org.netbeans.modules.gradle.api.execute.GradleDistributionManager$GradleDistribution
@@ -581,6 +581,7 @@ meth public boolean isAvailable()
 meth public boolean isBlackListed()
 meth public boolean isCompatibleWithJava(int)
 meth public boolean isCompatibleWithSystemJava()
+ anno 0 java.lang.Deprecated()
 meth public int compareTo(org.netbeans.modules.gradle.api.execute.GradleDistributionManager$GradleDistribution)
 meth public int hashCode()
 meth public int lastSupportedJava()
@@ -663,6 +664,7 @@ meth public static org.netbeans.modules.gradle.api.execute.RunConfig createRunCo
  anno 0 java.lang.Deprecated()
 meth public static org.netbeans.modules.gradle.spi.actions.ProjectActionMappingProvider findActionProvider(org.netbeans.api.project.Project,org.openide.util.Lookup)
 meth public static org.netbeans.modules.gradle.spi.actions.ReplaceTokenProvider simpleReplaceTokenProvider(java.lang.String,java.lang.String)
+meth public static org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime getActiveRuntime(org.netbeans.api.project.Project)
 meth public static org.openide.execution.ExecutorTask executeGradle(org.netbeans.modules.gradle.api.execute.RunConfig,java.lang.String)
 meth public static org.openide.filesystems.FileObject extractFileObjectfromLookup(org.openide.util.Lookup)
 meth public static org.openide.filesystems.FileObject[] extractFileObjectsfromLookup(org.openide.util.Lookup)
@@ -670,6 +672,7 @@ meth public static org.openide.util.Pair getActivePlatform(java.lang.String)
  anno 0 java.lang.Deprecated()
 meth public static org.openide.util.Pair getActivePlatform(org.netbeans.api.project.Project)
  anno 0 java.lang.Deprecated()
+meth public static void setActiveRuntime(org.netbeans.api.project.Project,org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime)
 supr java.lang.Object
 hfds BRANDING_API_PREFIX,EXECUTOR_FACTORY,GRADLE_TASKS,LOG,OPTION_MESSAGE_PREFIX,TRUST_DIALOG_OPTION_IDS
 
@@ -797,6 +800,7 @@ innr public final static !enum DownloadLibsRule
 innr public final static !enum DownloadMiscRule
 innr public final static !enum GradleExecutionRule
 meth public boolean getNoRebuild()
+ anno 0 java.lang.Deprecated()
 meth public boolean getUseConfigCache()
 meth public boolean isAlwaysShowOutput()
 meth public boolean isCacheDisabled()
@@ -843,6 +847,7 @@ meth public void setGradleUserHome(java.io.File)
 meth public void setGradleVersion(java.lang.String)
 meth public void setHideEmptyConfigurations(boolean)
 meth public void setNoRebuild(boolean)
+ anno 0 java.lang.Deprecated()
 meth public void setOffline(boolean)
 meth public void setOpenLazy(boolean)
  anno 0 java.lang.Deprecated()
@@ -972,6 +977,34 @@ meth public abstract void removeChangeListener(javax.swing.event.ChangeListener)
 CLSS public abstract interface org.netbeans.modules.gradle.spi.execute.GradleJavaPlatformProvider
 meth public abstract java.io.File getJavaHome() throws java.io.FileNotFoundException
 
+CLSS public abstract interface org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager
+fld public final static java.lang.String DEFAULT_RUNTIME_ID = "default_platform"
+innr public final static JavaRuntime
+meth public abstract java.util.Map<java.lang.String,org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime> getAvailableRuntimes()
+meth public java.util.Optional<java.lang.Runnable> manageRuntimesAction()
+meth public static org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime createJavaRuntime(java.lang.String,java.io.File)
+ anno 1 org.netbeans.api.annotations.common.NonNull()
+meth public static org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime createJavaRuntime(java.lang.String,java.lang.String,java.io.File)
+ anno 1 org.netbeans.api.annotations.common.NonNull()
+meth public void addChangeListener(javax.swing.event.ChangeListener)
+meth public void removeChangeListener(javax.swing.event.ChangeListener)
+
+CLSS public final static org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime
+ outer org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager
+intf java.lang.Comparable<org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime>
+meth public boolean equals(java.lang.Object)
+meth public boolean isBroken()
+meth public int compareTo(org.netbeans.modules.gradle.spi.execute.JavaRuntimeManager$JavaRuntime)
+meth public int hashCode()
+meth public java.io.File getJavaHome()
+meth public java.lang.String getDisplayName()
+meth public java.lang.String getId()
+meth public java.lang.String toString()
+supr java.lang.Object
+hfds displayName,id,javaHome
+
+CLSS abstract interface org.netbeans.modules.gradle.spi.execute.package-info
+
 CLSS public abstract org.netbeans.modules.gradle.spi.newproject.BaseGradleWizardIterator
 cons public init()
 fld public final static java.lang.String PROP_DESCRIPTION = "description"
diff --git a/groovy/groovy.editor/nbproject/org-netbeans-modules-groovy-editor.sig b/groovy/groovy.editor/nbproject/org-netbeans-modules-groovy-editor.sig
index f25508d0d9eb..62e67f1e6f27 100644
--- a/groovy/groovy.editor/nbproject/org-netbeans-modules-groovy-editor.sig
+++ b/groovy/groovy.editor/nbproject/org-netbeans-modules-groovy-editor.sig
@@ -379,8 +379,11 @@ meth public abstract java.lang.String getLineCommentPrefix()
 meth public abstract java.lang.String getPreferredExtension()
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
 meth public abstract java.util.Set<java.lang.String> getBinaryLibraryPathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Set<java.lang.String> getLibraryPathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Set<java.lang.String> getSourcePathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract org.netbeans.api.lexer.Language getLexerLanguage()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 
diff --git a/ide/api.debugger/nbproject/org-netbeans-api-debugger.sig b/ide/api.debugger/nbproject/org-netbeans-api-debugger.sig
index 3d4bf314d895..17a719b12452 100644
--- a/ide/api.debugger/nbproject/org-netbeans-api-debugger.sig
+++ b/ide/api.debugger/nbproject/org-netbeans-api-debugger.sig
@@ -10,6 +10,12 @@ CLSS public abstract interface java.io.Serializable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -510,6 +516,7 @@ meth public abstract void setDestructor(org.netbeans.api.debugger.DebuggerEngine
 supr java.lang.Object
 
 CLSS public abstract org.netbeans.spi.debugger.DelegatingSessionProvider
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public abstract org.netbeans.api.debugger.Session getSession(org.netbeans.api.debugger.DebuggerInfo)
 supr java.lang.Object
diff --git a/ide/csl.api/nbproject/org-netbeans-modules-csl-api.sig b/ide/csl.api/nbproject/org-netbeans-modules-csl-api.sig
index bc8d1a467bc6..7d0ba6eabb0a 100644
--- a/ide/csl.api/nbproject/org-netbeans-modules-csl-api.sig
+++ b/ide/csl.api/nbproject/org-netbeans-modules-csl-api.sig
@@ -12,6 +12,12 @@ CLSS public abstract interface java.lang.Cloneable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -250,6 +256,7 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,int)
 fld protected int updateMask
 fld public final static int ABBREV_RESET = 4
+ anno 0 java.lang.Deprecated()
 fld public final static int CLEAR_STATUS_TEXT = 32
 fld public final static int MAGIC_POSITION_RESET = 2
 fld public final static int NO_RECORDING = 64
@@ -266,6 +273,7 @@ meth protected boolean asynchonous()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object createDefaultValue(java.lang.String)
 meth protected java.lang.Object findValue(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object getDefaultShortDescription()
 meth protected void actionNameUpdate(java.lang.String)
 meth public abstract void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -389,9 +397,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -406,10 +416,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -426,12 +440,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
@@ -473,6 +490,7 @@ hcls BaseKitLocalizedAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$GotoDeclarationAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public boolean gotoDeclaration(javax.swing.text.JTextComponent)
@@ -668,11 +686,14 @@ meth public abstract org.netbeans.modules.csl.api.ElementKind getKind()
 
 CLSS public final org.netbeans.modules.csl.api.CslActions
 meth public static javax.swing.Action createCamelCasePositionAction(javax.swing.Action,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action createDeleteToCamelCasePositionAction(javax.swing.Action,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action createGoToDeclarationAction()
 meth public static javax.swing.Action createGoToMarkOccurrencesAction(boolean)
 meth public static javax.swing.Action createInstantRenameAction()
 meth public static javax.swing.Action createSelectCamelCasePositionAction(javax.swing.Action,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action createSelectCodeElementAction(boolean)
 meth public static javax.swing.Action createToggleBlockCommentAction()
 supr java.lang.Object
@@ -742,12 +763,14 @@ supr java.lang.Object
 hfds alternatives,element,fileObject,invalidMessage,offset,url
 
 CLSS public final org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition
+ anno 0 java.lang.Deprecated()
 cons public init(javax.swing.Action)
 fld public final static java.lang.String deleteNextCamelCasePosition = "delete-next-camel-case-position"
 meth protected void moveToNewOffset(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 supr org.netbeans.modules.csl.api.SelectNextCamelCasePosition
 
 CLSS public final org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition
+ anno 0 java.lang.Deprecated()
 cons public init(javax.swing.Action)
 fld public final static java.lang.String deletePreviousCamelCasePosition = "delete-previous-camel-case-position"
 meth protected void moveToNewOffset(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
@@ -808,6 +831,7 @@ cons public init(org.netbeans.editor.BaseDocument)
 innr public final static Edit
 meth public int firstEditLine(javax.swing.text.Document)
 meth public int firstLine(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String toString()
 meth public javax.swing.text.Position createPosition(int)
 meth public javax.swing.text.Position createPosition(int,javax.swing.text.Position$Bias)
@@ -816,6 +840,7 @@ meth public org.netbeans.modules.csl.api.OffsetRange getRange()
 meth public void apply()
 meth public void applyTo(javax.swing.text.Document)
 meth public void applyToDocument(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public void setFormatAll(boolean)
 supr java.lang.Object
 hfds LOG,doc,edits,formatAll,positions
@@ -957,6 +982,7 @@ meth public boolean gotoDeclaration(javax.swing.text.JTextComponent)
 supr org.netbeans.editor.ext.ExtKit$GotoDeclarationAction
 
 CLSS public final org.netbeans.modules.csl.api.GoToMarkOccurrencesAction
+ anno 0 java.lang.Deprecated()
 cons public init(boolean)
 meth protected java.lang.Object getDefaultShortDescription()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -972,8 +998,11 @@ meth public abstract java.lang.String getLineCommentPrefix()
 meth public abstract java.lang.String getPreferredExtension()
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
 meth public abstract java.util.Set<java.lang.String> getBinaryLibraryPathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Set<java.lang.String> getLibraryPathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Set<java.lang.String> getSourcePathIds()
+ anno 0 java.lang.Deprecated()
 meth public abstract org.netbeans.api.lexer.Language getLexerLanguage()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 
@@ -1126,6 +1155,7 @@ meth public abstract void open(org.openide.filesystems.FileObject,org.netbeans.m
  anno 2 org.netbeans.api.annotations.common.NonNull()
 
 CLSS public org.netbeans.modules.csl.api.InstantRenameAction
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1141,23 +1171,28 @@ meth public abstract java.util.Set<org.netbeans.modules.csl.api.OffsetRange> get
 
 CLSS public abstract interface org.netbeans.modules.csl.api.KeystrokeHandler
 meth public abstract boolean afterCharInserted(javax.swing.text.Document,int,javax.swing.text.JTextComponent,char) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 3 org.netbeans.api.annotations.common.NonNull()
 meth public abstract boolean beforeCharInserted(javax.swing.text.Document,int,javax.swing.text.JTextComponent,char) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 3 org.netbeans.api.annotations.common.NonNull()
 meth public abstract boolean charBackspaced(javax.swing.text.Document,int,javax.swing.text.JTextComponent,char) throws javax.swing.text.BadLocationException
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 3 org.netbeans.api.annotations.common.NonNull()
 meth public abstract int beforeBreak(javax.swing.text.Document,int,javax.swing.text.JTextComponent) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 3 org.netbeans.api.annotations.common.NonNull()
 meth public abstract int getNextWordOffset(javax.swing.text.Document,int,boolean)
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
 meth public abstract java.util.List<org.netbeans.modules.csl.api.OffsetRange> findLogicalRanges(org.netbeans.modules.csl.spi.ParserResult,int)
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public abstract org.netbeans.modules.csl.api.OffsetRange findMatching(javax.swing.text.Document,int)
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
 
@@ -1173,6 +1208,7 @@ meth public static org.netbeans.modules.csl.api.Modifier[] values()
 supr java.lang.Enum<org.netbeans.modules.csl.api.Modifier>
 
 CLSS public org.netbeans.modules.csl.api.NextCamelCasePosition
+ anno 0 java.lang.Deprecated()
 cons protected init(java.lang.String,javax.swing.Action)
 cons public init(javax.swing.Action)
 fld public final static java.lang.String nextCamelCasePosition = "next-camel-case-position"
@@ -1235,6 +1271,7 @@ meth public abstract boolean canPreview()
 meth public abstract org.netbeans.modules.csl.api.EditList getEditList() throws java.lang.Exception
 
 CLSS public org.netbeans.modules.csl.api.PreviousCamelCasePosition
+ anno 0 java.lang.Deprecated()
 cons protected init(java.lang.String,javax.swing.Action)
 cons public init(javax.swing.Action)
 fld public final static java.lang.String previousCamelCasePosition = "previous-camel-case-position"
@@ -1290,6 +1327,7 @@ fld public org.netbeans.modules.csl.spi.ParserResult parserResult
 supr java.lang.Object
 
 CLSS public final org.netbeans.modules.csl.api.SelectCodeElementAction
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 fld public final static java.lang.String selectNextElementAction = "select-element-next"
 fld public final static java.lang.String selectPreviousElementAction = "select-element-previous"
@@ -1300,6 +1338,7 @@ hfds selectNext
 hcls SelectionHandler,SelectionInfo
 
 CLSS public org.netbeans.modules.csl.api.SelectNextCamelCasePosition
+ anno 0 java.lang.Deprecated()
 cons protected init(java.lang.String,javax.swing.Action)
 cons public init(javax.swing.Action)
 fld public final static java.lang.String selectNextCamelCasePosition = "select-next-camel-case-position"
@@ -1307,6 +1346,7 @@ meth protected void moveToNewOffset(javax.swing.text.JTextComponent,int) throws
 supr org.netbeans.modules.csl.api.NextCamelCasePosition
 
 CLSS public org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition
+ anno 0 java.lang.Deprecated()
 cons protected init(java.lang.String,javax.swing.Action)
 cons public init(javax.swing.Action)
 fld public final static java.lang.String selectPreviousCamelCasePosition = "select-previous-camel-case-position"
@@ -1392,6 +1432,7 @@ supr java.lang.Object
 hfds customFilter,expandDepth,filterable,sortable
 
 CLSS public org.netbeans.modules.csl.api.ToggleBlockCommentAction
+ anno 0 java.lang.Deprecated()
 cons public init()
 cons public init(org.netbeans.modules.csl.spi.CommentHandler)
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1584,12 +1625,14 @@ meth public static boolean open(org.openide.filesystems.FileObject,int,java.lang
 meth public static int getLastKnownCaretOffset(org.netbeans.modules.parsing.api.Snapshot,java.util.EventObject)
 meth public static int getLineIndent(javax.swing.text.Document,int)
 meth public static int getLineIndent(org.netbeans.editor.BaseDocument,int)
+ anno 0 java.lang.Deprecated()
 meth public static int getRowEnd(java.lang.CharSequence,int) throws javax.swing.text.BadLocationException
 meth public static int getRowFirstNonWhite(java.lang.CharSequence,int) throws javax.swing.text.BadLocationException
 meth public static int getRowLastNonWhite(java.lang.CharSequence,int) throws javax.swing.text.BadLocationException
 meth public static int getRowStart(java.lang.CharSequence,int) throws javax.swing.text.BadLocationException
 meth public static int setLineIndentation(javax.swing.text.Document,int,int) throws javax.swing.text.BadLocationException
 meth public static int setLineIndentation(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.String truncate(java.lang.String,int)
 meth public static javax.swing.text.Document getADocument(org.openide.filesystems.FileObject,boolean)
 meth public static javax.swing.text.Document getADocument(org.openide.filesystems.FileObject,boolean,boolean)
@@ -1598,13 +1641,15 @@ meth public static javax.swing.text.JTextComponent getPaneFor(org.openide.filesy
 meth public static org.netbeans.editor.BaseDocument getBaseDocument(org.openide.filesystems.FileObject,boolean)
  anno 0 java.lang.Deprecated()
 meth public static org.netbeans.editor.BaseDocument getDocument(org.openide.filesystems.FileObject,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.editor.BaseDocument getDocument(org.openide.filesystems.FileObject,boolean,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.filesystems.FileObject findFileObject(javax.swing.text.Document)
 meth public static org.openide.filesystems.FileObject findFileObject(javax.swing.text.JTextComponent)
 meth public static org.openide.text.CloneableEditorSupport findCloneableEditorSupport(org.openide.filesystems.FileObject)
 meth public static void extractZip(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject) throws java.io.IOException
 supr java.lang.Object
-hfds LOG,enforcedCaretOffsets
+hfds BIG_FILE_THRESHOLD_MB,LOG,enforcedCaretOffsets
 
 CLSS public abstract interface !annotation org.netbeans.modules.csl.spi.LanguageRegistration
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=SOURCE)
diff --git a/ide/css.lib/nbproject/org-netbeans-modules-css-lib.sig b/ide/css.lib/nbproject/org-netbeans-modules-css-lib.sig
index 90e5dcaebc38..1bc66ed4c63b 100644
--- a/ide/css.lib/nbproject/org-netbeans-modules-css-lib.sig
+++ b/ide/css.lib/nbproject/org-netbeans-modules-css-lib.sig
@@ -973,6 +973,7 @@ fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCate
 fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory POSITIONING
 fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory RUBY
 fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory SAFARI
+fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory SIZING
 fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory SPEECH
 fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory TEXT
 fld public final static org.netbeans.modules.css.lib.api.properties.PropertyCategory TRANSFORMATIONS_2D
@@ -1135,6 +1136,7 @@ CLSS public static org.netbeans.modules.css.lib.api.properties.TokenAcceptor$Has
 cons public init(java.lang.String)
 meth public boolean accepts(org.netbeans.modules.css.lib.api.properties.Token)
 supr org.netbeans.modules.css.lib.api.properties.TokenAcceptor
+hfds COLOR_PATTERN
 
 CLSS public static org.netbeans.modules.css.lib.api.properties.TokenAcceptor$HashColorAplha
  outer org.netbeans.modules.css.lib.api.properties.TokenAcceptor
diff --git a/ide/dlight.nativeexecution/nbproject/org-netbeans-modules-dlight-nativeexecution.sig b/ide/dlight.nativeexecution/nbproject/org-netbeans-modules-dlight-nativeexecution.sig
index 2cbe680fe285..ca3f618a3e10 100644
--- a/ide/dlight.nativeexecution/nbproject/org-netbeans-modules-dlight-nativeexecution.sig
+++ b/ide/dlight.nativeexecution/nbproject/org-netbeans-modules-dlight-nativeexecution.sig
@@ -26,6 +26,12 @@ CLSS public abstract interface java.lang.Cloneable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -176,6 +182,7 @@ cons public init(java.lang.Object)
 supr java.util.EventObject
 
 CLSS public abstract interface org.netbeans.api.extexecution.input.LineProcessor
+ anno 0 java.lang.Deprecated()
 intf java.io.Closeable
 meth public abstract void close()
 meth public abstract void processLine(java.lang.String)
diff --git a/ide/editor.deprecated.pre65formatting/nbproject/org-netbeans-modules-editor-deprecated-pre65formatting.sig b/ide/editor.deprecated.pre65formatting/nbproject/org-netbeans-modules-editor-deprecated-pre65formatting.sig
index 209d466b3e7a..a488c628321a 100644
--- a/ide/editor.deprecated.pre65formatting/nbproject/org-netbeans-modules-editor-deprecated-pre65formatting.sig
+++ b/ide/editor.deprecated.pre65formatting/nbproject/org-netbeans-modules-editor-deprecated-pre65formatting.sig
@@ -1870,6 +1870,7 @@ intf java.util.EventListener
 meth public abstract void foldHierarchyChanged(org.netbeans.api.editor.fold.FoldHierarchyEvent)
 
 CLSS public org.netbeans.editor.Abbrev
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.editor.EditorUI,boolean,boolean)
 fld protected org.netbeans.editor.EditorUI editorUI
 intf java.beans.PropertyChangeListener
@@ -1961,6 +1962,7 @@ hcls DeprecatedFoldAction
 
 CLSS public static org.netbeans.editor.ActionFactory$AbbrevExpandAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1969,6 +1971,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$AbbrevResetAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2070,6 +2073,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$ExpandFold
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2216,6 +2220,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$RemoveWordNextAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2223,6 +2228,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$RemoveWordPreviousAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2230,6 +2236,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$RunMacroAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 meth protected void error(javax.swing.text.JTextComponent,java.lang.String)
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2277,6 +2284,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$StartMacroRecordingAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2292,6 +2300,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$StopMacroRecordingAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected org.netbeans.editor.MacroDialogSupport getMacroDialogSupport(java.lang.Class)
@@ -2301,6 +2310,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$ToggleLineNumbersAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected boolean isLineNumbersVisible()
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -2330,6 +2340,7 @@ hfds paneRef,serialVersionUID,toggleButtonRef
 
 CLSS public static org.netbeans.editor.ActionFactory$ToggleTypingModeAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2371,6 +2382,7 @@ meth public static boolean startsWith(char[],char[])
 meth public static char[] concat(char[],char[])
 meth public static char[] createSpacesBuffer(int)
 meth public static char[] createWhiteSpaceFillBuffer(int,int,int)
+ anno 0 java.lang.Deprecated()
 meth public static char[] createWhitespaceFillBuffer(int,int,int)
 meth public static char[] extract(char[],int,int)
 meth public static char[] getSpacesBuffer(int)
@@ -2617,6 +2629,7 @@ meth public org.netbeans.editor.AnnotationDesc getActiveAnnotation(int)
 meth public org.netbeans.editor.AnnotationDesc getActiveAnnotation(org.netbeans.editor.Mark)
 meth public org.netbeans.editor.AnnotationDesc getAnnotation(int,java.lang.String)
 meth public org.netbeans.editor.AnnotationDesc[] getPasiveAnnotations(int)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.AnnotationDesc[] getPassiveAnnotations(int)
 meth public org.netbeans.editor.AnnotationDesc[] getPassiveAnnotationsForLine(int)
 meth public void addAnnotation(org.netbeans.editor.AnnotationDesc)
@@ -2648,6 +2661,7 @@ meth public java.util.Iterator<org.netbeans.editor.AnnotationDesc> getAnnotation
 meth public org.netbeans.editor.AnnotationDesc activateNext()
 meth public org.netbeans.editor.AnnotationDesc getActive()
 meth public org.netbeans.editor.AnnotationDesc[] getPasive()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.AnnotationDesc[] getPassive()
 meth public void addAnnotation(org.netbeans.editor.AnnotationDesc)
 meth public void refreshAnnotations()
@@ -2689,6 +2703,7 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,int)
 fld protected int updateMask
 fld public final static int ABBREV_RESET = 4
+ anno 0 java.lang.Deprecated()
 fld public final static int CLEAR_STATUS_TEXT = 32
 fld public final static int MAGIC_POSITION_RESET = 2
 fld public final static int NO_RECORDING = 64
@@ -2705,6 +2720,7 @@ meth protected boolean asynchonous()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object createDefaultValue(java.lang.String)
 meth protected java.lang.Object findValue(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object getDefaultShortDescription()
 meth protected void actionNameUpdate(java.lang.String)
 meth public abstract void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2778,6 +2794,7 @@ meth public void mousePressed(java.awt.event.MouseEvent)
 meth public void mouseReleased(java.awt.event.MouseEvent)
 meth public void moveDot(int)
 meth public void moveDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void paint(java.awt.Graphics)
 meth public void propertyChange(java.beans.PropertyChangeEvent)
 meth public void refresh(boolean)
@@ -2787,7 +2804,9 @@ meth public void setBlinkRate(int)
 meth public void setDot(int)
 meth public void setDot(int,boolean)
 meth public void setDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void setDot(int,java.awt.Rectangle,int,boolean)
+ anno 0 java.lang.Deprecated()
 meth public void setMagicCaretPosition(java.awt.Point)
 meth public void setSelectionVisible(boolean)
 meth public void setVisible(boolean)
@@ -2799,6 +2818,7 @@ hcls ListenerImpl,MouseState
 CLSS public org.netbeans.editor.BaseDocument
 cons public init(boolean,java.lang.String)
 cons public init(java.lang.Class,boolean)
+ anno 0 java.lang.Deprecated()
 fld protected boolean inited
 fld protected boolean modified
 fld protected javax.swing.text.Element defaultRootElem
@@ -2808,7 +2828,9 @@ fld public final static java.lang.String FORMATTER = "formatter"
 fld public final static java.lang.String ID_PROP = "id"
 fld public final static java.lang.String KIT_CLASS_PROP = "kit-class"
 fld public final static java.lang.String LINE_BATCH_SIZE = "line-batch-size"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LINE_LIMIT_PROP = "line-limit"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LS_CR = "\r"
 fld public final static java.lang.String LS_CRLF = "\r\n"
 fld public final static java.lang.String LS_LF = "\n"
@@ -2845,13 +2867,17 @@ meth public char[] getChars(int,int) throws javax.swing.text.BadLocationExceptio
 meth public char[] getChars(int[]) throws javax.swing.text.BadLocationException
 meth public final boolean isAtomicLock()
 meth public final java.lang.Class getKitClass()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicLock()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicUnlock()
+ anno 0 java.lang.Deprecated()
 meth public final void breakAtomicLock()
 meth public final void extWriteLock()
 meth public final void extWriteUnlock()
 meth public int find(org.netbeans.editor.Finder,int,int) throws javax.swing.text.BadLocationException
 meth public int getShiftWidth()
+ anno 0 java.lang.Deprecated()
 meth public int getTabSize()
 meth public int processText(org.netbeans.editor.TextBatchProcessor,int,int) throws javax.swing.text.BadLocationException
 meth public java.lang.String getText(int[]) throws javax.swing.text.BadLocationException
@@ -2864,6 +2890,7 @@ meth public javax.swing.text.Position createPosition(int,javax.swing.text.Positi
 meth public org.netbeans.editor.Annotations getAnnotations()
 meth public org.netbeans.editor.CharSeq getText()
 meth public org.netbeans.editor.SyntaxSupport getSyntaxSupport()
+ anno 0 java.lang.Deprecated()
 meth public void addAtomicLockListener(org.netbeans.api.editor.document.AtomicLockListener)
 meth public void addAtomicLockListener(org.netbeans.editor.AtomicLockListener)
  anno 0 java.lang.Deprecated()
@@ -2890,11 +2917,13 @@ meth public void removePostModificationDocumentListener(javax.swing.event.Docume
 meth public void removeUpdateDocumentListener(javax.swing.event.DocumentListener)
 meth public void render(java.lang.Runnable)
 meth public void repaintBlock(int,int)
+ anno 0 java.lang.Deprecated()
 meth public void replace(int,int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException
 meth public void resetUndoMerge()
 meth public void runAtomic(java.lang.Runnable)
 meth public void runAtomicAsUser(java.lang.Runnable)
 meth public void setPostModificationDocumentListener(javax.swing.event.DocumentListener)
+ anno 0 java.lang.Deprecated()
 meth public void write(java.io.Writer,int,int) throws java.io.IOException,javax.swing.text.BadLocationException
 supr javax.swing.text.AbstractDocument
 hfds DEACTIVATE_LEXER_THRESHOLD,EDITABLE_PROP,LAST_MODIFICATION_TIMESTAMP_PROP,LOG,LOG_LISTENER,MODIFICATION_LISTENER_PROP,SUPPORTS_MODIFICATION_LISTENER_PROP,VERSION_PROP,annotations,annotationsLock,atomicDepth,atomicEdits,atomicLockEventInstance,atomicLockListenerList,composedText,debugNoText,debugRead,debugStack,deprecatedKitClass,filterBypass,fixLineSyntaxState,identifierAcceptor,lastModifyUndoEdit,lastPositionEditedByTyping,lineRootElement,mimeType,modifiable,postModificationDepth,postModificationDocumentListener,postModificationDocumentListenerList,prefs,prefsListener,removeUpdateLineUndo,runExclusiveDepth,shiftWidth,syntaxSupport,tabSize,text,undoEditWrappers,undoMergeReset,updateDocumentListenerList,weakPrefsListener,whitespaceAcceptor
@@ -2924,9 +2953,11 @@ meth public boolean isInRedo()
 meth public boolean isInUndo()
 meth public boolean replaceEdit(javax.swing.undo.UndoableEdit)
 meth public char[] getChars()
+ anno 0 java.lang.Deprecated()
 meth public final javax.swing.text.AttributeSet getChangeAttributes()
 meth public int getLFCount()
 meth public int getLine()
+ anno 0 java.lang.Deprecated()
 meth public int getSyntaxUpdateOffset()
 meth public java.lang.String getRedoPresentationName()
 meth public java.lang.String getText()
@@ -3086,9 +3117,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -3103,10 +3136,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -3186,6 +3223,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$DefaultKeyTypedAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected void checkIndent(javax.swing.text.JTextComponent,java.lang.String)
@@ -3197,6 +3235,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$DeleteCharAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 fld protected boolean nextChar
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -3248,6 +3287,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$InsertBreakAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object beforeBreak(javax.swing.text.JTextComponent,org.netbeans.editor.BaseDocument,javax.swing.text.Caret)
@@ -3295,6 +3335,7 @@ hfds actionNames,serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$NextWordAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 meth protected int getNextWordOffset(javax.swing.text.JTextComponent) throws javax.swing.text.BadLocationException
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -3328,6 +3369,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$PreviousWordAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 meth protected int getPreviousWordOffset(javax.swing.text.JTextComponent) throws javax.swing.text.BadLocationException
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -3488,6 +3530,7 @@ supr javax.swing.text.View
 hfds component,startY
 
 CLSS public abstract interface org.netbeans.editor.CharSeq
+ anno 0 java.lang.Deprecated()
 meth public abstract char charAt(int)
 meth public abstract int length()
 
@@ -3598,6 +3641,7 @@ supr javax.swing.AbstractAction
 hfds pcl
 
 CLSS public org.netbeans.editor.DialogSupport
+ anno 0 java.lang.Deprecated()
 innr public abstract interface static DialogFactory
 meth public static java.awt.Dialog createDialog(java.lang.String,javax.swing.JPanel,boolean,javax.swing.JButton[],boolean,int,int,java.awt.event.ActionListener)
 meth public static void setDialogFactory(org.netbeans.editor.DialogSupport$DialogFactory)
@@ -3614,6 +3658,7 @@ meth public static void copyText(javax.swing.text.Document,int,int,char[],int) t
 supr java.lang.Object
 
 CLSS public org.netbeans.editor.EditorDebug
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.String debugArray(int[])
 meth public static java.lang.String debugArray(java.lang.Object[])
 meth public static java.lang.String debugBlocks(org.netbeans.editor.BaseDocument,int[])
@@ -3632,6 +3677,7 @@ meth public static void test(javax.swing.text.JTextComponent)
 supr java.lang.Object
 
 CLSS public org.netbeans.editor.EditorState
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.Object get(java.lang.Object)
 meth public static java.util.HashMap getStateObject()
 meth public static void put(java.lang.Object,java.lang.Object)
@@ -3658,9 +3704,11 @@ intf javax.swing.event.ChangeListener
 meth protected final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
 meth protected int textLimitWidth()
 meth protected java.util.Map createColoringMap()
+ anno 0 java.lang.Deprecated()
 meth protected javax.swing.JComponent createExtComponent()
 meth protected javax.swing.JToolBar createToolBarComponent()
 meth protected static java.util.Map<java.lang.String,org.netbeans.editor.Coloring> getSharedColoringMap(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth protected void initGlyphCorner(javax.swing.JScrollPane)
 meth protected void installUI(javax.swing.text.JTextComponent)
 meth protected void modelChanged(org.netbeans.editor.BaseDocument,org.netbeans.editor.BaseDocument)
@@ -3674,7 +3722,9 @@ meth public boolean hasExtComponent()
 meth public boolean isGlyphGutterVisible()
 meth public boolean isLineNumberEnabled()
 meth public boolean updateVirtualHeight(int)
+ anno 0 java.lang.Deprecated()
 meth public boolean updateVirtualWidth(int)
+ anno 0 java.lang.Deprecated()
 meth public final int getSideBarWidth()
 meth public final javax.swing.text.JTextComponent getComponent()
 meth public final org.netbeans.editor.BaseDocument getDocument()
@@ -3689,13 +3739,17 @@ meth public java.awt.Rectangle getExtentBounds(java.awt.Rectangle)
 meth public java.lang.Object getComponentLock()
 meth public java.lang.Object getProperty(java.lang.Object)
 meth public java.util.Map<java.lang.String,org.netbeans.editor.Coloring> getColoringMap()
+ anno 0 java.lang.Deprecated()
 meth public javax.swing.JComponent getExtComponent()
 meth public javax.swing.JPopupMenu getPopupMenu()
 meth public javax.swing.JToolBar getToolBarComponent()
 meth public org.netbeans.api.editor.StickyWindowSupport getStickyWindowSupport()
 meth public org.netbeans.editor.Abbrev getAbbrev()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Coloring getColoring(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Coloring getDefaultColoring()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.PopupManager getPopupManager()
 meth public org.netbeans.editor.StatusBar getStatusBar()
 meth public org.netbeans.editor.WordMatch getWordMatch()
@@ -3706,7 +3760,9 @@ meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyC
 meth public void adjustCaret(int)
 meth public void adjustWindow(int)
 meth public void caretMoveDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void caretSetDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void hidePopupMenu()
 meth public void mouseClicked(java.awt.event.MouseEvent)
 meth public void mouseEntered(java.awt.event.MouseEvent)
@@ -3722,6 +3778,7 @@ meth public void repaint(int,int)
 meth public void repaintBlock(int,int) throws javax.swing.text.BadLocationException
 meth public void repaintOffset(int) throws javax.swing.text.BadLocationException
 meth public void scrollRectToVisible(java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void setLineNumberEnabled(boolean)
 meth public void setPopupMenu(javax.swing.JPopupMenu)
 meth public void showPopupMenu(int,int)
@@ -4113,6 +4170,7 @@ CLSS public abstract interface static org.netbeans.editor.GapObjectArray$RemoveU
 meth public abstract void removeUpdate(java.lang.Object)
 
 CLSS public abstract interface org.netbeans.editor.GapStart
+ anno 0 java.lang.Deprecated()
 meth public abstract int getGapStart()
 
 CLSS public org.netbeans.editor.GlyphGutter
@@ -4142,7 +4200,9 @@ hcls EditorUIListener,GutterMouseListener
 
 CLSS public org.netbeans.editor.GuardedDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class,boolean,javax.swing.text.StyleContext)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 cons public init(java.lang.String,boolean,javax.swing.text.StyleContext)
 fld protected java.lang.String normalStyleName
@@ -4194,6 +4254,7 @@ intf org.netbeans.editor.TokenID
 meth public abstract java.lang.String getImage()
 
 CLSS public abstract org.netbeans.editor.ImplementationProvider
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public abstract java.util.ResourceBundle getResourceBundle(java.lang.String)
 meth public abstract javax.swing.Action[] getGlyphGutterActions(javax.swing.text.JTextComponent)
@@ -4217,6 +4278,7 @@ meth public static void addEntry(javax.swing.text.JTextComponent,int)
 meth public static void checkAddEntry()
 meth public static void checkAddEntry(javax.swing.text.JTextComponent)
 meth public static void checkAddEntry(javax.swing.text.JTextComponent,int)
+ anno 0 java.lang.Deprecated()
 meth public static void jumpNext(javax.swing.text.JTextComponent)
 meth public static void jumpNextComponent(javax.swing.text.JTextComponent)
 meth public static void jumpPrev(javax.swing.text.JTextComponent)
@@ -4291,6 +4353,7 @@ hfds modelToViewDG,viewToModelDG
 hcls ModelToViewDG,ViewToModelDG
 
 CLSS public org.netbeans.editor.LineSeparatorConversion
+ anno 0 java.lang.Deprecated()
 fld public final static char LS = '\u2028'
 fld public final static char PS = '\u2029'
 fld public final static java.lang.String LS_LS
@@ -4335,6 +4398,7 @@ supr java.lang.Object
 hfds convertedText,lastCharCR,readWholeBuffer,reader
 
 CLSS public org.netbeans.editor.LocaleSupport
+ anno 0 java.lang.Deprecated()
 cons public init()
 innr public abstract interface static Localizer
 meth public static char getChar(java.lang.String,char)
@@ -4350,6 +4414,7 @@ CLSS public abstract interface static org.netbeans.editor.LocaleSupport$Localize
 meth public abstract java.lang.String getString(java.lang.String)
 
 CLSS public org.netbeans.editor.MacroDialogSupport
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class)
 intf java.awt.event.ActionListener
 meth protected int showConfirmDialog(java.lang.String)
@@ -4360,6 +4425,7 @@ supr java.lang.Object
 hfds cancelButton,kitClass,macroDialog,okButton,panel
 
 CLSS public org.netbeans.editor.MacroSavePanel
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class)
 fld public javax.swing.JButton addButton
 fld public javax.swing.JButton removeButton
@@ -4385,6 +4451,7 @@ hfds bindings,bundle,kitClass
 hcls KeySequenceCellRenderer,KeySequenceRequester
 
 CLSS public org.netbeans.editor.Mark
+ anno 0 java.lang.Deprecated()
 cons public init()
 cons public init(boolean)
 cons public init(javax.swing.text.Position$Bias)
@@ -4497,6 +4564,7 @@ supr org.netbeans.editor.Mark
 
 CLSS public static org.netbeans.editor.MarkFactory$SyntaxMark
  outer org.netbeans.editor.MarkFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected void removeUpdateAction(int,int)
 meth public org.netbeans.editor.Syntax$StateInfo getStateInfo()
@@ -4626,6 +4694,7 @@ meth public abstract void add(char[],java.awt.Font,java.awt.Color,java.awt.Color
 meth public abstract void eol()
 
 CLSS public org.netbeans.editor.Registry
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public static java.lang.String registryToString()
 meth public static java.util.Iterator<? extends javax.swing.text.Document> getDocumentIterator()
@@ -4640,6 +4709,7 @@ supr java.lang.Object
 hfds editorRegistryListener,listenerList
 
 CLSS public org.netbeans.editor.SegmentCache
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public javax.swing.text.Segment getSegment()
 meth public static org.netbeans.editor.SegmentCache getSharedInstance()
@@ -4905,29 +4975,42 @@ fld public final static int CASE_UPPER = 0
 meth public static <%0 extends java.lang.Object> {%%0} runWithOnSaveTasksDisabled(org.openide.util.Mutex$Action<{%%0}>)
 meth public static boolean changeCase(org.netbeans.editor.BaseDocument,int,int,int) throws javax.swing.text.BadLocationException
 meth public static boolean isRowEmpty(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static boolean isRowWhite(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static boolean isSelectionShowing(javax.swing.text.Caret)
 meth public static boolean isSelectionShowing(javax.swing.text.JTextComponent)
 meth public static int getFirstNonEmptyRow(org.netbeans.editor.BaseDocument,int,boolean) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteBwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteBwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteFwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteFwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteRow(org.netbeans.editor.BaseDocument,int,boolean) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteBwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteBwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteFwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteFwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getLineOffset(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getNextTabColumn(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getNextWord(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getNextWord(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getPositionAbove(javax.swing.text.JTextComponent,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getPositionBelow(javax.swing.text.JTextComponent,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getPreviousWord(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getPreviousWord(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
@@ -4937,21 +5020,28 @@ meth public static int getRowCount(org.netbeans.editor.BaseDocument)
 meth public static int getRowCount(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getRowEnd(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowEnd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowFirstNonWhite(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getRowIndent(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getRowIndent(org.netbeans.editor.BaseDocument,int,boolean) throws javax.swing.text.BadLocationException
 meth public static int getRowLastNonWhite(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowStart(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 meth public static int getRowStart(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowStart(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowStartFromLineOffset(org.netbeans.editor.BaseDocument,int)
+ anno 0 java.lang.Deprecated()
 meth public static int getVisualColumn(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getWordEnd(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getWordEnd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getWordStart(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getWordStart(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int reformat(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
@@ -4969,6 +5059,7 @@ meth public static java.lang.String getSelectionOrIdentifier(javax.swing.text.JT
 meth public static java.lang.String getSelectionOrIdentifier(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 meth public static java.lang.String getStatusText(javax.swing.text.JTextComponent)
 meth public static java.lang.String getTabInsertString(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.String getWord(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 meth public static java.lang.String getWord(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static java.lang.String keySequenceToString(javax.swing.KeyStroke[])
@@ -4984,6 +5075,7 @@ meth public static org.netbeans.editor.BaseKit getKit(javax.swing.text.JTextComp
 meth public static org.netbeans.editor.EditorUI getEditorUI(javax.swing.text.JTextComponent)
 meth public static org.netbeans.editor.SyntaxSupport getSyntaxSupport(javax.swing.text.JTextComponent)
 meth public static void annotateLoggable(java.lang.Throwable)
+ anno 0 java.lang.Deprecated()
 meth public static void clearStatusText(javax.swing.text.JTextComponent)
 meth public static void insertMark(org.netbeans.editor.BaseDocument,org.netbeans.editor.Mark,int) throws javax.swing.text.BadLocationException,org.netbeans.editor.InvalidMarkException
 meth public static void moveMark(org.netbeans.editor.BaseDocument,org.netbeans.editor.Mark,int) throws javax.swing.text.BadLocationException,org.netbeans.editor.InvalidMarkException
@@ -5079,7 +5171,9 @@ meth public abstract void seek(long) throws java.io.IOException
 CLSS public org.netbeans.editor.ext.ExtCaret
 cons public init()
 meth protected void updateMatchBrace()
+ anno 0 java.lang.Deprecated()
 meth public void requestMatchBraceUpdateSync()
+ anno 0 java.lang.Deprecated()
 supr org.netbeans.editor.BaseCaret
 hfds serialVersionUID
 
@@ -5184,12 +5278,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
@@ -5231,6 +5328,7 @@ hcls BaseKitLocalizedAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$AllCompletionShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -5261,6 +5359,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$CodeSelectAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -5277,6 +5376,7 @@ hfds delegateAction,serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$CompletionShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -5285,6 +5385,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$CompletionTooltipShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -5292,6 +5393,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$DocumentationShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -5306,6 +5408,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$ExtDefaultKeyTypedAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected void checkCompletion(javax.swing.text.JTextComponent,java.lang.String)
 meth protected void checkIndentHotChars(javax.swing.text.JTextComponent,java.lang.String)
@@ -5315,6 +5418,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$ExtDeleteCharAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 supr org.netbeans.editor.BaseKit$DeleteCharAction
 
@@ -5329,6 +5433,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$GotoDeclarationAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public boolean gotoDeclaration(javax.swing.text.JTextComponent)
@@ -5338,6 +5443,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$MatchBraceAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -6105,12 +6211,14 @@ meth public javax.swing.JPopupMenu getPopupMenu()
 supr javax.swing.JMenu
 
 CLSS public org.netbeans.modules.editor.NbDialogSupport
+ anno 0 java.lang.Deprecated()
 cons public init()
 intf org.netbeans.editor.DialogSupport$DialogFactory
 supr org.netbeans.modules.editor.impl.NbDialogFactory
 
 CLSS public org.netbeans.modules.editor.NbEditorDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 fld public final static java.lang.String INDENT_ENGINE = "indentEngine"
 intf org.openide.text.NbDocument$Annotatable
@@ -6207,12 +6315,14 @@ supr org.netbeans.editor.ActionFactory$RedoAction
 
 CLSS public org.netbeans.modules.editor.NbEditorKit$NbStopMacroRecordingAction
  outer org.netbeans.modules.editor.NbEditorKit
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.modules.editor.NbEditorKit)
 meth protected org.netbeans.editor.MacroDialogSupport getMacroDialogSupport(java.lang.Class)
 supr org.netbeans.editor.ActionFactory$StopMacroRecordingAction
 
 CLSS public final static org.netbeans.modules.editor.NbEditorKit$NbToggleLineNumbersAction
  outer org.netbeans.modules.editor.NbEditorKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected boolean isLineNumbersVisible()
 meth protected void toggleLineNumbers()
@@ -6226,6 +6336,7 @@ supr org.netbeans.editor.ActionFactory$UndoAction
 
 CLSS public static org.netbeans.modules.editor.NbEditorKit$ToggleToolbarAction
  outer org.netbeans.modules.editor.NbEditorKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public javax.swing.JMenuItem getPopupMenuItem(javax.swing.text.JTextComponent)
@@ -6239,6 +6350,7 @@ meth protected int textLimitWidth()
 meth protected javax.swing.JComponent createExtComponent()
 meth protected javax.swing.JToolBar createToolBarComponent()
 meth protected org.netbeans.modules.editor.NbEditorUI$SystemActionUpdater createSystemActionUpdater(java.lang.String,boolean,boolean)
+ anno 0 java.lang.Deprecated()
 meth protected void attachSystemActionPerformer(java.lang.String)
 meth protected void installUI(javax.swing.text.JTextComponent)
 meth protected void uninstallUI(javax.swing.text.JTextComponent)
@@ -6250,6 +6362,7 @@ hcls EnabledPropertySyncListener,LayeredEditorPane,SideBarsListener,SystemAction
 
 CLSS public final org.netbeans.modules.editor.NbEditorUI$SystemActionUpdater
  outer org.netbeans.modules.editor.NbEditorUI
+ anno 0 java.lang.Deprecated()
 intf java.beans.PropertyChangeListener
 intf org.openide.util.actions.ActionPerformer
 meth protected void finalize() throws java.lang.Throwable
@@ -6272,6 +6385,7 @@ meth public static org.openide.loaders.DataObject getDataObject(javax.swing.text
 meth public static org.openide.text.Line getLine(javax.swing.text.Document,int,boolean)
 meth public static org.openide.text.Line getLine(javax.swing.text.JTextComponent,boolean)
 meth public static org.openide.text.Line getLine(org.netbeans.editor.BaseDocument,int,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.windows.TopComponent getOuterTopComponent(javax.swing.text.JTextComponent)
 meth public static org.openide.windows.TopComponent getTopComponent(javax.swing.text.JTextComponent)
 meth public static void addJumpListEntry(org.openide.loaders.DataObject)
@@ -6279,6 +6393,7 @@ meth public static void invalidArgument(java.lang.String)
 supr java.lang.Object
 
 CLSS public org.netbeans.modules.editor.NbImplementationProvider
+ anno 0 java.lang.Deprecated()
 cons public init()
 fld public final static java.lang.String GLYPH_GUTTER_ACTIONS_FOLDER_NAME = "GlyphGutterActions"
 meth public boolean activateComponent(javax.swing.text.JTextComponent)
diff --git a/ide/editor.fold/nbproject/org-netbeans-modules-editor-fold.sig b/ide/editor.fold/nbproject/org-netbeans-modules-editor-fold.sig
index 8022e20d5e13..0af945375b3c 100644
--- a/ide/editor.fold/nbproject/org-netbeans-modules-editor-fold.sig
+++ b/ide/editor.fold/nbproject/org-netbeans-modules-editor-fold.sig
@@ -263,6 +263,7 @@ meth public java.util.Iterator<org.netbeans.api.editor.fold.Fold> foldIterator()
 meth public java.util.Map<org.netbeans.spi.editor.fold.FoldInfo,org.netbeans.api.editor.fold.Fold> update(java.util.Collection<org.netbeans.spi.editor.fold.FoldInfo>,java.util.Collection<org.netbeans.api.editor.fold.Fold>,java.util.Collection<org.netbeans.spi.editor.fold.FoldInfo>) throws javax.swing.text.BadLocationException
 meth public org.netbeans.api.editor.fold.Fold addToHierarchy(org.netbeans.api.editor.fold.FoldType,int,int,java.lang.Boolean,org.netbeans.api.editor.fold.FoldTemplate,java.lang.String,java.lang.Object,org.netbeans.spi.editor.fold.FoldHierarchyTransaction) throws javax.swing.text.BadLocationException
 meth public org.netbeans.api.editor.fold.Fold addToHierarchy(org.netbeans.api.editor.fold.FoldType,java.lang.String,boolean,int,int,int,int,java.lang.Object,org.netbeans.spi.editor.fold.FoldHierarchyTransaction) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.api.editor.fold.FoldHierarchy getHierarchy()
 meth public org.netbeans.spi.editor.fold.FoldHierarchyTransaction openTransaction()
 meth public static boolean isBoundsValid(int,int,int,int)
diff --git a/ide/editor.lib/nbproject/org-netbeans-modules-editor-lib.sig b/ide/editor.lib/nbproject/org-netbeans-modules-editor-lib.sig
index 020876432c3d..e490714e7780 100644
--- a/ide/editor.lib/nbproject/org-netbeans-modules-editor-lib.sig
+++ b/ide/editor.lib/nbproject/org-netbeans-modules-editor-lib.sig
@@ -1577,6 +1577,7 @@ intf java.util.EventListener
 meth public abstract void foldHierarchyChanged(org.netbeans.api.editor.fold.FoldHierarchyEvent)
 
 CLSS public org.netbeans.editor.Abbrev
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.editor.EditorUI,boolean,boolean)
 fld protected org.netbeans.editor.EditorUI editorUI
 intf java.beans.PropertyChangeListener
@@ -1668,6 +1669,7 @@ hcls DeprecatedFoldAction
 
 CLSS public static org.netbeans.editor.ActionFactory$AbbrevExpandAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1676,6 +1678,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$AbbrevResetAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1777,6 +1780,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$ExpandFold
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1923,6 +1927,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$RemoveWordNextAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1930,6 +1935,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$RemoveWordPreviousAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1937,6 +1943,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$RunMacroAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 meth protected void error(javax.swing.text.JTextComponent,java.lang.String)
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1984,6 +1991,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$StartMacroRecordingAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1999,6 +2007,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ActionFactory$StopMacroRecordingAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected org.netbeans.editor.MacroDialogSupport getMacroDialogSupport(java.lang.Class)
@@ -2008,6 +2017,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$ToggleLineNumbersAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected boolean isLineNumbersVisible()
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -2037,6 +2047,7 @@ hfds paneRef,serialVersionUID,toggleButtonRef
 
 CLSS public static org.netbeans.editor.ActionFactory$ToggleTypingModeAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2078,6 +2089,7 @@ meth public static boolean startsWith(char[],char[])
 meth public static char[] concat(char[],char[])
 meth public static char[] createSpacesBuffer(int)
 meth public static char[] createWhiteSpaceFillBuffer(int,int,int)
+ anno 0 java.lang.Deprecated()
 meth public static char[] createWhitespaceFillBuffer(int,int,int)
 meth public static char[] extract(char[],int,int)
 meth public static char[] getSpacesBuffer(int)
@@ -2324,6 +2336,7 @@ meth public org.netbeans.editor.AnnotationDesc getActiveAnnotation(int)
 meth public org.netbeans.editor.AnnotationDesc getActiveAnnotation(org.netbeans.editor.Mark)
 meth public org.netbeans.editor.AnnotationDesc getAnnotation(int,java.lang.String)
 meth public org.netbeans.editor.AnnotationDesc[] getPasiveAnnotations(int)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.AnnotationDesc[] getPassiveAnnotations(int)
 meth public org.netbeans.editor.AnnotationDesc[] getPassiveAnnotationsForLine(int)
 meth public void addAnnotation(org.netbeans.editor.AnnotationDesc)
@@ -2355,6 +2368,7 @@ meth public java.util.Iterator<org.netbeans.editor.AnnotationDesc> getAnnotation
 meth public org.netbeans.editor.AnnotationDesc activateNext()
 meth public org.netbeans.editor.AnnotationDesc getActive()
 meth public org.netbeans.editor.AnnotationDesc[] getPasive()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.AnnotationDesc[] getPassive()
 meth public void addAnnotation(org.netbeans.editor.AnnotationDesc)
 meth public void refreshAnnotations()
@@ -2396,6 +2410,7 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,int)
 fld protected int updateMask
 fld public final static int ABBREV_RESET = 4
+ anno 0 java.lang.Deprecated()
 fld public final static int CLEAR_STATUS_TEXT = 32
 fld public final static int MAGIC_POSITION_RESET = 2
 fld public final static int NO_RECORDING = 64
@@ -2412,6 +2427,7 @@ meth protected boolean asynchonous()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object createDefaultValue(java.lang.String)
 meth protected java.lang.Object findValue(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object getDefaultShortDescription()
 meth protected void actionNameUpdate(java.lang.String)
 meth public abstract void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -2485,6 +2501,7 @@ meth public void mousePressed(java.awt.event.MouseEvent)
 meth public void mouseReleased(java.awt.event.MouseEvent)
 meth public void moveDot(int)
 meth public void moveDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void paint(java.awt.Graphics)
 meth public void propertyChange(java.beans.PropertyChangeEvent)
 meth public void refresh(boolean)
@@ -2494,7 +2511,9 @@ meth public void setBlinkRate(int)
 meth public void setDot(int)
 meth public void setDot(int,boolean)
 meth public void setDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void setDot(int,java.awt.Rectangle,int,boolean)
+ anno 0 java.lang.Deprecated()
 meth public void setMagicCaretPosition(java.awt.Point)
 meth public void setSelectionVisible(boolean)
 meth public void setVisible(boolean)
@@ -2506,6 +2525,7 @@ hcls ListenerImpl,MouseState
 CLSS public org.netbeans.editor.BaseDocument
 cons public init(boolean,java.lang.String)
 cons public init(java.lang.Class,boolean)
+ anno 0 java.lang.Deprecated()
 fld protected boolean inited
 fld protected boolean modified
 fld protected javax.swing.text.Element defaultRootElem
@@ -2515,7 +2535,9 @@ fld public final static java.lang.String FORMATTER = "formatter"
 fld public final static java.lang.String ID_PROP = "id"
 fld public final static java.lang.String KIT_CLASS_PROP = "kit-class"
 fld public final static java.lang.String LINE_BATCH_SIZE = "line-batch-size"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LINE_LIMIT_PROP = "line-limit"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LS_CR = "\r"
 fld public final static java.lang.String LS_CRLF = "\r\n"
 fld public final static java.lang.String LS_LF = "\n"
@@ -2552,13 +2574,17 @@ meth public char[] getChars(int,int) throws javax.swing.text.BadLocationExceptio
 meth public char[] getChars(int[]) throws javax.swing.text.BadLocationException
 meth public final boolean isAtomicLock()
 meth public final java.lang.Class getKitClass()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicLock()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicUnlock()
+ anno 0 java.lang.Deprecated()
 meth public final void breakAtomicLock()
 meth public final void extWriteLock()
 meth public final void extWriteUnlock()
 meth public int find(org.netbeans.editor.Finder,int,int) throws javax.swing.text.BadLocationException
 meth public int getShiftWidth()
+ anno 0 java.lang.Deprecated()
 meth public int getTabSize()
 meth public int processText(org.netbeans.editor.TextBatchProcessor,int,int) throws javax.swing.text.BadLocationException
 meth public java.lang.String getText(int[]) throws javax.swing.text.BadLocationException
@@ -2571,6 +2597,7 @@ meth public javax.swing.text.Position createPosition(int,javax.swing.text.Positi
 meth public org.netbeans.editor.Annotations getAnnotations()
 meth public org.netbeans.editor.CharSeq getText()
 meth public org.netbeans.editor.SyntaxSupport getSyntaxSupport()
+ anno 0 java.lang.Deprecated()
 meth public void addAtomicLockListener(org.netbeans.api.editor.document.AtomicLockListener)
 meth public void addAtomicLockListener(org.netbeans.editor.AtomicLockListener)
  anno 0 java.lang.Deprecated()
@@ -2597,11 +2624,13 @@ meth public void removePostModificationDocumentListener(javax.swing.event.Docume
 meth public void removeUpdateDocumentListener(javax.swing.event.DocumentListener)
 meth public void render(java.lang.Runnable)
 meth public void repaintBlock(int,int)
+ anno 0 java.lang.Deprecated()
 meth public void replace(int,int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException
 meth public void resetUndoMerge()
 meth public void runAtomic(java.lang.Runnable)
 meth public void runAtomicAsUser(java.lang.Runnable)
 meth public void setPostModificationDocumentListener(javax.swing.event.DocumentListener)
+ anno 0 java.lang.Deprecated()
 meth public void write(java.io.Writer,int,int) throws java.io.IOException,javax.swing.text.BadLocationException
 supr javax.swing.text.AbstractDocument
 hfds DEACTIVATE_LEXER_THRESHOLD,EDITABLE_PROP,LAST_MODIFICATION_TIMESTAMP_PROP,LOG,LOG_LISTENER,MODIFICATION_LISTENER_PROP,SUPPORTS_MODIFICATION_LISTENER_PROP,VERSION_PROP,annotations,annotationsLock,atomicDepth,atomicEdits,atomicLockEventInstance,atomicLockListenerList,composedText,debugNoText,debugRead,debugStack,deprecatedKitClass,filterBypass,fixLineSyntaxState,identifierAcceptor,lastModifyUndoEdit,lastPositionEditedByTyping,lineRootElement,mimeType,modifiable,postModificationDepth,postModificationDocumentListener,postModificationDocumentListenerList,prefs,prefsListener,removeUpdateLineUndo,runExclusiveDepth,shiftWidth,syntaxSupport,tabSize,text,undoEditWrappers,undoMergeReset,updateDocumentListenerList,weakPrefsListener,whitespaceAcceptor
@@ -2631,9 +2660,11 @@ meth public boolean isInRedo()
 meth public boolean isInUndo()
 meth public boolean replaceEdit(javax.swing.undo.UndoableEdit)
 meth public char[] getChars()
+ anno 0 java.lang.Deprecated()
 meth public final javax.swing.text.AttributeSet getChangeAttributes()
 meth public int getLFCount()
 meth public int getLine()
+ anno 0 java.lang.Deprecated()
 meth public int getSyntaxUpdateOffset()
 meth public java.lang.String getRedoPresentationName()
 meth public java.lang.String getText()
@@ -2793,9 +2824,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -2810,10 +2843,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -2893,6 +2930,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$DefaultKeyTypedAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected void checkIndent(javax.swing.text.JTextComponent,java.lang.String)
@@ -2904,6 +2942,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$DeleteCharAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 fld protected boolean nextChar
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -2955,6 +2994,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$InsertBreakAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object beforeBreak(javax.swing.text.JTextComponent,org.netbeans.editor.BaseDocument,javax.swing.text.Caret)
@@ -3002,6 +3042,7 @@ hfds actionNames,serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$NextWordAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 meth protected int getNextWordOffset(javax.swing.text.JTextComponent) throws javax.swing.text.BadLocationException
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -3035,6 +3076,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.BaseKit$PreviousWordAction
  outer org.netbeans.editor.BaseKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 meth protected int getPreviousWordOffset(javax.swing.text.JTextComponent) throws javax.swing.text.BadLocationException
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -3195,6 +3237,7 @@ supr javax.swing.text.View
 hfds component,startY
 
 CLSS public abstract interface org.netbeans.editor.CharSeq
+ anno 0 java.lang.Deprecated()
 meth public abstract char charAt(int)
 meth public abstract int length()
 
@@ -3305,6 +3348,7 @@ supr javax.swing.AbstractAction
 hfds pcl
 
 CLSS public org.netbeans.editor.DialogSupport
+ anno 0 java.lang.Deprecated()
 innr public abstract interface static DialogFactory
 meth public static java.awt.Dialog createDialog(java.lang.String,javax.swing.JPanel,boolean,javax.swing.JButton[],boolean,int,int,java.awt.event.ActionListener)
 meth public static void setDialogFactory(org.netbeans.editor.DialogSupport$DialogFactory)
@@ -3321,6 +3365,7 @@ meth public static void copyText(javax.swing.text.Document,int,int,char[],int) t
 supr java.lang.Object
 
 CLSS public org.netbeans.editor.EditorDebug
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.String debugArray(int[])
 meth public static java.lang.String debugArray(java.lang.Object[])
 meth public static java.lang.String debugBlocks(org.netbeans.editor.BaseDocument,int[])
@@ -3339,6 +3384,7 @@ meth public static void test(javax.swing.text.JTextComponent)
 supr java.lang.Object
 
 CLSS public org.netbeans.editor.EditorState
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.Object get(java.lang.Object)
 meth public static java.util.HashMap getStateObject()
 meth public static void put(java.lang.Object,java.lang.Object)
@@ -3365,9 +3411,11 @@ intf javax.swing.event.ChangeListener
 meth protected final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
 meth protected int textLimitWidth()
 meth protected java.util.Map createColoringMap()
+ anno 0 java.lang.Deprecated()
 meth protected javax.swing.JComponent createExtComponent()
 meth protected javax.swing.JToolBar createToolBarComponent()
 meth protected static java.util.Map<java.lang.String,org.netbeans.editor.Coloring> getSharedColoringMap(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth protected void initGlyphCorner(javax.swing.JScrollPane)
 meth protected void installUI(javax.swing.text.JTextComponent)
 meth protected void modelChanged(org.netbeans.editor.BaseDocument,org.netbeans.editor.BaseDocument)
@@ -3381,7 +3429,9 @@ meth public boolean hasExtComponent()
 meth public boolean isGlyphGutterVisible()
 meth public boolean isLineNumberEnabled()
 meth public boolean updateVirtualHeight(int)
+ anno 0 java.lang.Deprecated()
 meth public boolean updateVirtualWidth(int)
+ anno 0 java.lang.Deprecated()
 meth public final int getSideBarWidth()
 meth public final javax.swing.text.JTextComponent getComponent()
 meth public final org.netbeans.editor.BaseDocument getDocument()
@@ -3396,13 +3446,17 @@ meth public java.awt.Rectangle getExtentBounds(java.awt.Rectangle)
 meth public java.lang.Object getComponentLock()
 meth public java.lang.Object getProperty(java.lang.Object)
 meth public java.util.Map<java.lang.String,org.netbeans.editor.Coloring> getColoringMap()
+ anno 0 java.lang.Deprecated()
 meth public javax.swing.JComponent getExtComponent()
 meth public javax.swing.JPopupMenu getPopupMenu()
 meth public javax.swing.JToolBar getToolBarComponent()
 meth public org.netbeans.api.editor.StickyWindowSupport getStickyWindowSupport()
 meth public org.netbeans.editor.Abbrev getAbbrev()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Coloring getColoring(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Coloring getDefaultColoring()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.PopupManager getPopupManager()
 meth public org.netbeans.editor.StatusBar getStatusBar()
 meth public org.netbeans.editor.WordMatch getWordMatch()
@@ -3413,7 +3467,9 @@ meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyC
 meth public void adjustCaret(int)
 meth public void adjustWindow(int)
 meth public void caretMoveDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void caretSetDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void hidePopupMenu()
 meth public void mouseClicked(java.awt.event.MouseEvent)
 meth public void mouseEntered(java.awt.event.MouseEvent)
@@ -3429,6 +3485,7 @@ meth public void repaint(int,int)
 meth public void repaintBlock(int,int) throws javax.swing.text.BadLocationException
 meth public void repaintOffset(int) throws javax.swing.text.BadLocationException
 meth public void scrollRectToVisible(java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void setLineNumberEnabled(boolean)
 meth public void setPopupMenu(javax.swing.JPopupMenu)
 meth public void showPopupMenu(int,int)
@@ -3785,6 +3842,7 @@ CLSS public abstract interface static org.netbeans.editor.GapObjectArray$RemoveU
 meth public abstract void removeUpdate(java.lang.Object)
 
 CLSS public abstract interface org.netbeans.editor.GapStart
+ anno 0 java.lang.Deprecated()
 meth public abstract int getGapStart()
 
 CLSS public org.netbeans.editor.GlyphGutter
@@ -3814,7 +3872,9 @@ hcls EditorUIListener,GutterMouseListener
 
 CLSS public org.netbeans.editor.GuardedDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class,boolean,javax.swing.text.StyleContext)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 cons public init(java.lang.String,boolean,javax.swing.text.StyleContext)
 fld protected java.lang.String normalStyleName
@@ -3866,6 +3926,7 @@ intf org.netbeans.editor.TokenID
 meth public abstract java.lang.String getImage()
 
 CLSS public abstract org.netbeans.editor.ImplementationProvider
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public abstract java.util.ResourceBundle getResourceBundle(java.lang.String)
 meth public abstract javax.swing.Action[] getGlyphGutterActions(javax.swing.text.JTextComponent)
@@ -3889,6 +3950,7 @@ meth public static void addEntry(javax.swing.text.JTextComponent,int)
 meth public static void checkAddEntry()
 meth public static void checkAddEntry(javax.swing.text.JTextComponent)
 meth public static void checkAddEntry(javax.swing.text.JTextComponent,int)
+ anno 0 java.lang.Deprecated()
 meth public static void jumpNext(javax.swing.text.JTextComponent)
 meth public static void jumpNextComponent(javax.swing.text.JTextComponent)
 meth public static void jumpPrev(javax.swing.text.JTextComponent)
@@ -3963,6 +4025,7 @@ hfds modelToViewDG,viewToModelDG
 hcls ModelToViewDG,ViewToModelDG
 
 CLSS public org.netbeans.editor.LineSeparatorConversion
+ anno 0 java.lang.Deprecated()
 fld public final static char LS = '\u2028'
 fld public final static char PS = '\u2029'
 fld public final static java.lang.String LS_LS
@@ -4007,6 +4070,7 @@ supr java.lang.Object
 hfds convertedText,lastCharCR,readWholeBuffer,reader
 
 CLSS public org.netbeans.editor.LocaleSupport
+ anno 0 java.lang.Deprecated()
 cons public init()
 innr public abstract interface static Localizer
 meth public static char getChar(java.lang.String,char)
@@ -4022,6 +4086,7 @@ CLSS public abstract interface static org.netbeans.editor.LocaleSupport$Localize
 meth public abstract java.lang.String getString(java.lang.String)
 
 CLSS public org.netbeans.editor.MacroDialogSupport
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class)
 intf java.awt.event.ActionListener
 meth protected int showConfirmDialog(java.lang.String)
@@ -4032,6 +4097,7 @@ supr java.lang.Object
 hfds cancelButton,kitClass,macroDialog,okButton,panel
 
 CLSS public org.netbeans.editor.MacroSavePanel
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class)
 fld public javax.swing.JButton addButton
 fld public javax.swing.JButton removeButton
@@ -4057,6 +4123,7 @@ hfds bindings,bundle,kitClass
 hcls KeySequenceCellRenderer,KeySequenceRequester
 
 CLSS public org.netbeans.editor.Mark
+ anno 0 java.lang.Deprecated()
 cons public init()
 cons public init(boolean)
 cons public init(javax.swing.text.Position$Bias)
@@ -4169,6 +4236,7 @@ supr org.netbeans.editor.Mark
 
 CLSS public static org.netbeans.editor.MarkFactory$SyntaxMark
  outer org.netbeans.editor.MarkFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected void removeUpdateAction(int,int)
 meth public org.netbeans.editor.Syntax$StateInfo getStateInfo()
@@ -4298,6 +4366,7 @@ meth public abstract void add(char[],java.awt.Font,java.awt.Color,java.awt.Color
 meth public abstract void eol()

@neilcsmith-net
Copy link
Member Author

Filtered API diff (without version changes - pt2) 
 CLSS public org.netbeans.editor.Registry
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public static java.lang.String registryToString()
 meth public static java.util.Iterator<? extends javax.swing.text.Document> getDocumentIterator()
@@ -4312,6 +4381,7 @@ supr java.lang.Object
 hfds editorRegistryListener,listenerList
 
 CLSS public org.netbeans.editor.SegmentCache
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public javax.swing.text.Segment getSegment()
 meth public static org.netbeans.editor.SegmentCache getSharedInstance()
@@ -4577,29 +4647,42 @@ fld public final static int CASE_UPPER = 0
 meth public static <%0 extends java.lang.Object> {%%0} runWithOnSaveTasksDisabled(org.openide.util.Mutex$Action<{%%0}>)
 meth public static boolean changeCase(org.netbeans.editor.BaseDocument,int,int,int) throws javax.swing.text.BadLocationException
 meth public static boolean isRowEmpty(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static boolean isRowWhite(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static boolean isSelectionShowing(javax.swing.text.Caret)
 meth public static boolean isSelectionShowing(javax.swing.text.JTextComponent)
 meth public static int getFirstNonEmptyRow(org.netbeans.editor.BaseDocument,int,boolean) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteBwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteBwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteFwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteFwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstNonWhiteRow(org.netbeans.editor.BaseDocument,int,boolean) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteBwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteBwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteFwd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getFirstWhiteFwd(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getLineOffset(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getNextTabColumn(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getNextWord(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getNextWord(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getPositionAbove(javax.swing.text.JTextComponent,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getPositionBelow(javax.swing.text.JTextComponent,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getPreviousWord(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getPreviousWord(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
@@ -4609,21 +4692,28 @@ meth public static int getRowCount(org.netbeans.editor.BaseDocument)
 meth public static int getRowCount(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getRowEnd(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowEnd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowFirstNonWhite(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getRowIndent(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getRowIndent(org.netbeans.editor.BaseDocument,int,boolean) throws javax.swing.text.BadLocationException
 meth public static int getRowLastNonWhite(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowStart(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 meth public static int getRowStart(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowStart(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getRowStartFromLineOffset(org.netbeans.editor.BaseDocument,int)
+ anno 0 java.lang.Deprecated()
 meth public static int getVisualColumn(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static int getWordEnd(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getWordEnd(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int getWordStart(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static int getWordStart(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
  anno 0 java.lang.Deprecated()
 meth public static int reformat(org.netbeans.editor.BaseDocument,int,int) throws javax.swing.text.BadLocationException
@@ -4641,6 +4731,7 @@ meth public static java.lang.String getSelectionOrIdentifier(javax.swing.text.JT
 meth public static java.lang.String getSelectionOrIdentifier(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 meth public static java.lang.String getStatusText(javax.swing.text.JTextComponent)
 meth public static java.lang.String getTabInsertString(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.String getWord(javax.swing.text.JTextComponent,int) throws javax.swing.text.BadLocationException
 meth public static java.lang.String getWord(org.netbeans.editor.BaseDocument,int) throws javax.swing.text.BadLocationException
 meth public static java.lang.String keySequenceToString(javax.swing.KeyStroke[])
@@ -4656,6 +4747,7 @@ meth public static org.netbeans.editor.BaseKit getKit(javax.swing.text.JTextComp
 meth public static org.netbeans.editor.EditorUI getEditorUI(javax.swing.text.JTextComponent)
 meth public static org.netbeans.editor.SyntaxSupport getSyntaxSupport(javax.swing.text.JTextComponent)
 meth public static void annotateLoggable(java.lang.Throwable)
+ anno 0 java.lang.Deprecated()
 meth public static void clearStatusText(javax.swing.text.JTextComponent)
 meth public static void insertMark(org.netbeans.editor.BaseDocument,org.netbeans.editor.Mark,int) throws javax.swing.text.BadLocationException,org.netbeans.editor.InvalidMarkException
 meth public static void moveMark(org.netbeans.editor.BaseDocument,org.netbeans.editor.Mark,int) throws javax.swing.text.BadLocationException,org.netbeans.editor.InvalidMarkException
@@ -4743,7 +4835,9 @@ meth public abstract void seek(long) throws java.io.IOException
 CLSS public org.netbeans.editor.ext.ExtCaret
 cons public init()
 meth protected void updateMatchBrace()
+ anno 0 java.lang.Deprecated()
 meth public void requestMatchBraceUpdateSync()
+ anno 0 java.lang.Deprecated()
 supr org.netbeans.editor.BaseCaret
 hfds serialVersionUID
 
@@ -4791,12 +4885,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
@@ -4838,6 +4935,7 @@ hcls BaseKitLocalizedAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$AllCompletionShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -4868,6 +4966,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$CodeSelectAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -4884,6 +4983,7 @@ hfds delegateAction,serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$CompletionShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -4892,6 +4992,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$CompletionTooltipShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -4899,6 +5000,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$DocumentationShowAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -4913,6 +5015,7 @@ supr org.netbeans.editor.BaseAction
 
 CLSS public static org.netbeans.editor.ext.ExtKit$ExtDefaultKeyTypedAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected void checkCompletion(javax.swing.text.JTextComponent,java.lang.String)
 meth protected void checkIndentHotChars(javax.swing.text.JTextComponent,java.lang.String)
@@ -4922,6 +5025,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$ExtDeleteCharAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 supr org.netbeans.editor.BaseKit$DeleteCharAction
 
@@ -4936,6 +5040,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$GotoDeclarationAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public boolean gotoDeclaration(javax.swing.text.JTextComponent)
@@ -4945,6 +5050,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ext.ExtKit$MatchBraceAction
  outer org.netbeans.editor.ext.ExtKit
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String,boolean)
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
diff --git a/ide/editor.settings.storage/nbproject/org-netbeans-modules-editor-settings-storage.sig b/ide/editor.settings.storage/nbproject/org-netbeans-modules-editor-settings-storage.sig
index dabd3e1c9e7c..2ec5d9a4d3f6 100644
--- a/ide/editor.settings.storage/nbproject/org-netbeans-modules-editor-settings-storage.sig
+++ b/ide/editor.settings.storage/nbproject/org-netbeans-modules-editor-settings-storage.sig
@@ -52,7 +52,9 @@ cons public init()
 fld public final static java.lang.String PROP_CURRENT_FONT_COLOR_PROFILE = "currentFontColorProfile"
 fld public final static java.lang.String PROP_CURRENT_KEY_MAP_PROFILE = "currentKeyMapProfile"
 fld public final static java.lang.String PROP_DEFAULT_FONT_COLORS = "defaultFontColors"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String PROP_EDITOR_FONT_COLORS
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String PROP_MIME_TYPES = "mime-types"
 meth public abstract boolean isCustomFontColorProfile(java.lang.String)
 meth public abstract boolean isCustomKeymapProfile(java.lang.String)
@@ -60,7 +62,9 @@ meth public abstract java.lang.String getCurrentFontColorProfile()
 meth public abstract java.lang.String getCurrentKeyMapProfile()
 meth public abstract java.lang.String getLanguageName(java.lang.String)
 meth public abstract java.util.Collection<javax.swing.text.AttributeSet> getDefaultFontColorDefaults(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Collection<javax.swing.text.AttributeSet> getDefaultFontColors(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Map<java.lang.String,javax.swing.text.AttributeSet> getAnnotationDefaults(java.lang.String)
 meth public abstract java.util.Map<java.lang.String,javax.swing.text.AttributeSet> getAnnotations(java.lang.String)
 meth public abstract java.util.Map<java.lang.String,javax.swing.text.AttributeSet> getHighlightingDefaults(java.lang.String)
@@ -79,6 +83,7 @@ meth public abstract void setAnnotations(java.lang.String,java.util.Map<java.lan
 meth public abstract void setCurrentFontColorProfile(java.lang.String)
 meth public abstract void setCurrentKeyMapProfile(java.lang.String)
 meth public abstract void setDefaultFontColors(java.lang.String,java.util.Collection<javax.swing.text.AttributeSet>)
+ anno 0 java.lang.Deprecated()
 meth public abstract void setHighlightings(java.lang.String,java.util.Map<java.lang.String,javax.swing.text.AttributeSet>)
 meth public static org.netbeans.modules.editor.settings.storage.api.EditorSettings getDefault()
 supr java.lang.Object
diff --git a/ide/editor.util/nbproject/org-netbeans-modules-editor-util.sig b/ide/editor.util/nbproject/org-netbeans-modules-editor-util.sig
index e0f8c165d5d2..c818810b0476 100644
--- a/ide/editor.util/nbproject/org-netbeans-modules-editor-util.sig
+++ b/ide/editor.util/nbproject/org-netbeans-modules-editor-util.sig
@@ -370,6 +370,7 @@ meth protected java.lang.CharSequence backingSequence()
 meth public char charAt(int)
 meth public int length()
 meth public static void checkIndexesValid(java.lang.CharSequence,int,int)
+ anno 0 java.lang.Deprecated()
 supr org.netbeans.lib.editor.util.AbstractCharSequence
 hfds backingSequence,length,start
 
@@ -509,6 +510,7 @@ meth public void clear()
 meth public void copyElements(int,int,java.lang.Object[],int)
 meth public void copyElements(int,int,java.util.Collection<{org.netbeans.lib.editor.util.GapList%0}>)
 meth public void copyItems(int,int,java.lang.Object[],int)
+ anno 0 java.lang.Deprecated()
 meth public void ensureCapacity(int)
 meth public void remove(int,int)
 meth public void swap(int,int)
@@ -624,6 +626,7 @@ CLSS public final org.netbeans.lib.editor.util.swing.DocumentUtilities
 meth public static boolean addPriorityDocumentListener(javax.swing.text.Document,javax.swing.event.DocumentListener,org.netbeans.lib.editor.util.swing.DocumentListenerPriority)
 meth public static boolean isReadLocked(javax.swing.text.Document)
 meth public static boolean isTypingModification(javax.swing.event.DocumentEvent)
+ anno 0 java.lang.Deprecated()
 meth public static boolean isTypingModification(javax.swing.text.Document)
 meth public static boolean isWriteLocked(javax.swing.text.Document)
 meth public static boolean putEventPropertyIfSupported(javax.swing.event.DocumentEvent,java.lang.Object,java.lang.Object)
diff --git a/ide/editor/nbproject/org-netbeans-modules-editor.sig b/ide/editor/nbproject/org-netbeans-modules-editor.sig
index 144c072d1c7c..226e431c5a02 100644
--- a/ide/editor/nbproject/org-netbeans-modules-editor.sig
+++ b/ide/editor/nbproject/org-netbeans-modules-editor.sig
@@ -1249,6 +1249,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$StopMacroRecordingAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected org.netbeans.editor.MacroDialogSupport getMacroDialogSupport(java.lang.Class)
@@ -1258,6 +1259,7 @@ hfds serialVersionUID
 
 CLSS public static org.netbeans.editor.ActionFactory$ToggleLineNumbersAction
  outer org.netbeans.editor.ActionFactory
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected boolean isLineNumbersVisible()
 meth protected java.lang.Class getShortDescriptionBundleClass()
@@ -1291,6 +1293,7 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,int)
 fld protected int updateMask
 fld public final static int ABBREV_RESET = 4
+ anno 0 java.lang.Deprecated()
 fld public final static int CLEAR_STATUS_TEXT = 32
 fld public final static int MAGIC_POSITION_RESET = 2
 fld public final static int NO_RECORDING = 64
@@ -1307,6 +1310,7 @@ meth protected boolean asynchonous()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object createDefaultValue(java.lang.String)
 meth protected java.lang.Object findValue(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object getDefaultShortDescription()
 meth protected void actionNameUpdate(java.lang.String)
 meth public abstract void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -1323,6 +1327,7 @@ hfds UILOG,UI_LOG_DETAILED,recording,serialVersionUID
 CLSS public org.netbeans.editor.BaseDocument
 cons public init(boolean,java.lang.String)
 cons public init(java.lang.Class,boolean)
+ anno 0 java.lang.Deprecated()
 fld protected boolean inited
 fld protected boolean modified
 fld protected javax.swing.text.Element defaultRootElem
@@ -1332,7 +1337,9 @@ fld public final static java.lang.String FORMATTER = "formatter"
 fld public final static java.lang.String ID_PROP = "id"
 fld public final static java.lang.String KIT_CLASS_PROP = "kit-class"
 fld public final static java.lang.String LINE_BATCH_SIZE = "line-batch-size"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LINE_LIMIT_PROP = "line-limit"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LS_CR = "\r"
 fld public final static java.lang.String LS_CRLF = "\r\n"
 fld public final static java.lang.String LS_LF = "\n"
@@ -1369,13 +1376,17 @@ meth public char[] getChars(int,int) throws javax.swing.text.BadLocationExceptio
 meth public char[] getChars(int[]) throws javax.swing.text.BadLocationException
 meth public final boolean isAtomicLock()
 meth public final java.lang.Class getKitClass()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicLock()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicUnlock()
+ anno 0 java.lang.Deprecated()
 meth public final void breakAtomicLock()
 meth public final void extWriteLock()
 meth public final void extWriteUnlock()
 meth public int find(org.netbeans.editor.Finder,int,int) throws javax.swing.text.BadLocationException
 meth public int getShiftWidth()
+ anno 0 java.lang.Deprecated()
 meth public int getTabSize()
 meth public int processText(org.netbeans.editor.TextBatchProcessor,int,int) throws javax.swing.text.BadLocationException
 meth public java.lang.String getText(int[]) throws javax.swing.text.BadLocationException
@@ -1388,6 +1399,7 @@ meth public javax.swing.text.Position createPosition(int,javax.swing.text.Positi
 meth public org.netbeans.editor.Annotations getAnnotations()
 meth public org.netbeans.editor.CharSeq getText()
 meth public org.netbeans.editor.SyntaxSupport getSyntaxSupport()
+ anno 0 java.lang.Deprecated()
 meth public void addAtomicLockListener(org.netbeans.api.editor.document.AtomicLockListener)
 meth public void addAtomicLockListener(org.netbeans.editor.AtomicLockListener)
  anno 0 java.lang.Deprecated()
@@ -1414,11 +1426,13 @@ meth public void removePostModificationDocumentListener(javax.swing.event.Docume
 meth public void removeUpdateDocumentListener(javax.swing.event.DocumentListener)
 meth public void render(java.lang.Runnable)
 meth public void repaintBlock(int,int)
+ anno 0 java.lang.Deprecated()
 meth public void replace(int,int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException
 meth public void resetUndoMerge()
 meth public void runAtomic(java.lang.Runnable)
 meth public void runAtomicAsUser(java.lang.Runnable)
 meth public void setPostModificationDocumentListener(javax.swing.event.DocumentListener)
+ anno 0 java.lang.Deprecated()
 meth public void write(java.io.Writer,int,int) throws java.io.IOException,javax.swing.text.BadLocationException
 supr javax.swing.text.AbstractDocument
 hfds DEACTIVATE_LEXER_THRESHOLD,EDITABLE_PROP,LAST_MODIFICATION_TIMESTAMP_PROP,LOG,LOG_LISTENER,MODIFICATION_LISTENER_PROP,SUPPORTS_MODIFICATION_LISTENER_PROP,VERSION_PROP,annotations,annotationsLock,atomicDepth,atomicEdits,atomicLockEventInstance,atomicLockListenerList,composedText,debugNoText,debugRead,debugStack,deprecatedKitClass,filterBypass,fixLineSyntaxState,identifierAcceptor,lastModifyUndoEdit,lastPositionEditedByTyping,lineRootElement,mimeType,modifiable,postModificationDepth,postModificationDocumentListener,postModificationDocumentListenerList,prefs,prefsListener,removeUpdateLineUndo,runExclusiveDepth,shiftWidth,syntaxSupport,tabSize,text,undoEditWrappers,undoMergeReset,updateDocumentListenerList,weakPrefsListener,whitespaceAcceptor
@@ -1534,9 +1548,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -1551,10 +1567,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -1565,6 +1585,7 @@ hfds IN_PASTE,KEYMAPS_AND_ACTIONS_LOCK,KIT_CNT_PREALLOC,LOG,PROP_NAVIGATE_BOUNDA
 hcls ClearUIForNullKitListener,DefaultSyntax,DefaultSyntaxTokenContext,KeybindingsAndPreferencesTracker,NullTextUI,SearchableKit
 
 CLSS public org.netbeans.editor.DialogSupport
+ anno 0 java.lang.Deprecated()
 innr public abstract interface static DialogFactory
 meth public static java.awt.Dialog createDialog(java.lang.String,javax.swing.JPanel,boolean,javax.swing.JButton[],boolean,int,int,java.awt.event.ActionListener)
 meth public static void setDialogFactory(org.netbeans.editor.DialogSupport$DialogFactory)
@@ -1594,9 +1615,11 @@ intf javax.swing.event.ChangeListener
 meth protected final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
 meth protected int textLimitWidth()
 meth protected java.util.Map createColoringMap()
+ anno 0 java.lang.Deprecated()
 meth protected javax.swing.JComponent createExtComponent()
 meth protected javax.swing.JToolBar createToolBarComponent()
 meth protected static java.util.Map<java.lang.String,org.netbeans.editor.Coloring> getSharedColoringMap(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth protected void initGlyphCorner(javax.swing.JScrollPane)
 meth protected void installUI(javax.swing.text.JTextComponent)
 meth protected void modelChanged(org.netbeans.editor.BaseDocument,org.netbeans.editor.BaseDocument)
@@ -1610,7 +1633,9 @@ meth public boolean hasExtComponent()
 meth public boolean isGlyphGutterVisible()
 meth public boolean isLineNumberEnabled()
 meth public boolean updateVirtualHeight(int)
+ anno 0 java.lang.Deprecated()
 meth public boolean updateVirtualWidth(int)
+ anno 0 java.lang.Deprecated()
 meth public final int getSideBarWidth()
 meth public final javax.swing.text.JTextComponent getComponent()
 meth public final org.netbeans.editor.BaseDocument getDocument()
@@ -1625,13 +1650,17 @@ meth public java.awt.Rectangle getExtentBounds(java.awt.Rectangle)
 meth public java.lang.Object getComponentLock()
 meth public java.lang.Object getProperty(java.lang.Object)
 meth public java.util.Map<java.lang.String,org.netbeans.editor.Coloring> getColoringMap()
+ anno 0 java.lang.Deprecated()
 meth public javax.swing.JComponent getExtComponent()
 meth public javax.swing.JPopupMenu getPopupMenu()
 meth public javax.swing.JToolBar getToolBarComponent()
 meth public org.netbeans.api.editor.StickyWindowSupport getStickyWindowSupport()
 meth public org.netbeans.editor.Abbrev getAbbrev()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Coloring getColoring(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Coloring getDefaultColoring()
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.PopupManager getPopupManager()
 meth public org.netbeans.editor.StatusBar getStatusBar()
 meth public org.netbeans.editor.WordMatch getWordMatch()
@@ -1642,7 +1671,9 @@ meth public void addPropertyChangeListener(java.lang.String,java.beans.PropertyC
 meth public void adjustCaret(int)
 meth public void adjustWindow(int)
 meth public void caretMoveDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void caretSetDot(int,java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void hidePopupMenu()
 meth public void mouseClicked(java.awt.event.MouseEvent)
 meth public void mouseEntered(java.awt.event.MouseEvent)
@@ -1658,6 +1689,7 @@ meth public void repaint(int,int)
 meth public void repaintBlock(int,int) throws javax.swing.text.BadLocationException
 meth public void repaintOffset(int) throws javax.swing.text.BadLocationException
 meth public void scrollRectToVisible(java.awt.Rectangle,int)
+ anno 0 java.lang.Deprecated()
 meth public void setLineNumberEnabled(boolean)
 meth public void setPopupMenu(javax.swing.JPopupMenu)
 meth public void showPopupMenu(int,int)
@@ -1670,7 +1702,9 @@ hcls Accessor,ComponentLock,Listener
 
 CLSS public org.netbeans.editor.GuardedDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class,boolean,javax.swing.text.StyleContext)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 cons public init(java.lang.String,boolean,javax.swing.text.StyleContext)
 fld protected java.lang.String normalStyleName
@@ -1706,6 +1740,7 @@ supr org.netbeans.editor.BaseDocument
 hfds LOG,atomicAsUser,breakGuarded,debugAtomic,debugAtomicStack,guardedBlockChain
 
 CLSS public abstract org.netbeans.editor.ImplementationProvider
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public abstract java.util.ResourceBundle getResourceBundle(java.lang.String)
 meth public abstract javax.swing.Action[] getGlyphGutterActions(javax.swing.text.JTextComponent)
@@ -1717,6 +1752,7 @@ hfds PROVIDER
 hcls ProviderBridge,Wrapper
 
 CLSS public org.netbeans.editor.LocaleSupport
+ anno 0 java.lang.Deprecated()
 cons public init()
 innr public abstract interface static Localizer
 meth public static char getChar(java.lang.String,char)
@@ -1743,12 +1779,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
@@ -2102,12 +2141,14 @@ meth public javax.swing.JPopupMenu getPopupMenu()
 supr javax.swing.JMenu
 
 CLSS public org.netbeans.modules.editor.NbDialogSupport
+ anno 0 java.lang.Deprecated()
 cons public init()
 intf org.netbeans.editor.DialogSupport$DialogFactory
 supr org.netbeans.modules.editor.impl.NbDialogFactory
 
 CLSS public org.netbeans.modules.editor.NbEditorDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 fld public final static java.lang.String INDENT_ENGINE = "indentEngine"
 intf org.openide.text.NbDocument$Annotatable
@@ -2204,12 +2245,14 @@ supr org.netbeans.editor.ActionFactory$RedoAction
 
 CLSS public org.netbeans.modules.editor.NbEditorKit$NbStopMacroRecordingAction
  outer org.netbeans.modules.editor.NbEditorKit
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.modules.editor.NbEditorKit)
 meth protected org.netbeans.editor.MacroDialogSupport getMacroDialogSupport(java.lang.Class)
 supr org.netbeans.editor.ActionFactory$StopMacroRecordingAction
 
 CLSS public final static org.netbeans.modules.editor.NbEditorKit$NbToggleLineNumbersAction
  outer org.netbeans.modules.editor.NbEditorKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected boolean isLineNumbersVisible()
 meth protected void toggleLineNumbers()
@@ -2223,6 +2266,7 @@ supr org.netbeans.editor.ActionFactory$UndoAction
 
 CLSS public static org.netbeans.modules.editor.NbEditorKit$ToggleToolbarAction
  outer org.netbeans.modules.editor.NbEditorKit
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth public javax.swing.JMenuItem getPopupMenuItem(javax.swing.text.JTextComponent)
@@ -2236,6 +2280,7 @@ meth protected int textLimitWidth()
 meth protected javax.swing.JComponent createExtComponent()
 meth protected javax.swing.JToolBar createToolBarComponent()
 meth protected org.netbeans.modules.editor.NbEditorUI$SystemActionUpdater createSystemActionUpdater(java.lang.String,boolean,boolean)
+ anno 0 java.lang.Deprecated()
 meth protected void attachSystemActionPerformer(java.lang.String)
 meth protected void installUI(javax.swing.text.JTextComponent)
 meth protected void uninstallUI(javax.swing.text.JTextComponent)
@@ -2247,6 +2292,7 @@ hcls EnabledPropertySyncListener,LayeredEditorPane,SideBarsListener,SystemAction
 
 CLSS public final org.netbeans.modules.editor.NbEditorUI$SystemActionUpdater
  outer org.netbeans.modules.editor.NbEditorUI
+ anno 0 java.lang.Deprecated()
 intf java.beans.PropertyChangeListener
 intf org.openide.util.actions.ActionPerformer
 meth protected void finalize() throws java.lang.Throwable
@@ -2269,6 +2315,7 @@ meth public static org.openide.loaders.DataObject getDataObject(javax.swing.text
 meth public static org.openide.text.Line getLine(javax.swing.text.Document,int,boolean)
 meth public static org.openide.text.Line getLine(javax.swing.text.JTextComponent,boolean)
 meth public static org.openide.text.Line getLine(org.netbeans.editor.BaseDocument,int,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.windows.TopComponent getOuterTopComponent(javax.swing.text.JTextComponent)
 meth public static org.openide.windows.TopComponent getTopComponent(javax.swing.text.JTextComponent)
 meth public static void addJumpListEntry(org.openide.loaders.DataObject)
@@ -2276,6 +2323,7 @@ meth public static void invalidArgument(java.lang.String)
 supr java.lang.Object
 
 CLSS public org.netbeans.modules.editor.NbImplementationProvider
+ anno 0 java.lang.Deprecated()
 cons public init()
 fld public final static java.lang.String GLYPH_GUTTER_ACTIONS_FOLDER_NAME = "GlyphGutterActions"
 meth public boolean activateComponent(javax.swing.text.JTextComponent)
diff --git a/ide/extbrowser/nbproject/org-netbeans-modules-extbrowser.sig b/ide/extbrowser/nbproject/org-netbeans-modules-extbrowser.sig
index 8496a793dd9c..0ca33549627e 100644
--- a/ide/extbrowser/nbproject/org-netbeans-modules-extbrowser.sig
+++ b/ide/extbrowser/nbproject/org-netbeans-modules-extbrowser.sig
@@ -1061,7 +1061,7 @@ supr java.lang.Object
 hfds serialVersionUID
 
 CLSS public org.openide.util.MapFormat
-cons public init(java.util.Map)
+cons public init(java.util.Map<java.lang.String,?>)
 meth protected java.lang.Object processKey(java.lang.String)
 meth public boolean isExactMatch()
 meth public boolean willThrowExceptionIfKeyWasNotFound()
@@ -1075,7 +1075,7 @@ meth public java.util.Map getMap()
 meth public static java.lang.String format(java.lang.String,java.util.Map)
 meth public void setExactMatch(boolean)
 meth public void setLeftBrace(java.lang.String)
-meth public void setMap(java.util.Map)
+meth public void setMap(java.util.Map<java.lang.String,?>)
 meth public void setRightBrace(java.lang.String)
 meth public void setThrowExceptionIfKeyWasNotFound(boolean)
 supr java.text.Format
diff --git a/ide/extexecution/nbproject/org-netbeans-modules-extexecution.sig b/ide/extexecution/nbproject/org-netbeans-modules-extexecution.sig
index 02fd6c38243e..553cc93687e6 100644
--- a/ide/extexecution/nbproject/org-netbeans-modules-extexecution.sig
+++ b/ide/extexecution/nbproject/org-netbeans-modules-extexecution.sig
@@ -13,6 +13,12 @@ meth public abstract void close() throws java.lang.Exception
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -105,6 +111,7 @@ meth public org.netbeans.api.extexecution.ExecutionDescriptor errLineBased(boole
  anno 0 org.netbeans.api.annotations.common.CheckReturnValue()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public org.netbeans.api.extexecution.ExecutionDescriptor errProcessorFactory(org.netbeans.api.extexecution.ExecutionDescriptor$InputProcessorFactory)
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.CheckReturnValue()
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NullAllowed()
@@ -140,6 +147,7 @@ meth public org.netbeans.api.extexecution.ExecutionDescriptor outLineBased(boole
  anno 0 org.netbeans.api.annotations.common.CheckReturnValue()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public org.netbeans.api.extexecution.ExecutionDescriptor outProcessorFactory(org.netbeans.api.extexecution.ExecutionDescriptor$InputProcessorFactory)
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.CheckReturnValue()
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NullAllowed()
@@ -179,6 +187,7 @@ hcls DescriptorData
 
 CLSS public abstract interface static org.netbeans.api.extexecution.ExecutionDescriptor$InputProcessorFactory
  outer org.netbeans.api.extexecution.ExecutionDescriptor
+ anno 0 java.lang.Deprecated()
 meth public abstract org.netbeans.api.extexecution.input.InputProcessor newInputProcessor(org.netbeans.api.extexecution.input.InputProcessor)
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -219,6 +228,7 @@ hfds LOGGER,descriptor,originalDisplayName,processCreator
 hcls ProgressAction,ProgressCancellable
 
 CLSS public final org.netbeans.api.extexecution.ExternalProcessBuilder
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
  anno 1 org.netbeans.api.annotations.common.NonNull()
 intf java.util.concurrent.Callable<java.lang.Process>
@@ -249,12 +259,14 @@ hfds ESCAPED_PATTERN,LOGGER,PROXY_AUTHENTICATION_PASSWORD,PROXY_AUTHENTICATION_U
 hcls BuilderData
 
 CLSS public final org.netbeans.api.extexecution.ExternalProcessSupport
+ anno 0 java.lang.Deprecated()
 meth public static void destroy(java.lang.Process,java.util.Map<java.lang.String,java.lang.String>)
  anno 1 org.netbeans.api.annotations.common.NonNull()
  anno 2 org.netbeans.api.annotations.common.NonNull()
 supr java.lang.Object
 
 CLSS public final org.netbeans.api.extexecution.ProcessBuilder
+ anno 0 java.lang.Deprecated()
 intf java.util.concurrent.Callable<java.lang.Process>
 meth public java.lang.Process call() throws java.io.IOException
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -277,6 +289,7 @@ hfds arguments,description,envVariables,executable,implementation,paths,redirect
 hcls LocalProcessFactory
 
 CLSS public abstract interface org.netbeans.api.extexecution.input.InputProcessor
+ anno 0 java.lang.Deprecated()
 intf java.io.Closeable
 meth public abstract void close() throws java.io.IOException
 meth public abstract void processInput(char[]) throws java.io.IOException
@@ -284,6 +297,7 @@ meth public abstract void processInput(char[]) throws java.io.IOException
 meth public abstract void reset() throws java.io.IOException
 
 CLSS public final org.netbeans.api.extexecution.input.InputProcessors
+ anno 0 java.lang.Deprecated()
 meth public !varargs static org.netbeans.api.extexecution.input.InputProcessor proxy(org.netbeans.api.extexecution.input.InputProcessor[])
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -306,12 +320,14 @@ meth public static org.netbeans.api.extexecution.input.InputProcessor printing(o
 supr java.lang.Object
 
 CLSS public abstract interface org.netbeans.api.extexecution.input.InputReader
+ anno 0 java.lang.Deprecated()
 intf java.io.Closeable
 meth public abstract int readInput(org.netbeans.api.extexecution.input.InputProcessor) throws java.io.IOException
  anno 1 org.netbeans.api.annotations.common.NullAllowed()
 meth public abstract void close() throws java.io.IOException
 
 CLSS public final org.netbeans.api.extexecution.input.InputReaderTask
+ anno 0 java.lang.Deprecated()
 intf java.lang.Runnable
 intf org.openide.util.Cancellable
 meth public boolean cancel()
@@ -329,6 +345,7 @@ hfds delegate
 hcls BaseInputReader
 
 CLSS public final org.netbeans.api.extexecution.input.InputReaders
+ anno 0 java.lang.Deprecated()
 innr public final static FileInput
 meth public static org.netbeans.api.extexecution.input.InputReader forFile(java.io.File,java.nio.charset.Charset)
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -365,6 +382,7 @@ meth public abstract org.netbeans.api.extexecution.input.InputReaders$FileInput
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
 
 CLSS public abstract interface org.netbeans.api.extexecution.input.LineProcessor
+ anno 0 java.lang.Deprecated()
 intf java.io.Closeable
 meth public abstract void close()
 meth public abstract void processLine(java.lang.String)
@@ -372,6 +390,7 @@ meth public abstract void processLine(java.lang.String)
 meth public abstract void reset()
 
 CLSS public final org.netbeans.api.extexecution.input.LineProcessors
+ anno 0 java.lang.Deprecated()
 meth public !varargs static org.netbeans.api.extexecution.input.LineProcessor proxy(org.netbeans.api.extexecution.input.LineProcessor[])
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -489,10 +508,12 @@ hfds mode
 CLSS abstract interface org.netbeans.api.extexecution.startup.package-info
 
 CLSS public org.netbeans.spi.extexecution.ProcessBuilderFactory
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.extexecution.ProcessBuilder createProcessBuilder(org.netbeans.spi.extexecution.ProcessBuilderImplementation,java.lang.String)
 supr java.lang.Object
 
 CLSS public abstract interface org.netbeans.spi.extexecution.ProcessBuilderImplementation
+ anno 0 java.lang.Deprecated()
 meth public abstract java.lang.Process createProcess(java.lang.String,java.lang.String,java.util.List<java.lang.String>,java.util.List<java.lang.String>,java.util.Map<java.lang.String,java.lang.String>,boolean) throws java.io.IOException
  anno 0 org.netbeans.api.annotations.common.NonNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -502,6 +523,7 @@ meth public abstract java.lang.Process createProcess(java.lang.String,java.lang.
  anno 5 org.netbeans.api.annotations.common.NonNull()
 
 CLSS public abstract interface org.netbeans.spi.extexecution.destroy.ProcessDestroyPerformer
+ anno 0 java.lang.Deprecated()
 meth public abstract void destroy(java.lang.Process,java.util.Map<java.lang.String,java.lang.String>)
 
 CLSS abstract interface org.netbeans.spi.extexecution.destroy.package-info
diff --git a/ide/html.editor/nbproject/org-netbeans-modules-html-editor.sig b/ide/html.editor/nbproject/org-netbeans-modules-html-editor.sig
index adea636c438c..fbf775937118 100644
--- a/ide/html.editor/nbproject/org-netbeans-modules-html-editor.sig
+++ b/ide/html.editor/nbproject/org-netbeans-modules-html-editor.sig
@@ -323,9 +323,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -340,10 +342,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -360,12 +366,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
diff --git a/ide/lexer/nbproject/org-netbeans-modules-lexer.sig b/ide/lexer/nbproject/org-netbeans-modules-lexer.sig
index 027796c7e2a1..6418a0cf0c0f 100644
--- a/ide/lexer/nbproject/org-netbeans-modules-lexer.sig
+++ b/ide/lexer/nbproject/org-netbeans-modules-lexer.sig
@@ -331,8 +331,10 @@ hfds thc
 
 CLSS public final org.netbeans.spi.lexer.TokenFactory<%0 extends org.netbeans.api.lexer.TokenId>
 fld public final static org.netbeans.api.lexer.Token SKIP_TOKEN
+ anno 0 java.lang.Deprecated()
 meth public boolean isSkipToken(org.netbeans.api.lexer.Token<{org.netbeans.spi.lexer.TokenFactory%0}>)
 meth public org.netbeans.api.lexer.Token<{org.netbeans.spi.lexer.TokenFactory%0}> createCustomTextToken({org.netbeans.spi.lexer.TokenFactory%0},java.lang.CharSequence,int,org.netbeans.api.lexer.PartType)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.api.lexer.Token<{org.netbeans.spi.lexer.TokenFactory%0}> createPropertyToken({org.netbeans.spi.lexer.TokenFactory%0},int,org.netbeans.spi.lexer.TokenPropertyProvider<{org.netbeans.spi.lexer.TokenFactory%0}>)
 meth public org.netbeans.api.lexer.Token<{org.netbeans.spi.lexer.TokenFactory%0}> createPropertyToken({org.netbeans.spi.lexer.TokenFactory%0},int,org.netbeans.spi.lexer.TokenPropertyProvider<{org.netbeans.spi.lexer.TokenFactory%0}>,org.netbeans.api.lexer.PartType)
 meth public org.netbeans.api.lexer.Token<{org.netbeans.spi.lexer.TokenFactory%0}> createToken({org.netbeans.spi.lexer.TokenFactory%0})
diff --git a/ide/libs.antlr4.runtime/nbproject/org-netbeans-libs-antlr4-runtime.sig b/ide/libs.antlr4.runtime/nbproject/org-netbeans-libs-antlr4-runtime.sig
index 9d3737246c07..c9301050e745 100644
--- a/ide/libs.antlr4.runtime/nbproject/org-netbeans-libs-antlr4-runtime.sig
+++ b/ide/libs.antlr4.runtime/nbproject/org-netbeans-libs-antlr4-runtime.sig
@@ -8,6 +8,12 @@ CLSS public abstract interface java.lang.Cloneable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -343,6 +349,7 @@ meth public abstract void reset(org.antlr.v4.runtime.Parser)
 meth public abstract void sync(org.antlr.v4.runtime.Parser)
 
 CLSS public org.antlr.v4.runtime.ANTLRFileStream
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String) throws java.io.IOException
 cons public init(java.lang.String,java.lang.String) throws java.io.IOException
 fld protected java.lang.String fileName
@@ -351,6 +358,7 @@ meth public void load(java.lang.String,java.lang.String) throws java.io.IOExcept
 supr org.antlr.v4.runtime.ANTLRInputStream
 
 CLSS public org.antlr.v4.runtime.ANTLRInputStream
+ anno 0 java.lang.Deprecated()
 cons public init()
 cons public init(char[],int)
 cons public init(java.io.InputStream) throws java.io.IOException
@@ -542,7 +550,7 @@ meth public int getTokenIndex()
 meth public int getType()
 meth public java.lang.String getText()
 meth public java.lang.String toString()
-meth public java.lang.String toString(org.antlr.v4.runtime.Recognizer)
+meth public java.lang.String toString(org.antlr.v4.runtime.Recognizer<?,?>)
 meth public org.antlr.v4.runtime.CharStream getInputStream()
 meth public org.antlr.v4.runtime.TokenSource getTokenSource()
 meth public void setChannel(int)
@@ -838,6 +846,7 @@ meth public org.antlr.v4.runtime.tree.pattern.ParseTreePattern compileParseTreeP
 meth public org.antlr.v4.runtime.tree.pattern.ParseTreePattern compileParseTreePattern(java.lang.String,int,org.antlr.v4.runtime.Lexer)
 meth public void addParseListener(org.antlr.v4.runtime.tree.ParseTreeListener)
 meth public void dumpDFA()
+meth public void dumpDFA(java.io.PrintStream)
 meth public void enterOuterAlt(org.antlr.v4.runtime.ParserRuleContext,int)
 meth public void enterRecursionRule(org.antlr.v4.runtime.ParserRuleContext,int)
  anno 0 java.lang.Deprecated()
@@ -925,6 +934,7 @@ hfds vocabulary
 CLSS public org.antlr.v4.runtime.ParserRuleContext
 cons public init()
 cons public init(org.antlr.v4.runtime.ParserRuleContext,int)
+fld public final static org.antlr.v4.runtime.ParserRuleContext EMPTY
 fld public java.util.List<org.antlr.v4.runtime.tree.ParseTree> children
 fld public org.antlr.v4.runtime.RecognitionException exception
 fld public org.antlr.v4.runtime.Token start
@@ -1019,7 +1029,6 @@ hfds _listeners,_stateNumber,ruleIndexMapCache,tokenTypeMapCache
 CLSS public org.antlr.v4.runtime.RuleContext
 cons public init()
 cons public init(org.antlr.v4.runtime.RuleContext,int)
-fld public final static org.antlr.v4.runtime.ParserRuleContext EMPTY
 fld public int invokingState
 fld public org.antlr.v4.runtime.RuleContext parent
 intf org.antlr.v4.runtime.tree.RuleNode
@@ -1057,7 +1066,7 @@ supr org.antlr.v4.runtime.ParserRuleContext
 
 CLSS public org.antlr.v4.runtime.RuntimeMetaData
 cons public init()
-fld public final static java.lang.String VERSION = "4.7.2"
+fld public final static java.lang.String VERSION = "4.11.1"
 meth public static java.lang.String getMajorMinorVersion(java.lang.String)
 meth public static java.lang.String getRuntimeVersion()
 meth public static void checkVersion(java.lang.String,java.lang.String)
@@ -1246,6 +1255,9 @@ meth public int getMaxTokenType()
 meth public java.lang.String getDisplayName(int)
 meth public java.lang.String getLiteralName(int)
 meth public java.lang.String getSymbolicName(int)
+meth public java.lang.String[] getDisplayNames()
+meth public java.lang.String[] getLiteralNames()
+meth public java.lang.String[] getSymbolicNames()
 meth public static org.antlr.v4.runtime.Vocabulary fromTokenNames(java.lang.String[])
 supr java.lang.Object
 hfds EMPTY_NAMES,displayNames,literalNames,maxTokenType,symbolicNames
@@ -1391,69 +1403,40 @@ CLSS public org.antlr.v4.runtime.atn.ATNDeserializer
 cons public init()
 cons public init(org.antlr.v4.runtime.atn.ATNDeserializationOptions)
 fld public final static int SERIALIZED_VERSION
-fld public final static java.util.UUID SERIALIZED_UUID
 meth protected org.antlr.v4.runtime.atn.ATNState stateFactory(int,int)
 meth protected org.antlr.v4.runtime.atn.LexerAction lexerActionFactory(org.antlr.v4.runtime.atn.LexerActionType,int,int)
 meth protected org.antlr.v4.runtime.atn.Transition edgeFactory(org.antlr.v4.runtime.atn.ATN,int,int,int,int,int,int,java.util.List<org.antlr.v4.runtime.misc.IntervalSet>)
-meth protected static boolean isFeatureSupported(java.util.UUID,java.util.UUID)
 meth protected static int toInt(char)
 meth protected static int toInt32(char[],int)
-meth protected static java.util.UUID toUUID(char[],int)
-meth protected static long toLong(char[],int)
+meth protected static int toInt32(int[],int)
 meth protected void checkCondition(boolean)
 meth protected void checkCondition(boolean,java.lang.String)
 meth protected void markPrecedenceDecisions(org.antlr.v4.runtime.atn.ATN)
 meth protected void verifyATN(org.antlr.v4.runtime.atn.ATN)
 meth public org.antlr.v4.runtime.atn.ATN deserialize(char[])
+meth public org.antlr.v4.runtime.atn.ATN deserialize(int[])
+meth public static int[] decodeIntsEncodedAs16BitWords(char[])
+meth public static int[] decodeIntsEncodedAs16BitWords(char[],boolean)
+meth public static org.antlr.v4.runtime.misc.IntegerList encodeIntsWith16BitWords(org.antlr.v4.runtime.misc.IntegerList)
 supr java.lang.Object
-hfds ADDED_LEXER_ACTIONS,ADDED_PRECEDENCE_TRANSITIONS,ADDED_UNICODE_SMP,BASE_SERIALIZED_UUID,SUPPORTED_UUIDS,deserializationOptions
-hcls UnicodeDeserializer,UnicodeDeserializingMode
+hfds deserializationOptions
 
 CLSS public org.antlr.v4.runtime.atn.ATNSerializer
 cons public init(org.antlr.v4.runtime.atn.ATN)
-cons public init(org.antlr.v4.runtime.atn.ATN,java.util.List<java.lang.String>)
 fld public org.antlr.v4.runtime.atn.ATN atn
-meth public java.lang.String decode(char[])
-meth public java.lang.String getTokenName(int)
 meth public org.antlr.v4.runtime.misc.IntegerList serialize()
-meth public static char[] getSerializedAsChars(org.antlr.v4.runtime.atn.ATN)
-meth public static java.lang.String getDecoded(org.antlr.v4.runtime.atn.ATN,java.util.List<java.lang.String>)
-meth public static java.lang.String getSerializedAsString(org.antlr.v4.runtime.atn.ATN)
 meth public static org.antlr.v4.runtime.misc.IntegerList getSerialized(org.antlr.v4.runtime.atn.ATN)
 supr java.lang.Object
-hfds tokenNames
-hcls CodePointSerializer
+hfds data,nonGreedyStates,precedenceStates,sets
 
 CLSS public abstract org.antlr.v4.runtime.atn.ATNSimulator
 cons public init(org.antlr.v4.runtime.atn.ATN,org.antlr.v4.runtime.atn.PredictionContextCache)
 fld protected final org.antlr.v4.runtime.atn.PredictionContextCache sharedContextCache
 fld public final org.antlr.v4.runtime.atn.ATN atn
-fld public final static int SERIALIZED_VERSION
- anno 0 java.lang.Deprecated()
-fld public final static java.util.UUID SERIALIZED_UUID
- anno 0 java.lang.Deprecated()
 fld public final static org.antlr.v4.runtime.dfa.DFAState ERROR
 meth public abstract void reset()
 meth public org.antlr.v4.runtime.atn.PredictionContext getCachedContext(org.antlr.v4.runtime.atn.PredictionContext)
 meth public org.antlr.v4.runtime.atn.PredictionContextCache getSharedContextCache()
-meth public static int toInt(char)
- anno 0 java.lang.Deprecated()
-meth public static int toInt32(char[],int)
- anno 0 java.lang.Deprecated()
-meth public static java.util.UUID toUUID(char[],int)
- anno 0 java.lang.Deprecated()
-meth public static long toLong(char[],int)
- anno 0 java.lang.Deprecated()
-meth public static org.antlr.v4.runtime.atn.ATN deserialize(char[])
- anno 0 java.lang.Deprecated()
-meth public static org.antlr.v4.runtime.atn.ATNState stateFactory(int,int)
- anno 0 java.lang.Deprecated()
-meth public static org.antlr.v4.runtime.atn.Transition edgeFactory(org.antlr.v4.runtime.atn.ATN,int,int,int,int,int,int,java.util.List<org.antlr.v4.runtime.misc.IntervalSet>)
- anno 0 java.lang.Deprecated()
-meth public static void checkCondition(boolean)
- anno 0 java.lang.Deprecated()
-meth public static void checkCondition(boolean,java.lang.String)
- anno 0 java.lang.Deprecated()
 meth public void clearDFA()
 supr java.lang.Object
 
@@ -1620,7 +1603,7 @@ fld public int decision
 supr org.antlr.v4.runtime.atn.ATNState
 
 CLSS public org.antlr.v4.runtime.atn.EmptyPredictionContext
-cons public init()
+fld public final static org.antlr.v4.runtime.atn.EmptyPredictionContext Instance
 meth public boolean equals(java.lang.Object)
 meth public boolean isEmpty()
 meth public int getReturnState(int)
@@ -1681,7 +1664,6 @@ fld public final static boolean debug = false
 fld public final static boolean dfa_debug = false
 fld public final static int MAX_DFA_EDGE = 127
 fld public final static int MIN_DFA_EDGE = 0
-fld public static int match_calls
 innr protected static SimState
 meth protected boolean closure(org.antlr.v4.runtime.CharStream,org.antlr.v4.runtime.atn.LexerATNConfig,org.antlr.v4.runtime.atn.ATNConfigSet,boolean,boolean,boolean)
 meth protected boolean evaluatePredicate(org.antlr.v4.runtime.CharStream,int,int,boolean)
@@ -2015,8 +1997,6 @@ cons protected init(int)
 fld public final int cachedHashCode
 fld public final int id
 fld public final static int EMPTY_RETURN_STATE = 2147483647
-fld public final static org.antlr.v4.runtime.atn.EmptyPredictionContext EMPTY
-fld public static int globalNodeCount
 meth protected static int calculateEmptyHashCode()
 meth protected static int calculateHashCode(org.antlr.v4.runtime.atn.PredictionContext,int)
 meth protected static int calculateHashCode(org.antlr.v4.runtime.atn.PredictionContext[],int[])
@@ -2041,7 +2021,7 @@ meth public static org.antlr.v4.runtime.atn.PredictionContext mergeRoot(org.antl
 meth public static org.antlr.v4.runtime.atn.PredictionContext mergeSingletons(org.antlr.v4.runtime.atn.SingletonPredictionContext,org.antlr.v4.runtime.atn.SingletonPredictionContext,boolean,org.antlr.v4.runtime.misc.DoubleKeyMap<org.antlr.v4.runtime.atn.PredictionContext,org.antlr.v4.runtime.atn.PredictionContext,org.antlr.v4.runtime.atn.PredictionContext>)
 meth public static void getAllContextNodes_(org.antlr.v4.runtime.atn.PredictionContext,java.util.List<org.antlr.v4.runtime.atn.PredictionContext>,java.util.Map<org.antlr.v4.runtime.atn.PredictionContext,org.antlr.v4.runtime.atn.PredictionContext>)
 supr java.lang.Object
-hfds INITIAL_HASH
+hfds INITIAL_HASH,globalNodeCount
 
 CLSS public org.antlr.v4.runtime.atn.PredictionContextCache
 cons public init()
@@ -2132,9 +2112,9 @@ supr org.antlr.v4.runtime.atn.Transition
 
 CLSS public abstract org.antlr.v4.runtime.atn.SemanticContext
 cons public init()
-fld public final static org.antlr.v4.runtime.atn.SemanticContext NONE
 innr public abstract static Operator
 innr public static AND
+innr public static Empty
 innr public static OR
 innr public static PrecedencePredicate
 innr public static Predicate
@@ -2156,6 +2136,13 @@ meth public java.util.Collection<org.antlr.v4.runtime.atn.SemanticContext> getOp
 meth public org.antlr.v4.runtime.atn.SemanticContext evalPrecedence(org.antlr.v4.runtime.Recognizer<?,?>,org.antlr.v4.runtime.RuleContext)
 supr org.antlr.v4.runtime.atn.SemanticContext$Operator
 
+CLSS public static org.antlr.v4.runtime.atn.SemanticContext$Empty
+ outer org.antlr.v4.runtime.atn.SemanticContext
+cons public init()
+fld public final static org.antlr.v4.runtime.atn.SemanticContext$Empty Instance
+meth public boolean eval(org.antlr.v4.runtime.Recognizer<?,?>,org.antlr.v4.runtime.RuleContext)
+supr org.antlr.v4.runtime.atn.SemanticContext
+
 CLSS public static org.antlr.v4.runtime.atn.SemanticContext$OR
  outer org.antlr.v4.runtime.atn.SemanticContext
 cons public init(org.antlr.v4.runtime.atn.SemanticContext,org.antlr.v4.runtime.atn.SemanticContext)
@@ -2344,9 +2331,10 @@ CLSS public org.antlr.v4.runtime.misc.Array2DHashSet<%0 extends java.lang.Object
 cons public init()
 cons public init(org.antlr.v4.runtime.misc.AbstractEqualityComparator<? super {org.antlr.v4.runtime.misc.Array2DHashSet%0}>)
 cons public init(org.antlr.v4.runtime.misc.AbstractEqualityComparator<? super {org.antlr.v4.runtime.misc.Array2DHashSet%0}>,int,int)
+fld protected final int initialBucketCapacity
+fld protected final int initialCapacity
 fld protected final org.antlr.v4.runtime.misc.AbstractEqualityComparator<? super {org.antlr.v4.runtime.misc.Array2DHashSet%0}> comparator
 fld protected int currentPrime
-fld protected int initialBucketCapacity
 fld protected int n
 fld protected int threshold
 fld protected {org.antlr.v4.runtime.misc.Array2DHashSet%0}[][] buckets
@@ -2413,9 +2401,10 @@ CLSS public org.antlr.v4.runtime.misc.FlexibleHashMap<%0 extends java.lang.Objec
 cons public init()
 cons public init(org.antlr.v4.runtime.misc.AbstractEqualityComparator<? super {org.antlr.v4.runtime.misc.FlexibleHashMap%0}>)
 cons public init(org.antlr.v4.runtime.misc.AbstractEqualityComparator<? super {org.antlr.v4.runtime.misc.FlexibleHashMap%0}>,int,int)
+fld protected final int initialBucketCapacity
+fld protected final int initialCapacity
 fld protected final org.antlr.v4.runtime.misc.AbstractEqualityComparator<? super {org.antlr.v4.runtime.misc.FlexibleHashMap%0}> comparator
 fld protected int currentPrime
-fld protected int initialBucketCapacity
 fld protected int n
 fld protected int threshold
 fld protected java.util.LinkedList<org.antlr.v4.runtime.misc.FlexibleHashMap$Entry<{org.antlr.v4.runtime.misc.FlexibleHashMap%0},{org.antlr.v4.runtime.misc.FlexibleHashMap%1}>>[] buckets
@@ -2524,10 +2513,6 @@ fld public final static int INTERVAL_POOL_MAX_VALUE = 1000
 fld public final static org.antlr.v4.runtime.misc.Interval INVALID
 fld public int a
 fld public int b
-fld public static int creates
-fld public static int hits
-fld public static int misses
-fld public static int outOfRange
 meth public boolean adjacent(org.antlr.v4.runtime.misc.Interval)
 meth public boolean disjoint(org.antlr.v4.runtime.misc.Interval)
 meth public boolean equals(java.lang.Object)
@@ -2632,6 +2617,7 @@ supr java.lang.Object
 hfds DEFAULT_SEED
 
 CLSS public abstract interface !annotation org.antlr.v4.runtime.misc.NotNull
+ anno 0 java.lang.Deprecated()
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=CLASS)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[FIELD, METHOD, PARAMETER, LOCAL_VARIABLE])
@@ -2683,6 +2669,7 @@ CLSS public abstract interface org.antlr.v4.runtime.misc.Predicate<%0 extends ja
 meth public abstract boolean test({org.antlr.v4.runtime.misc.Predicate%0})
 
 CLSS public org.antlr.v4.runtime.misc.TestRig
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth public static void main(java.lang.String[])
 supr java.lang.Object
@@ -2830,6 +2817,7 @@ meth public static java.util.Collection<org.antlr.v4.runtime.tree.ParseTree> fin
 meth public static java.util.Collection<org.antlr.v4.runtime.tree.ParseTree> findAllTokenNodes(org.antlr.v4.runtime.tree.ParseTree,int)
 meth public static java.util.List<? extends org.antlr.v4.runtime.tree.Tree> getAncestors(org.antlr.v4.runtime.tree.Tree)
 meth public static java.util.List<org.antlr.v4.runtime.tree.ParseTree> descendants(org.antlr.v4.runtime.tree.ParseTree)
+ anno 0 java.lang.Deprecated()
 meth public static java.util.List<org.antlr.v4.runtime.tree.ParseTree> findAllNodes(org.antlr.v4.runtime.tree.ParseTree,int,boolean)
 meth public static java.util.List<org.antlr.v4.runtime.tree.ParseTree> getDescendants(org.antlr.v4.runtime.tree.ParseTree)
 meth public static java.util.List<org.antlr.v4.runtime.tree.Tree> getChildren(org.antlr.v4.runtime.tree.Tree)
diff --git a/ide/options.editor/nbproject/org-netbeans-modules-options-editor.sig b/ide/options.editor/nbproject/org-netbeans-modules-options-editor.sig
index c17c0276c805..a2092a5c1363 100644
--- a/ide/options.editor/nbproject/org-netbeans-modules-options-editor.sig
+++ b/ide/options.editor/nbproject/org-netbeans-modules-options-editor.sig
@@ -391,6 +391,12 @@ CLSS public abstract interface java.io.Serializable
 CLSS public abstract interface java.lang.Comparable<%0 extends java.lang.Object>
 meth public abstract int compareTo({java.lang.Comparable%0})
 
+CLSS public abstract interface !annotation java.lang.Deprecated
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[CONSTRUCTOR, FIELD, LOCAL_VARIABLE, METHOD, PACKAGE, PARAMETER, TYPE])
+intf java.lang.annotation.Annotation
+
 CLSS public abstract java.lang.Enum<%0 extends java.lang.Enum<{java.lang.Enum%0}>>
 cons protected init(java.lang.String,int)
 intf java.io.Serializable
@@ -952,7 +958,6 @@ meth public void propertyChange(java.beans.PropertyChangeEvent)
 meth public void setSelector(org.netbeans.modules.options.indentation.CustomizerSelector)
 supr javax.swing.JPanel
 hfds categoryCombo,categoryLabel,categoryPanel,jSplitPane1,languageCombo,languageLabel,optionsPanel,previewLabel,previewPanel,previewScrollPane,selector,storedCategory,storedMimeType,weakListener
-hcls LanguagesComparator
 
 CLSS public final org.netbeans.modules.options.indentation.FormattingPanelController
 cons public init()
@@ -1029,6 +1034,7 @@ supr java.lang.Object
 hfds LOG,allLanguagesPreferences,delegate,indentationPanel,mimePath,preferences,prefsFactory
 
 CLSS public final org.netbeans.modules.options.indentation.ProxyPreferences
+ anno 0 java.lang.Deprecated()
 intf java.util.prefs.NodeChangeListener
 intf java.util.prefs.PreferenceChangeListener
 meth public boolean getBoolean(java.lang.String,boolean)
diff --git a/ide/projectui/nbproject/org-netbeans-modules-projectui.sig b/ide/projectui/nbproject/org-netbeans-modules-projectui.sig
index bd91bcd42b8a..86ebb0ddf926 100644
--- a/ide/projectui/nbproject/org-netbeans-modules-projectui.sig
+++ b/ide/projectui/nbproject/org-netbeans-modules-projectui.sig
@@ -23,6 +23,7 @@ supr java.lang.Object
 
 CLSS public org.netbeans.modules.project.ui.api.ProjectTemplates
 fld public final static java.lang.String PRESELECT_CATEGORY = "PRESELECT_CATEGORY"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String PRESELECT_TEMPLATE = "PRESELECT_TEMPLATE"
 supr java.lang.Object
 
diff --git a/ide/properties.syntax/nbproject/org-netbeans-modules-properties-syntax.sig b/ide/properties.syntax/nbproject/org-netbeans-modules-properties-syntax.sig
index a45d9e8a2ab9..b43a7694d34b 100644
--- a/ide/properties.syntax/nbproject/org-netbeans-modules-properties-syntax.sig
+++ b/ide/properties.syntax/nbproject/org-netbeans-modules-properties-syntax.sig
@@ -258,9 +258,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -275,10 +277,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -348,12 +354,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
diff --git a/ide/properties/nbproject/org-netbeans-modules-properties.sig b/ide/properties/nbproject/org-netbeans-modules-properties.sig
index 73b90e8ec6ac..303f54a6a683 100644
--- a/ide/properties/nbproject/org-netbeans-modules-properties.sig
+++ b/ide/properties/nbproject/org-netbeans-modules-properties.sig
@@ -985,6 +985,7 @@ meth public final boolean canCut()
 meth public javax.swing.Action getPreferredAction()
 meth public org.netbeans.modules.properties.PresentableFileEntry getFileEntry()
 meth public org.openide.util.actions.SystemAction getDefaultAction()
+ anno 0 java.lang.Deprecated()
 meth public void destroy() throws java.io.IOException
 meth public void setName(java.lang.String)
 supr org.openide.nodes.AbstractNode
@@ -1068,6 +1069,7 @@ meth protected abstract org.openide.nodes.Node createNodeDelegate()
 meth protected final org.openide.nodes.CookieSet getCookieSet()
 meth protected final void firePropertyChange(java.lang.String,java.lang.Object,java.lang.Object)
 meth protected final void setCookieSet(org.openide.nodes.CookieSet)
+ anno 0 java.lang.Deprecated()
 meth public <%0 extends org.openide.nodes.Node$Cookie> {%%0} getCookie(java.lang.Class<{%%0}>)
 meth public abstract boolean isCopyAllowed()
 meth public abstract boolean isDeleteAllowed()
diff --git a/ide/schema2beans/nbproject/org-netbeans-modules-schema2beans.sig b/ide/schema2beans/nbproject/org-netbeans-modules-schema2beans.sig
index b10e1faa08fb..cf21ed47d509 100644
--- a/ide/schema2beans/nbproject/org-netbeans-modules-schema2beans.sig
+++ b/ide/schema2beans/nbproject/org-netbeans-modules-schema2beans.sig
@@ -1142,13 +1142,16 @@ meth public static boolean shouldEscape(char)
 meth public static boolean shouldEscape(java.lang.String)
 meth public static org.xml.sax.Locator findLocationXPath(org.xml.sax.InputSource,java.lang.String) throws java.io.IOException,org.xml.sax.SAXException
 meth public static void printXML(java.io.Writer,char,boolean) throws java.io.IOException
+ anno 0 java.lang.Deprecated()
 meth public static void printXML(java.io.Writer,java.lang.String) throws java.io.IOException
 meth public static void printXML(java.io.Writer,java.lang.String,boolean) throws java.io.IOException
 meth public static void printXML(java.lang.StringBuffer,char,boolean)
+ anno 0 java.lang.Deprecated()
 meth public static void printXML(java.lang.StringBuffer,java.lang.String)
 meth public static void printXML(java.lang.StringBuffer,java.lang.String,boolean)
 meth public static void reindent(org.w3c.dom.Document,java.lang.String)
 meth public static void writeXML(java.io.Writer,char,boolean) throws java.io.IOException
+ anno 0 java.lang.Deprecated()
 meth public static void writeXML(java.io.Writer,java.lang.String) throws java.io.IOException
 meth public static void writeXML(java.io.Writer,java.lang.String,boolean) throws java.io.IOException
 supr java.lang.Object
diff --git a/ide/spi.debugger.ui/nbproject/org-netbeans-spi-debugger-ui.sig b/ide/spi.debugger.ui/nbproject/org-netbeans-spi-debugger-ui.sig
index ad6fec73bb07..d30822e3a8fe 100644
--- a/ide/spi.debugger.ui/nbproject/org-netbeans-spi-debugger-ui.sig
+++ b/ide/spi.debugger.ui/nbproject/org-netbeans-spi-debugger-ui.sig
@@ -298,6 +298,7 @@ meth public abstract org.netbeans.spi.debugger.ui.ColumnModelRegistration[] valu
 
 CLSS public abstract interface org.netbeans.spi.debugger.ui.Constants
 fld public final static java.lang.String BREAKPOINT_ENABLED_COLUMN_ID = "BreakpointEnabled"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String CALL_STACK_FRAME_LOCATION_COLUMN_ID = "CallStackFrameLocation"
 fld public final static java.lang.String LOCALS_TO_STRING_COLUMN_ID = "LocalsToString"
 fld public final static java.lang.String LOCALS_TYPE_COLUMN_ID = "LocalsType"
diff --git a/ide/spi.viewmodel/nbproject/org-netbeans-spi-viewmodel.sig b/ide/spi.viewmodel/nbproject/org-netbeans-spi-viewmodel.sig
index cec9fa612548..c414c1f45068 100644
--- a/ide/spi.viewmodel/nbproject/org-netbeans-spi-viewmodel.sig
+++ b/ide/spi.viewmodel/nbproject/org-netbeans-spi-viewmodel.sig
@@ -138,8 +138,11 @@ meth public int getColumnWidth()
 meth public int getCurrentOrderNumber()
 meth public java.beans.PropertyEditor getPropertyEditor()
 meth public java.lang.Character getDisplayedMnemonic()
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getNextColumnID()
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getPreviuosColumnID()
+ anno 0 java.lang.Deprecated()
 meth public java.lang.String getShortDescription()
 meth public void setColumnWidth(int)
 meth public void setCurrentOrderNumber(int)
diff --git a/ide/versioning.util/nbproject/org-netbeans-modules-versioning-util.sig b/ide/versioning.util/nbproject/org-netbeans-modules-versioning-util.sig
index 89653014539d..06a85ee90792 100644
--- a/ide/versioning.util/nbproject/org-netbeans-modules-versioning-util.sig
+++ b/ide/versioning.util/nbproject/org-netbeans-modules-versioning-util.sig
@@ -2634,9 +2634,11 @@ meth public static boolean isAncestorOrEqual(java.io.File,java.io.File)
 meth public static boolean isFileContentText(java.io.File)
 meth public static boolean isForbiddenFolder(java.io.File)
 meth public static boolean isForbiddenFolder(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public static boolean isForbiddenFolder(org.netbeans.modules.versioning.core.api.VCSFileProxy)
 meth public static boolean isFromMultiFileDataObject(org.netbeans.modules.versioning.spi.VCSContext)
 meth public static boolean isScanForbidden(java.io.File)
+ anno 0 java.lang.Deprecated()
 meth public static boolean shareCommonDataObject(java.io.File[])
 meth public static java.awt.Point getPositionForPopup(javax.swing.JList)
 meth public static java.awt.Point getPositionForPopup(javax.swing.JTable)
@@ -2652,6 +2654,7 @@ meth public static java.io.Reader createReader(java.io.File) throws java.io.File
 meth public static java.io.Reader createReader(org.openide.filesystems.FileObject) throws java.io.FileNotFoundException
 meth public static java.io.Reader getDocumentReader(javax.swing.text.Document)
 meth public static java.lang.Integer getPriority(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public static java.lang.String getActionName(java.lang.Class,java.lang.String,org.netbeans.modules.versioning.spi.VCSContext)
 meth public static java.lang.String getContextDisplayName(org.netbeans.modules.versioning.spi.VCSContext)
 meth public static java.lang.String getHash(java.lang.String,byte[]) throws java.security.NoSuchAlgorithmException
diff --git a/ide/xml.retriever/nbproject/org-netbeans-modules-xml-retriever.sig b/ide/xml.retriever/nbproject/org-netbeans-modules-xml-retriever.sig
index 269991f518e6..06763064e2a3 100644
--- a/ide/xml.retriever/nbproject/org-netbeans-modules-xml-retriever.sig
+++ b/ide/xml.retriever/nbproject/org-netbeans-modules-xml-retriever.sig
@@ -115,6 +115,7 @@ cons public init()
 meth public abstract java.io.File getProjectCatalog()
  anno 0 java.lang.Deprecated()
 meth public abstract java.io.File retrieveResource(java.io.File,java.net.URI) throws java.io.IOException,java.net.URISyntaxException
+ anno 0 java.lang.Deprecated()
 meth public abstract java.util.Map<org.netbeans.modules.xml.retriever.RetrieveEntry,java.lang.Exception> getRetrievedResourceExceptionMap()
 meth public abstract org.openide.filesystems.FileObject retrieveResource(org.openide.filesystems.FileObject,java.net.URI) throws java.io.IOException,java.net.URISyntaxException
 meth public abstract org.openide.filesystems.FileObject retrieveResource(org.openide.filesystems.FileObject,java.net.URI,java.net.URI) throws java.io.IOException,java.net.URISyntaxException
diff --git a/ide/xml.text.obsolete90/nbproject/org-netbeans-modules-xml-text-obsolete90.sig b/ide/xml.text.obsolete90/nbproject/org-netbeans-modules-xml-text-obsolete90.sig
index 2628a88f8f20..be1e9807089a 100644
--- a/ide/xml.text.obsolete90/nbproject/org-netbeans-modules-xml-text-obsolete90.sig
+++ b/ide/xml.text.obsolete90/nbproject/org-netbeans-modules-xml-text-obsolete90.sig
@@ -358,6 +358,7 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,int)
 fld protected int updateMask
 fld public final static int ABBREV_RESET = 4
+ anno 0 java.lang.Deprecated()
 fld public final static int CLEAR_STATUS_TEXT = 32
 fld public final static int MAGIC_POSITION_RESET = 2
 fld public final static int NO_RECORDING = 64
@@ -374,6 +375,7 @@ meth protected boolean asynchonous()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object createDefaultValue(java.lang.String)
 meth protected java.lang.Object findValue(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object getDefaultShortDescription()
 meth protected void actionNameUpdate(java.lang.String)
 meth public abstract void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -390,6 +392,7 @@ hfds UILOG,UI_LOG_DETAILED,recording,serialVersionUID
 CLSS public org.netbeans.editor.BaseDocument
 cons public init(boolean,java.lang.String)
 cons public init(java.lang.Class,boolean)
+ anno 0 java.lang.Deprecated()
 fld protected boolean inited
 fld protected boolean modified
 fld protected javax.swing.text.Element defaultRootElem
@@ -399,7 +402,9 @@ fld public final static java.lang.String FORMATTER = "formatter"
 fld public final static java.lang.String ID_PROP = "id"
 fld public final static java.lang.String KIT_CLASS_PROP = "kit-class"
 fld public final static java.lang.String LINE_BATCH_SIZE = "line-batch-size"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LINE_LIMIT_PROP = "line-limit"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LS_CR = "\r"
 fld public final static java.lang.String LS_CRLF = "\r\n"
 fld public final static java.lang.String LS_LF = "\n"
@@ -436,13 +441,17 @@ meth public char[] getChars(int,int) throws javax.swing.text.BadLocationExceptio
 meth public char[] getChars(int[]) throws javax.swing.text.BadLocationException
 meth public final boolean isAtomicLock()
 meth public final java.lang.Class getKitClass()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicLock()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicUnlock()
+ anno 0 java.lang.Deprecated()
 meth public final void breakAtomicLock()
 meth public final void extWriteLock()
 meth public final void extWriteUnlock()
 meth public int find(org.netbeans.editor.Finder,int,int) throws javax.swing.text.BadLocationException
 meth public int getShiftWidth()
+ anno 0 java.lang.Deprecated()
 meth public int getTabSize()
 meth public int processText(org.netbeans.editor.TextBatchProcessor,int,int) throws javax.swing.text.BadLocationException
 meth public java.lang.String getText(int[]) throws javax.swing.text.BadLocationException
@@ -455,6 +464,7 @@ meth public javax.swing.text.Position createPosition(int,javax.swing.text.Positi
 meth public org.netbeans.editor.Annotations getAnnotations()
 meth public org.netbeans.editor.CharSeq getText()
 meth public org.netbeans.editor.SyntaxSupport getSyntaxSupport()
+ anno 0 java.lang.Deprecated()
 meth public void addAtomicLockListener(org.netbeans.api.editor.document.AtomicLockListener)
 meth public void addAtomicLockListener(org.netbeans.editor.AtomicLockListener)
  anno 0 java.lang.Deprecated()
@@ -481,11 +491,13 @@ meth public void removePostModificationDocumentListener(javax.swing.event.Docume
 meth public void removeUpdateDocumentListener(javax.swing.event.DocumentListener)
 meth public void render(java.lang.Runnable)
 meth public void repaintBlock(int,int)
+ anno 0 java.lang.Deprecated()
 meth public void replace(int,int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException
 meth public void resetUndoMerge()
 meth public void runAtomic(java.lang.Runnable)
 meth public void runAtomicAsUser(java.lang.Runnable)
 meth public void setPostModificationDocumentListener(javax.swing.event.DocumentListener)
+ anno 0 java.lang.Deprecated()
 meth public void write(java.io.Writer,int,int) throws java.io.IOException,javax.swing.text.BadLocationException
 supr javax.swing.text.AbstractDocument
 hfds DEACTIVATE_LEXER_THRESHOLD,EDITABLE_PROP,LAST_MODIFICATION_TIMESTAMP_PROP,LOG,LOG_LISTENER,MODIFICATION_LISTENER_PROP,SUPPORTS_MODIFICATION_LISTENER_PROP,VERSION_PROP,annotations,annotationsLock,atomicDepth,atomicEdits,atomicLockEventInstance,atomicLockListenerList,composedText,debugNoText,debugRead,debugStack,deprecatedKitClass,filterBypass,fixLineSyntaxState,identifierAcceptor,lastModifyUndoEdit,lastPositionEditedByTyping,lineRootElement,mimeType,modifiable,postModificationDepth,postModificationDocumentListener,postModificationDocumentListenerList,prefs,prefsListener,removeUpdateLineUndo,runExclusiveDepth,shiftWidth,syntaxSupport,tabSize,text,undoEditWrappers,undoMergeReset,updateDocumentListenerList,weakPrefsListener,whitespaceAcceptor
@@ -601,9 +613,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -618,10 +632,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -668,7 +686,9 @@ hfds ISC_MAX_INDENT_SIZE,ISC_MAX_TAB_SIZE,customExpandTabs,customShiftWidth,cust
 
 CLSS public org.netbeans.editor.GuardedDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class,boolean,javax.swing.text.StyleContext)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 cons public init(java.lang.String,boolean,javax.swing.text.StyleContext)
 fld protected java.lang.String normalStyleName
@@ -859,12 +879,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
@@ -1072,6 +1095,7 @@ hfds icon,icon32,iconPrefix,propertyDescriptors,propertyNames
 
 CLSS public org.netbeans.modules.editor.NbEditorDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 fld public final static java.lang.String INDENT_ENGINE = "indentEngine"
 intf org.openide.text.NbDocument$Annotatable
@@ -1374,6 +1398,7 @@ meth public void format(org.netbeans.editor.ext.FormatWriter)
 supr org.netbeans.editor.ext.AbstractFormatLayer
 
 CLSS public org.netbeans.modules.xml.text.indent.XMLIndentEngine
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected boolean acceptMimeType(java.lang.String)
 meth protected org.netbeans.editor.ext.ExtFormatter createFormatter()
diff --git a/ide/xml.text/nbproject/org-netbeans-modules-xml-text.sig b/ide/xml.text/nbproject/org-netbeans-modules-xml-text.sig
index d877493554d2..e37bda9a70a4 100644
--- a/ide/xml.text/nbproject/org-netbeans-modules-xml-text.sig
+++ b/ide/xml.text/nbproject/org-netbeans-modules-xml-text.sig
@@ -882,6 +882,7 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,int)
 fld protected int updateMask
 fld public final static int ABBREV_RESET = 4
+ anno 0 java.lang.Deprecated()
 fld public final static int CLEAR_STATUS_TEXT = 32
 fld public final static int MAGIC_POSITION_RESET = 2
 fld public final static int NO_RECORDING = 64
@@ -898,6 +899,7 @@ meth protected boolean asynchonous()
 meth protected java.lang.Class getShortDescriptionBundleClass()
 meth protected java.lang.Object createDefaultValue(java.lang.String)
 meth protected java.lang.Object findValue(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth protected java.lang.Object getDefaultShortDescription()
 meth protected void actionNameUpdate(java.lang.String)
 meth public abstract void actionPerformed(java.awt.event.ActionEvent,javax.swing.text.JTextComponent)
@@ -914,6 +916,7 @@ hfds UILOG,UI_LOG_DETAILED,recording,serialVersionUID
 CLSS public org.netbeans.editor.BaseDocument
 cons public init(boolean,java.lang.String)
 cons public init(java.lang.Class,boolean)
+ anno 0 java.lang.Deprecated()
 fld protected boolean inited
 fld protected boolean modified
 fld protected javax.swing.text.Element defaultRootElem
@@ -923,7 +926,9 @@ fld public final static java.lang.String FORMATTER = "formatter"
 fld public final static java.lang.String ID_PROP = "id"
 fld public final static java.lang.String KIT_CLASS_PROP = "kit-class"
 fld public final static java.lang.String LINE_BATCH_SIZE = "line-batch-size"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LINE_LIMIT_PROP = "line-limit"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String LS_CR = "\r"
 fld public final static java.lang.String LS_CRLF = "\r\n"
 fld public final static java.lang.String LS_LF = "\n"
@@ -960,13 +965,17 @@ meth public char[] getChars(int,int) throws javax.swing.text.BadLocationExceptio
 meth public char[] getChars(int[]) throws javax.swing.text.BadLocationException
 meth public final boolean isAtomicLock()
 meth public final java.lang.Class getKitClass()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicLock()
+ anno 0 java.lang.Deprecated()
 meth public final void atomicUnlock()
+ anno 0 java.lang.Deprecated()
 meth public final void breakAtomicLock()
 meth public final void extWriteLock()
 meth public final void extWriteUnlock()
 meth public int find(org.netbeans.editor.Finder,int,int) throws javax.swing.text.BadLocationException
 meth public int getShiftWidth()
+ anno 0 java.lang.Deprecated()
 meth public int getTabSize()
 meth public int processText(org.netbeans.editor.TextBatchProcessor,int,int) throws javax.swing.text.BadLocationException
 meth public java.lang.String getText(int[]) throws javax.swing.text.BadLocationException
@@ -979,6 +988,7 @@ meth public javax.swing.text.Position createPosition(int,javax.swing.text.Positi
 meth public org.netbeans.editor.Annotations getAnnotations()
 meth public org.netbeans.editor.CharSeq getText()
 meth public org.netbeans.editor.SyntaxSupport getSyntaxSupport()
+ anno 0 java.lang.Deprecated()
 meth public void addAtomicLockListener(org.netbeans.api.editor.document.AtomicLockListener)
 meth public void addAtomicLockListener(org.netbeans.editor.AtomicLockListener)
  anno 0 java.lang.Deprecated()
@@ -1005,11 +1015,13 @@ meth public void removePostModificationDocumentListener(javax.swing.event.Docume
 meth public void removeUpdateDocumentListener(javax.swing.event.DocumentListener)
 meth public void render(java.lang.Runnable)
 meth public void repaintBlock(int,int)
+ anno 0 java.lang.Deprecated()
 meth public void replace(int,int,java.lang.String,javax.swing.text.AttributeSet) throws javax.swing.text.BadLocationException
 meth public void resetUndoMerge()
 meth public void runAtomic(java.lang.Runnable)
 meth public void runAtomicAsUser(java.lang.Runnable)
 meth public void setPostModificationDocumentListener(javax.swing.event.DocumentListener)
+ anno 0 java.lang.Deprecated()
 meth public void write(java.io.Writer,int,int) throws java.io.IOException,javax.swing.text.BadLocationException
 supr javax.swing.text.AbstractDocument
 hfds DEACTIVATE_LEXER_THRESHOLD,EDITABLE_PROP,LAST_MODIFICATION_TIMESTAMP_PROP,LOG,LOG_LISTENER,MODIFICATION_LISTENER_PROP,SUPPORTS_MODIFICATION_LISTENER_PROP,VERSION_PROP,annotations,annotationsLock,atomicDepth,atomicEdits,atomicLockEventInstance,atomicLockListenerList,composedText,debugNoText,debugRead,debugStack,deprecatedKitClass,filterBypass,fixLineSyntaxState,identifierAcceptor,lastModifyUndoEdit,lastPositionEditedByTyping,lineRootElement,mimeType,modifiable,postModificationDepth,postModificationDocumentListener,postModificationDocumentListenerList,prefs,prefsListener,removeUpdateLineUndo,runExclusiveDepth,shiftWidth,syntaxSupport,tabSize,text,undoEditWrappers,undoMergeReset,updateDocumentListenerList,weakPrefsListener,whitespaceAcceptor
@@ -1125,9 +1137,11 @@ meth protected javax.swing.Action[] createActions()
 meth protected javax.swing.Action[] getCustomActions()
 meth protected javax.swing.Action[] getDeclaredActions()
 meth protected javax.swing.Action[] getMacroActions()
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.BaseTextUI createTextUI()
 meth protected org.netbeans.editor.EditorUI createEditorUI()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth protected org.netbeans.editor.EditorUI createPrintEditorUI(org.netbeans.editor.BaseDocument,boolean,boolean)
 meth protected void executeDeinstallActions(javax.swing.JEditorPane)
 meth protected void executeInstallActions(javax.swing.JEditorPane)
@@ -1142,10 +1156,14 @@ meth public javax.swing.text.Document createDefaultDocument()
 meth public javax.swing.text.ViewFactory getViewFactory()
 meth public org.netbeans.editor.MultiKeymap getKeymap()
 meth public org.netbeans.editor.Syntax createFormatSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.Syntax createSyntax(javax.swing.text.Document)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.editor.SyntaxSupport createSyntaxSupport(org.netbeans.editor.BaseDocument)
+ anno 0 java.lang.Deprecated()
 meth public static javax.swing.Action[] mapToActions(java.util.Map)
 meth public static org.netbeans.editor.BaseKit getKit(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 meth public static void addActionsToMap(java.util.Map<java.lang.String,javax.swing.Action>,javax.swing.Action[],java.lang.String)
 meth public void deinstall(javax.swing.JEditorPane)
 meth public void install(javax.swing.JEditorPane)
@@ -1157,7 +1175,9 @@ hcls ClearUIForNullKitListener,DefaultSyntax,DefaultSyntaxTokenContext,Keybindin
 
 CLSS public org.netbeans.editor.GuardedDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.Class,boolean,javax.swing.text.StyleContext)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 cons public init(java.lang.String,boolean,javax.swing.text.StyleContext)
 fld protected java.lang.String normalStyleName
@@ -1199,12 +1219,15 @@ fld public final static java.lang.String allCompletionShowAction = "all-completi
 fld public final static java.lang.String buildPopupMenuAction = "build-popup-menu"
 fld public final static java.lang.String buildToolTipAction = "build-tool-tip"
 fld public final static java.lang.String codeSelectAction = "code-select"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String commentAction = "comment"
 fld public final static java.lang.String completionShowAction = "completion-show"
 fld public final static java.lang.String completionTooltipShowAction = "tooltip-show"
 fld public final static java.lang.String documentationShowAction = "documentation-show"
 fld public final static java.lang.String escapeAction = "escape"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String findAction = "find"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String gotoAction = "goto"
 fld public final static java.lang.String gotoDeclarationAction = "goto-declaration"
 fld public final static java.lang.String gotoHelpAction = "goto-help"
@@ -1246,6 +1269,7 @@ hcls BaseKitLocalizedAction
 
 CLSS public org.netbeans.modules.editor.NbEditorDocument
 cons public init(java.lang.Class)
+ anno 0 java.lang.Deprecated()
 cons public init(java.lang.String)
 fld public final static java.lang.String INDENT_ENGINE = "indentEngine"
 intf org.openide.text.NbDocument$Annotatable
diff --git a/ide/xml.wsdl.model/nbproject/org-netbeans-modules-xml-wsdl-model.sig b/ide/xml.wsdl.model/nbproject/org-netbeans-modules-xml-wsdl-model.sig
index c9afcc251cf6..d313c2924c55 100644
--- a/ide/xml.wsdl.model/nbproject/org-netbeans-modules-xml-wsdl-model.sig
+++ b/ide/xml.wsdl.model/nbproject/org-netbeans-modules-xml-wsdl-model.sig
@@ -57,12 +57,14 @@ intf org.netbeans.modules.xml.wsdl.model.WSDLComponent
 intf org.netbeans.modules.xml.xam.Nameable<org.netbeans.modules.xml.wsdl.model.WSDLComponent>
 meth public abstract org.netbeans.modules.xml.xam.Reference<org.netbeans.modules.xml.wsdl.model.Fault> getFault()
 meth public abstract void setFault(org.netbeans.modules.xml.xam.Reference<org.netbeans.modules.xml.wsdl.model.Fault>)
+ anno 0 java.lang.Deprecated()
 
 CLSS public abstract interface org.netbeans.modules.xml.wsdl.model.BindingInput
 intf org.netbeans.modules.xml.wsdl.model.WSDLComponent
 intf org.netbeans.modules.xml.xam.Nameable<org.netbeans.modules.xml.wsdl.model.WSDLComponent>
 meth public abstract org.netbeans.modules.xml.xam.Reference<org.netbeans.modules.xml.wsdl.model.Input> getInput()
 meth public abstract void setInput(org.netbeans.modules.xml.xam.Reference<org.netbeans.modules.xml.wsdl.model.Input>)
+ anno 0 java.lang.Deprecated()
 
 CLSS public abstract interface org.netbeans.modules.xml.wsdl.model.BindingOperation
 fld public final static java.lang.String BINDING_FAULT_PROPERTY = "fault"
@@ -86,6 +88,7 @@ intf org.netbeans.modules.xml.wsdl.model.WSDLComponent
 intf org.netbeans.modules.xml.xam.Nameable<org.netbeans.modules.xml.wsdl.model.WSDLComponent>
 meth public abstract org.netbeans.modules.xml.xam.Reference<org.netbeans.modules.xml.wsdl.model.Output> getOutput()
 meth public abstract void setOutput(org.netbeans.modules.xml.xam.Reference<org.netbeans.modules.xml.wsdl.model.Output>)
+ anno 0 java.lang.Deprecated()
 
 CLSS public abstract interface org.netbeans.modules.xml.wsdl.model.Definitions
 fld public final static java.lang.String BINDING_PROPERTY = "binding"
@@ -1134,6 +1137,7 @@ meth public javax.swing.text.Document getBaseDocument()
 meth public org.netbeans.modules.xml.xam.dom.AbstractDocumentComponent findComponent(org.netbeans.modules.xml.xam.dom.AbstractDocumentComponent,java.util.List<org.w3c.dom.Element>,int)
 meth public org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<? extends org.w3c.dom.Node>,java.util.List<? extends org.w3c.dom.Node>)
 meth public org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<org.w3c.dom.Node>)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(int)
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(java.util.List<org.w3c.dom.Element>)
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(org.w3c.dom.Element)
diff --git a/ide/xml.xam/nbproject/org-netbeans-modules-xml-xam.sig b/ide/xml.xam/nbproject/org-netbeans-modules-xml-xam.sig
index 0fb405de35f2..5675cbf15c95 100644
--- a/ide/xml.xam/nbproject/org-netbeans-modules-xml-xam.sig
+++ b/ide/xml.xam/nbproject/org-netbeans-modules-xml-xam.sig
@@ -541,6 +541,7 @@ meth public javax.swing.text.Document getBaseDocument()
 meth public org.netbeans.modules.xml.xam.dom.AbstractDocumentComponent findComponent(org.netbeans.modules.xml.xam.dom.AbstractDocumentComponent,java.util.List<org.w3c.dom.Element>,int)
 meth public org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<? extends org.w3c.dom.Node>,java.util.List<? extends org.w3c.dom.Node>)
 meth public org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<org.w3c.dom.Node>)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(int)
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(java.util.List<org.w3c.dom.Element>)
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(org.w3c.dom.Element)
diff --git a/ide/xml.xdm/nbproject/org-netbeans-modules-xml-xdm.sig b/ide/xml.xdm/nbproject/org-netbeans-modules-xml-xdm.sig
index c699ff45e883..01e448e0d974 100644
--- a/ide/xml.xdm/nbproject/org-netbeans-modules-xml-xdm.sig
+++ b/ide/xml.xdm/nbproject/org-netbeans-modules-xml-xdm.sig
@@ -1064,6 +1064,7 @@ hfds oldtree,pathVisitor,target,xmlModel
 
 CLSS public org.netbeans.modules.xml.xdm.visitor.NamespaceRefactorVisitor
 cons public init()
+ anno 0 java.lang.Deprecated()
 cons public init(org.netbeans.modules.xml.xdm.XDMModel)
 innr public static NamespaceCheck
 meth public static boolean isDefaultPrefix(java.lang.String)
@@ -1241,6 +1242,7 @@ CLSS public org.netbeans.modules.xml.xdm.xam.XDMListener
 cons public init(org.netbeans.modules.xml.xam.dom.AbstractDocumentModel)
 intf java.beans.PropertyChangeListener
 meth protected org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<? extends org.netbeans.modules.xml.xdm.nodes.Node>,java.util.List<? extends org.netbeans.modules.xml.xdm.nodes.Node>)
+ anno 0 java.lang.Deprecated()
 meth protected void processChange(org.netbeans.modules.xml.xam.dom.ChangeInfo)
 meth protected void processEvent(org.netbeans.modules.xml.xdm.nodes.Node,org.netbeans.modules.xml.xdm.diff.NodeInfo,boolean)
 meth protected void processRootRelatedEvent(org.netbeans.modules.xml.xdm.nodes.Node,java.util.List<org.netbeans.modules.xml.xdm.nodes.Node>,boolean)
diff --git a/ide/xml/nbproject/org-netbeans-modules-xml.sig b/ide/xml/nbproject/org-netbeans-modules-xml.sig
index 28b652042d27..3994f4b1c273 100644
--- a/ide/xml/nbproject/org-netbeans-modules-xml.sig
+++ b/ide/xml/nbproject/org-netbeans-modules-xml.sig
@@ -957,6 +957,7 @@ CLSS public abstract interface static org.netbeans.modules.xml.actions.CollectXM
  outer org.netbeans.modules.xml.actions.CollectXMLAction
 
 CLSS public final org.netbeans.modules.xml.actions.InputOutputReporter
+ anno 0 java.lang.Deprecated()
 cons public init()
 cons public init(java.lang.String)
 intf org.netbeans.api.xml.cookies.CookieObserver
diff --git a/java/api.java/nbproject/org-netbeans-api-java.sig b/java/api.java/nbproject/org-netbeans-api-java.sig
index 4cbb8e891a34..65d7b4427bee 100644
--- a/java/api.java/nbproject/org-netbeans-api-java.sig
+++ b/java/api.java/nbproject/org-netbeans-api-java.sig
@@ -430,7 +430,9 @@ hfds cs,delegate,spiListener
 
 CLSS public org.netbeans.api.java.queries.UnitTestForSourceQuery
 meth public static java.net.URL findSource(org.openide.filesystems.FileObject)
+ anno 0 java.lang.Deprecated()
 meth public static java.net.URL findUnitTest(org.openide.filesystems.FileObject)
+ anno 0 java.lang.Deprecated()
 meth public static java.net.URL[] findSources(org.openide.filesystems.FileObject)
 meth public static java.net.URL[] findUnitTests(org.openide.filesystems.FileObject)
 supr java.lang.Object
@@ -661,6 +663,7 @@ meth public abstract org.netbeans.api.java.queries.SourceLevelQuery$Profile getP
  anno 0 org.netbeans.api.annotations.common.NonNull()
 
 CLSS public abstract interface org.netbeans.spi.java.queries.UnitTestForSourceQueryImplementation
+ anno 0 java.lang.Deprecated()
 meth public abstract java.net.URL findSource(org.openide.filesystems.FileObject)
 meth public abstract java.net.URL findUnitTest(org.openide.filesystems.FileObject)
 
diff --git a/java/java.lsp.server/nbproject/org-netbeans-modules-java-lsp-server.sig b/java/java.lsp.server/nbproject/org-netbeans-modules-java-lsp-server.sig
index e3d396e9898a..d2bf5adf6030 100644
--- a/java/java.lsp.server/nbproject/org-netbeans-modules-java-lsp-server.sig
+++ b/java/java.lsp.server/nbproject/org-netbeans-modules-java-lsp-server.sig
@@ -28,7 +28,7 @@ meth public java.awt.Dialog createDialog(org.openide.DialogDescriptor)
 meth public java.lang.Object notify(org.openide.NotifyDescriptor)
 meth public void notifyLater(org.openide.NotifyDescriptor)
 supr org.openide.DialogDisplayer
-hfds context
+hfds LOG
 
 CLSS public org.netbeans.modules.java.lsp.server.ui.AbstractGlobalActionContext
 cons public init()
diff --git a/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig b/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig
index e445b2bbf6cb..b840ef449692 100644
--- a/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig
+++ b/java/java.source.base/nbproject/org-netbeans-modules-java-source-base.sig
@@ -706,6 +706,7 @@ meth public org.netbeans.api.java.source.CodeStyle$WrapStyle wrapTryResources()
 meth public org.netbeans.api.java.source.CodeStyle$WrapStyle wrapWhileStatement()
 meth public static org.netbeans.api.java.source.CodeStyle getDefault(javax.swing.text.Document)
 meth public static org.netbeans.api.java.source.CodeStyle getDefault(org.netbeans.api.project.Project)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.java.source.CodeStyle getDefault(org.openide.filesystems.FileObject)
 supr java.lang.Object
 hfds preferences
@@ -871,6 +872,7 @@ meth public org.netbeans.api.java.source.ClasspathInfo getClasspathInfo()
 meth public org.netbeans.api.java.source.ElementUtilities getElementUtilities()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public org.netbeans.api.java.source.JavaSource getJavaSource()
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.NullUnknown()
 meth public org.netbeans.api.java.source.JavaSource$Phase getPhase()
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -1214,6 +1216,7 @@ hfds retryGuard
 hcls FinishedFuture,RetryWhenScanFinished,TaskWrapper
 
 CLSS public org.netbeans.api.java.source.SourceUtils
+meth public !varargs static org.openide.filesystems.FileObject getFile(org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>,org.netbeans.api.java.source.ClasspathInfo,java.lang.String[])
 meth public static boolean checkTypesAssignable(org.netbeans.api.java.source.CompilationInfo,javax.lang.model.type.TypeMirror,javax.lang.model.type.TypeMirror)
 meth public static boolean isClassFile(org.openide.filesystems.FileObject)
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -1222,6 +1225,7 @@ meth public static boolean isMainClass(java.lang.String,org.netbeans.api.java.so
 meth public static boolean isMainMethod(javax.lang.model.element.ExecutableElement)
 meth public static boolean isScanInProgress()
 meth public static java.lang.Object getDiagnosticParam(javax.tools.Diagnostic<?>,int)
+meth public static java.lang.String findSourceFileName(javax.lang.model.element.Element)
 meth public static java.lang.String getModuleName(java.net.URL)
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -1266,9 +1270,11 @@ meth public static javax.lang.model.type.TypeMirror resolveCapturedType(org.netb
 meth public static javax.lang.model.type.WildcardType resolveCapturedType(javax.lang.model.type.TypeMirror)
 meth public static org.netbeans.api.lexer.TokenSequence<org.netbeans.api.java.lexer.JavaTokenId> getJavaTokenSequence(org.netbeans.api.lexer.TokenHierarchy,int)
 meth public static org.openide.filesystems.FileObject getFile(javax.lang.model.element.Element,org.netbeans.api.java.source.ClasspathInfo)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.filesystems.FileObject getFile(org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>,org.netbeans.api.java.source.ClasspathInfo)
 meth public static void forceSource(org.netbeans.api.java.source.CompilationController,org.openide.filesystems.FileObject)
 meth public static void waitScanFinished() throws java.lang.InterruptedException
+ anno 0 java.lang.Deprecated()
 supr java.lang.Object
 hfds LOG
 hcls CaseInsensitiveMatch,CaseSensitiveMatch,Match
@@ -1564,6 +1570,7 @@ fld public final static java.util.Set<com.sun.source.tree.Tree$Kind> CLASS_TREE_
 meth public !varargs boolean hasError(com.sun.source.tree.Tree,java.lang.String[])
  anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public boolean isAccessible(com.sun.source.tree.Scope,javax.lang.model.element.Element,javax.lang.model.type.TypeMirror)
+ anno 0 java.lang.Deprecated()
 meth public boolean isAnnotation(com.sun.source.tree.ClassTree)
  anno 0 java.lang.Deprecated()
 meth public boolean isClass(com.sun.source.tree.ClassTree)
diff --git a/java/java.source/nbproject/org-netbeans-modules-java-source.sig b/java/java.source/nbproject/org-netbeans-modules-java-source.sig
index 4d5b007ea4bd..8caa0fbc06b6 100644
--- a/java/java.source/nbproject/org-netbeans-modules-java-source.sig
+++ b/java/java.source/nbproject/org-netbeans-modules-java-source.sig
@@ -711,6 +711,7 @@ meth public org.netbeans.api.java.source.CodeStyle$WrapStyle wrapTryResources()
 meth public org.netbeans.api.java.source.CodeStyle$WrapStyle wrapWhileStatement()
 meth public static org.netbeans.api.java.source.CodeStyle getDefault(javax.swing.text.Document)
 meth public static org.netbeans.api.java.source.CodeStyle getDefault(org.netbeans.api.project.Project)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.java.source.CodeStyle getDefault(org.openide.filesystems.FileObject)
 supr java.lang.Object
 hfds preferences
@@ -876,6 +877,7 @@ meth public org.netbeans.api.java.source.ClasspathInfo getClasspathInfo()
 meth public org.netbeans.api.java.source.ElementUtilities getElementUtilities()
  anno 0 org.netbeans.api.annotations.common.NonNull()
 meth public org.netbeans.api.java.source.JavaSource getJavaSource()
+ anno 0 java.lang.Deprecated()
  anno 0 org.netbeans.api.annotations.common.NullUnknown()
 meth public org.netbeans.api.java.source.JavaSource$Phase getPhase()
  anno 0 org.netbeans.api.annotations.common.NonNull()
@@ -1219,6 +1221,7 @@ hfds retryGuard
 hcls FinishedFuture,RetryWhenScanFinished,TaskWrapper
 
 CLSS public org.netbeans.api.java.source.SourceUtils
+meth public !varargs static org.openide.filesystems.FileObject getFile(org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>,org.netbeans.api.java.source.ClasspathInfo,java.lang.String[])
 meth public static boolean checkTypesAssignable(org.netbeans.api.java.source.CompilationInfo,javax.lang.model.type.TypeMirror,javax.lang.model.type.TypeMirror)
 meth public static boolean isClassFile(org.openide.filesystems.FileObject)
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -1227,6 +1230,7 @@ meth public static boolean isMainClass(java.lang.String,org.netbeans.api.java.so
 meth public static boolean isMainMethod(javax.lang.model.element.ExecutableElement)
 meth public static boolean isScanInProgress()
 meth public static java.lang.Object getDiagnosticParam(javax.tools.Diagnostic<?>,int)
+meth public static java.lang.String findSourceFileName(javax.lang.model.element.Element)
 meth public static java.lang.String getModuleName(java.net.URL)
  anno 0 org.netbeans.api.annotations.common.CheckForNull()
  anno 1 org.netbeans.api.annotations.common.NonNull()
@@ -1271,9 +1275,11 @@ meth public static javax.lang.model.type.TypeMirror resolveCapturedType(org.netb
 meth public static javax.lang.model.type.WildcardType resolveCapturedType(javax.lang.model.type.TypeMirror)
 meth public static org.netbeans.api.lexer.TokenSequence<org.netbeans.api.java.lexer.JavaTokenId> getJavaTokenSequence(org.netbeans.api.lexer.TokenHierarchy,int)
 meth public static org.openide.filesystems.FileObject getFile(javax.lang.model.element.Element,org.netbeans.api.java.source.ClasspathInfo)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.filesystems.FileObject getFile(org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>,org.netbeans.api.java.source.ClasspathInfo)
 meth public static void forceSource(org.netbeans.api.java.source.CompilationController,org.openide.filesystems.FileObject)
 meth public static void waitScanFinished() throws java.lang.InterruptedException
+ anno 0 java.lang.Deprecated()
 supr java.lang.Object
 hfds LOG
 hcls CaseInsensitiveMatch,CaseSensitiveMatch,Match
@@ -1569,6 +1575,7 @@ fld public final static java.util.Set<com.sun.source.tree.Tree$Kind> CLASS_TREE_
 meth public !varargs boolean hasError(com.sun.source.tree.Tree,java.lang.String[])
  anno 1 org.netbeans.api.annotations.common.NonNull()
 meth public boolean isAccessible(com.sun.source.tree.Scope,javax.lang.model.element.Element,javax.lang.model.type.TypeMirror)
+ anno 0 java.lang.Deprecated()
 meth public boolean isAnnotation(com.sun.source.tree.ClassTree)
  anno 0 java.lang.Deprecated()
 meth public boolean isClass(com.sun.source.tree.ClassTree)
diff --git a/java/java.sourceui/nbproject/org-netbeans-modules-java-sourceui.sig b/java/java.sourceui/nbproject/org-netbeans-modules-java-sourceui.sig
index fa79b7bd6265..ccf50247f4f7 100644
--- a/java/java.sourceui/nbproject/org-netbeans-modules-java-sourceui.sig
+++ b/java/java.sourceui/nbproject/org-netbeans-modules-java-sourceui.sig
@@ -95,6 +95,8 @@ hcls JavaDocSnippetLinkTagFileObject,SourceLineCharterMapperToHtmlTag
 
 CLSS public final org.netbeans.api.java.source.ui.ElementOpen
 innr public final static Location
+meth public !varargs static boolean open(org.netbeans.api.java.source.ClasspathInfo,org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>,java.lang.String[])
+meth public !varargs static java.util.concurrent.CompletableFuture<org.netbeans.api.java.source.ui.ElementOpen$Location> getLocation(org.netbeans.api.java.source.ClasspathInfo,org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>,java.lang.String,java.lang.String[])
 meth public static boolean open(org.netbeans.api.java.source.ClasspathInfo,javax.lang.model.element.Element)
 meth public static boolean open(org.netbeans.api.java.source.ClasspathInfo,org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>)
 meth public static boolean open(org.openide.filesystems.FileObject,org.netbeans.api.java.source.ElementHandle<? extends javax.lang.model.element.Element>)
diff --git a/java/maven.embedder/nbproject/org-netbeans-modules-maven-embedder.sig b/java/maven.embedder/nbproject/org-netbeans-modules-maven-embedder.sig
index 8ba0195f16c5..fd60766df229 100644
--- a/java/maven.embedder/nbproject/org-netbeans-modules-maven-embedder.sig
+++ b/java/maven.embedder/nbproject/org-netbeans-modules-maven-embedder.sig
@@ -4025,6 +4025,7 @@ meth public java.lang.String getScriptSourceDirectory()
 meth public java.lang.String getSourceDirectory()
 meth public java.lang.String getTestOutputDirectory()
 meth public java.lang.String getTestSourceDirectory()
+meth public java.lang.String toString()
 meth public java.util.List<org.apache.maven.model.Extension> getExtensions()
 meth public org.apache.maven.model.Build clone()
 meth public void addExtension(org.apache.maven.model.Extension)
@@ -4045,6 +4046,7 @@ intf java.lang.Cloneable
 meth public java.lang.String getDefaultGoal()
 meth public java.lang.String getDirectory()
 meth public java.lang.String getFinalName()
+meth public java.lang.String toString()
 meth public java.util.List<java.lang.String> getFilters()
 meth public java.util.List<org.apache.maven.model.Resource> getResources()
 meth public java.util.List<org.apache.maven.model.Resource> getTestResources()
@@ -4115,6 +4117,7 @@ meth public java.lang.String getOrganization()
 meth public java.lang.String getOrganizationUrl()
 meth public java.lang.String getTimezone()
 meth public java.lang.String getUrl()
+meth public java.lang.String toString()
 meth public java.util.List<java.lang.String> getRoles()
 meth public java.util.Properties getProperties()
 meth public org.apache.maven.model.Contributor clone()
@@ -4203,6 +4206,7 @@ cons public init()
 intf java.io.Serializable
 intf java.lang.Cloneable
 meth public java.lang.String getId()
+meth public java.lang.String toString()
 meth public org.apache.maven.model.Developer clone()
 meth public void setId(java.lang.String)
 supr org.apache.maven.model.Contributor
@@ -4331,6 +4335,7 @@ intf java.lang.Cloneable
 intf org.apache.maven.model.InputLocationTracker
 meth public java.lang.String getSystem()
 meth public java.lang.String getUrl()
+meth public java.lang.String toString()
 meth public org.apache.maven.model.InputLocation getLocation(java.lang.Object)
 meth public org.apache.maven.model.IssueManagement clone()
 meth public void setLocation(java.lang.Object,org.apache.maven.model.InputLocation)
@@ -4349,6 +4354,7 @@ meth public java.lang.String getComments()
 meth public java.lang.String getDistribution()
 meth public java.lang.String getName()
 meth public java.lang.String getUrl()
+meth public java.lang.String toString()
 meth public org.apache.maven.model.InputLocation getLocation(java.lang.Object)
 meth public org.apache.maven.model.License clone()
 meth public void setComments(java.lang.String)
@@ -4370,6 +4376,7 @@ meth public java.lang.String getName()
 meth public java.lang.String getPost()
 meth public java.lang.String getSubscribe()
 meth public java.lang.String getUnsubscribe()
+meth public java.lang.String toString()
 meth public java.util.List<java.lang.String> getOtherArchives()
 meth public org.apache.maven.model.InputLocation getLocation(java.lang.Object)
 meth public org.apache.maven.model.MailingList clone()
@@ -4530,6 +4537,7 @@ intf java.lang.Cloneable
 intf org.apache.maven.model.InputLocationTracker
 meth public java.lang.String getName()
 meth public java.lang.String getUrl()
+meth public java.lang.String toString()
 meth public org.apache.maven.model.InputLocation getLocation(java.lang.Object)
 meth public org.apache.maven.model.Organization clone()
 meth public void setLocation(java.lang.Object,org.apache.maven.model.InputLocation)
@@ -4622,6 +4630,7 @@ CLSS public org.apache.maven.model.PluginConfiguration
 cons public init()
 intf java.io.Serializable
 intf java.lang.Cloneable
+meth public java.lang.String toString()
 meth public org.apache.maven.model.PluginConfiguration clone()
 meth public org.apache.maven.model.PluginManagement getPluginManagement()
 meth public void setPluginManagement(org.apache.maven.model.PluginManagement)
@@ -4633,6 +4642,7 @@ cons public init()
 intf java.io.Serializable
 intf java.lang.Cloneable
 intf org.apache.maven.model.InputLocationTracker
+meth public java.lang.String toString()
 meth public java.util.List<org.apache.maven.model.Plugin> getPlugins()
 meth public java.util.Map<java.lang.String,org.apache.maven.model.Plugin> getPluginsAsMap()
 meth public org.apache.maven.model.InputLocation getLocation(java.lang.Object)
@@ -4875,6 +4885,7 @@ meth public java.lang.String getConnection()
 meth public java.lang.String getDeveloperConnection()
 meth public java.lang.String getTag()
 meth public java.lang.String getUrl()
+meth public java.lang.String toString()
 meth public org.apache.maven.model.InputLocation getLocation(java.lang.Object)
 meth public org.apache.maven.model.Scm clone()
 meth public void setChildScmConnectionInheritAppendPath(boolean)
@@ -8448,14 +8459,16 @@ cons public init()
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpConfiguration setAll(org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration)
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpConfiguration setGet(org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration)
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpConfiguration setHead(org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration)
+meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpConfiguration setMkcol(org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration)
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpConfiguration setPut(org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration)
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration getAll()
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration getGet()
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration getHead()
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration getMethodConfiguration(org.apache.maven.wagon.providers.http.httpclient.client.methods.HttpUriRequest)
+meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration getMkcol()
 meth public org.apache.maven.wagon.providers.http.wagon.shared.HttpMethodConfiguration getPut()
 supr java.lang.Object
-hfds DEFAULT_PUT,all,get,head,put
+hfds all,get,head,mkcol,put
 
 CLSS public org.apache.maven.wagon.providers.http.wagon.shared.HttpMessageUtils
 cons public init()
diff --git a/java/maven.model/nbproject/org-netbeans-modules-maven-model.sig b/java/maven.model/nbproject/org-netbeans-modules-maven-model.sig
index 9fb2ce8126b5..993b1af56e32 100644
--- a/java/maven.model/nbproject/org-netbeans-modules-maven-model.sig
+++ b/java/maven.model/nbproject/org-netbeans-modules-maven-model.sig
@@ -1338,6 +1338,7 @@ meth public javax.swing.text.Document getBaseDocument()
 meth public org.netbeans.modules.xml.xam.dom.AbstractDocumentComponent findComponent(org.netbeans.modules.xml.xam.dom.AbstractDocumentComponent,java.util.List<org.w3c.dom.Element>,int)
 meth public org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<? extends org.w3c.dom.Node>,java.util.List<? extends org.w3c.dom.Node>)
 meth public org.netbeans.modules.xml.xam.dom.ChangeInfo prepareChangeInfo(java.util.List<org.w3c.dom.Node>)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(int)
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(java.util.List<org.w3c.dom.Element>)
 meth public org.netbeans.modules.xml.xam.dom.DocumentComponent findComponent(org.w3c.dom.Element)
diff --git a/java/maven/nbproject/org-netbeans-modules-maven.sig b/java/maven/nbproject/org-netbeans-modules-maven.sig
index f73e8e3a30e8..63090c14fd48 100644
--- a/java/maven/nbproject/org-netbeans-modules-maven.sig
+++ b/java/maven/nbproject/org-netbeans-modules-maven.sig
@@ -1983,7 +1983,7 @@ meth public boolean cancel()
 meth public static org.openide.execution.ExecutorTask executeMaven(org.netbeans.modules.maven.api.execute.RunConfig,org.openide.windows.InputOutput,org.netbeans.modules.maven.execute.AbstractMavenExecutor$TabContext)
 meth public void run()
 supr org.netbeans.modules.maven.execute.AbstractMavenExecutor
-hfds ENV_JAVAHOME,ENV_PREFIX,INTERNAL_PREFIX,KEY_UUID,LOGGER,NETBEANS_MAVEN_COMMAND_LINE,RP,UPDATE_INDEX_RP,VER17,preProcess,preProcessUUID,process,processUUID
+hfds ENV_JAVAHOME,ENV_PREFIX,ICON_MAVEN_PROJECT,INTERNAL_PREFIX,KEY_UUID,LOGGER,NETBEANS_MAVEN_COMMAND_LINE,RP,UPDATE_INDEX_RP,VER17,preProcess,preProcessUUID,process,processUUID
 hcls WrapperShellConstructor
 
 CLSS public static org.netbeans.modules.maven.execute.MavenCommandLineExecutor$ExecuteMaven
@@ -1998,6 +1998,39 @@ meth public abstract org.openide.windows.InputOutput getInputOutput()
 meth public abstract void addInitialMessage(java.lang.String,org.openide.windows.OutputListener)
 meth public abstract void setTask(org.openide.execution.ExecutorTask)
 
+CLSS public org.netbeans.modules.maven.execute.MavenProxySupport
+cons public init(org.netbeans.api.project.Project)
+innr public final static !enum Status
+innr public final static ProxyResult
+meth public java.util.concurrent.CompletableFuture<org.netbeans.modules.maven.execute.MavenProxySupport$ProxyResult> checkProxySettings()
+supr java.lang.Object
+hfds FILENAME_BASE_SETTINGS,FILENAME_SETTINGS,FILENAME_SETTINGS_EXT,FILENAME_SUFFIX_OLD,ICON_MAVEN_PROJECT,LOG,PORT_DEFAULT_HTTP,PORT_DEFAULT_HTTPS,PROBE_URI_STRING,SUFFIX_NEW_PROXY,SUFFIX_NONE_PROXY,TAG_ACTIVE_END,TAG_ACTIVE_START,TAG_NAME_ACTIVE,TAG_PROXIES,TAG_PROXY,TAG_SETTINGS,acknowledgedResults
+hcls LineAndColumn,Processor,ProxyInfo,TagInfo,TextInfo,XppDelegate
+
+CLSS public final static org.netbeans.modules.maven.execute.MavenProxySupport$ProxyResult
+ outer org.netbeans.modules.maven.execute.MavenProxySupport
+cons public init(org.netbeans.modules.maven.execute.MavenProxySupport$Status,java.net.Proxy)
+cons public init(org.netbeans.modules.maven.execute.MavenProxySupport$Status,java.net.Proxy,java.lang.String,java.lang.String,java.lang.String,int,boolean,org.apache.maven.settings.Settings)
+meth public java.io.IOException getException()
+meth public java.lang.String getProxySpec()
+meth public java.lang.String getToolProxy()
+meth public java.net.Proxy getProxy()
+meth public org.netbeans.modules.maven.execute.BeanRunConfig configure(org.netbeans.modules.maven.execute.BeanRunConfig) throws java.io.IOException
+meth public org.netbeans.modules.maven.execute.MavenProxySupport$Status getStatus()
+supr java.lang.Object
+hfds FMT_PROXY_HOST,FMT_PROXY_PORT,adoc,exception,fileLookup,mavenSettings,nonDefaultPort,proxy,proxyHost,proxyPort,proxySpec,settingsDir,settingsEditor,settingsFileName,settingsLineDoc,status,textInfo,toolProxy
+
+CLSS public final static !enum org.netbeans.modules.maven.execute.MavenProxySupport$Status
+ outer org.netbeans.modules.maven.execute.MavenProxySupport
+fld public final static org.netbeans.modules.maven.execute.MavenProxySupport$Status ABORT
+fld public final static org.netbeans.modules.maven.execute.MavenProxySupport$Status CONTINUE
+fld public final static org.netbeans.modules.maven.execute.MavenProxySupport$Status OVERRIDE
+fld public final static org.netbeans.modules.maven.execute.MavenProxySupport$Status RECONFIGURED
+fld public final static org.netbeans.modules.maven.execute.MavenProxySupport$Status UNKNOWN
+meth public static org.netbeans.modules.maven.execute.MavenProxySupport$Status valueOf(java.lang.String)
+meth public static org.netbeans.modules.maven.execute.MavenProxySupport$Status[] values()
+supr java.lang.Enum<org.netbeans.modules.maven.execute.MavenProxySupport$Status>
+
 CLSS public final org.netbeans.modules.maven.execute.ModelRunConfig
 cons public init(org.netbeans.api.project.Project,org.netbeans.modules.maven.execute.model.NetbeansActionMapping,java.lang.String,org.openide.filesystems.FileObject,org.openide.util.Lookup,boolean)
 fld public final static java.lang.String EXEC_MERGED = "exec.args.merged"
diff --git a/php/php.api.phpmodule/nbproject/org-netbeans-modules-php-api-phpmodule.sig b/php/php.api.phpmodule/nbproject/org-netbeans-modules-php-api-phpmodule.sig
index 980d2b6f086f..749736699871 100644
--- a/php/php.api.phpmodule/nbproject/org-netbeans-modules-php-api-phpmodule.sig
+++ b/php/php.api.phpmodule/nbproject/org-netbeans-modules-php-api-phpmodule.sig
@@ -115,9 +115,11 @@ fld public final static org.netbeans.modules.php.api.PhpVersion PHP_73
 fld public final static org.netbeans.modules.php.api.PhpVersion PHP_74
 fld public final static org.netbeans.modules.php.api.PhpVersion PHP_80
 fld public final static org.netbeans.modules.php.api.PhpVersion PHP_81
+fld public final static org.netbeans.modules.php.api.PhpVersion PHP_82
 meth public boolean hasMixedType()
 meth public boolean hasNamespaces()
 meth public boolean hasNeverType()
+meth public boolean hasNullAndFalseAndTrueTypes()
 meth public boolean hasNullableTypes()
 meth public boolean hasPropertyTypes()
 meth public boolean hasScalarAndReturnTypes()
diff --git a/php/php.editor/nbproject/org-netbeans-modules-php-editor.sig b/php/php.editor/nbproject/org-netbeans-modules-php-editor.sig
index 42e50463b4cf..1a8d292310a3 100644
--- a/php/php.editor/nbproject/org-netbeans-modules-php-editor.sig
+++ b/php/php.editor/nbproject/org-netbeans-modules-php-editor.sig
@@ -482,6 +482,9 @@ supr java.lang.Enum<org.netbeans.modules.php.editor.api.PhpElementKind>
 CLSS public final org.netbeans.modules.php.editor.api.PhpModifiers
 fld public final static int ALL_FLAGS = -1
 fld public final static int NO_FLAGS = 0
+fld public final static java.lang.String ABSTRACT_MODIFIER = "abstract"
+fld public final static java.lang.String FINAL_MODIFIER = "final"
+fld public final static java.lang.String READONLY_MODIFIER = "readonly"
 fld public final static java.lang.String VISIBILITY_PRIVATE = "private"
 fld public final static java.lang.String VISIBILITY_PROTECTED = "protected"
 fld public final static java.lang.String VISIBILITY_PUBLIC = "public"
@@ -593,6 +596,7 @@ intf org.netbeans.modules.php.editor.api.elements.ClassElement
 meth public boolean isAbstract()
 meth public boolean isAnonymous()
 meth public boolean isFinal()
+meth public boolean isReadonly()
 meth public java.util.Collection<org.netbeans.modules.php.editor.api.QualifiedName> getFQMixinClassNames()
 meth public java.util.Collection<org.netbeans.modules.php.editor.api.QualifiedName> getPossibleFQSuperClassNames()
 meth public java.util.Collection<org.netbeans.modules.php.editor.api.QualifiedName> getUsedTraits()
@@ -730,6 +734,7 @@ intf org.netbeans.modules.php.editor.api.elements.TraitedElement
 meth public abstract boolean isAbstract()
 meth public abstract boolean isAnonymous()
 meth public abstract boolean isFinal()
+meth public abstract boolean isReadonly()
 meth public abstract java.util.Collection<org.netbeans.modules.php.editor.api.QualifiedName> getFQMixinClassNames()
 meth public abstract java.util.Collection<org.netbeans.modules.php.editor.api.QualifiedName> getPossibleFQSuperClassNames()
 meth public abstract org.netbeans.modules.php.editor.api.QualifiedName getSuperClassName()
@@ -2242,6 +2247,7 @@ meth public java.util.List<? extends org.netbeans.modules.csl.api.Error> getDiag
 meth public org.netbeans.modules.csl.api.OffsetRange getErrorRange()
 meth public org.netbeans.modules.php.editor.model.Model getModel()
 meth public org.netbeans.modules.php.editor.model.Model getModel(boolean)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.modules.php.editor.model.Model getModel(org.netbeans.modules.php.editor.model.Model$Type)
 meth public org.netbeans.modules.php.editor.parser.astnodes.Program getProgram()
 meth public void setErrors(java.util.List<org.netbeans.modules.csl.api.Error>)
@@ -2574,21 +2580,25 @@ supr org.netbeans.modules.php.editor.parser.astnodes.Statement
 hfds body,classNames,variable
 
 CLSS public org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration
+cons public init(int,int,java.util.Map<org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier,java.util.Set<org.netbeans.modules.csl.api.OffsetRange>>,org.netbeans.modules.php.editor.parser.astnodes.Identifier,org.netbeans.modules.php.editor.parser.astnodes.Expression,java.util.List<org.netbeans.modules.php.editor.parser.astnodes.Expression>,org.netbeans.modules.php.editor.parser.astnodes.Block)
 cons public init(int,int,org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier,org.netbeans.modules.php.editor.parser.astnodes.Identifier,org.netbeans.modules.php.editor.parser.astnodes.Expression,java.util.List<org.netbeans.modules.php.editor.parser.astnodes.Expression>,org.netbeans.modules.php.editor.parser.astnodes.Block)
 innr public final static !enum Modifier
 meth public java.lang.String toString()
+meth public java.util.Map<org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier,java.util.Set<org.netbeans.modules.csl.api.OffsetRange>> getModifiers()
 meth public org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier getModifier()
 meth public org.netbeans.modules.php.editor.parser.astnodes.Expression getSuperClass()
 meth public static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration create(org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration,java.util.List<org.netbeans.modules.php.editor.parser.astnodes.Attribute>)
 meth public void accept(org.netbeans.modules.php.editor.parser.astnodes.Visitor)
 supr org.netbeans.modules.php.editor.parser.astnodes.TypeDeclaration
-hfds modifier,superClass
+hfds modifier,modifiers,superClass
 
 CLSS public final static !enum org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier
  outer org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration
 fld public final static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier ABSTRACT
 fld public final static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier FINAL
 fld public final static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier NONE
+fld public final static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier READONLY
+meth public java.lang.String toString()
 meth public static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier valueOf(java.lang.String)
 meth public static org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier[] values()
 supr java.lang.Enum<org.netbeans.modules.php.editor.parser.astnodes.ClassDeclaration$Modifier>
@@ -2687,6 +2697,11 @@ meth public void accept(org.netbeans.modules.php.editor.parser.astnodes.Visitor)
 supr org.netbeans.modules.php.editor.parser.astnodes.BodyDeclaration
 hfds initializers,isGlobal,names
 
+CLSS public org.netbeans.modules.php.editor.parser.astnodes.ConstantVariable
+cons public init(org.netbeans.modules.php.editor.parser.astnodes.Expression)
+meth public void accept(org.netbeans.modules.php.editor.parser.astnodes.Visitor)
+supr org.netbeans.modules.php.editor.parser.astnodes.Variable
+
 CLSS public org.netbeans.modules.php.editor.parser.astnodes.ContinueStatement
 cons public init(int,int)
 cons public init(int,int,org.netbeans.modules.php.editor.parser.astnodes.Expression)
@@ -3714,6 +3729,7 @@ meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.
 meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.Comment)
 meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.ConditionalExpression)
 meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.ConstantDeclaration)
+meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.ConstantVariable)
 meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.ContinueStatement)
 meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.DeclareStatement)
 meth public abstract void visit(org.netbeans.modules.php.editor.parser.astnodes.DereferencableVariable)
@@ -3855,6 +3871,7 @@ meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.CloneExpr
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.Comment)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ConditionalExpression)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ConstantDeclaration)
+meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ConstantVariable)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ContinueStatement)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.DeclareStatement)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.DoStatement)
@@ -3959,6 +3976,7 @@ meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.CloneExpr
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.Comment)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ConditionalExpression)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ConstantDeclaration)
+meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ConstantVariable)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.ContinueStatement)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.DeclareStatement)
 meth public void visit(org.netbeans.modules.php.editor.parser.astnodes.DereferencableVariable)
diff --git a/platform/api.progress.compat8/nbproject/org-netbeans-api-progress-compat8.sig b/platform/api.progress.compat8/nbproject/org-netbeans-api-progress-compat8.sig
index c2038172c10f..f7f8f204f3e3 100644
--- a/platform/api.progress.compat8/nbproject/org-netbeans-api-progress-compat8.sig
+++ b/platform/api.progress.compat8/nbproject/org-netbeans-api-progress-compat8.sig
@@ -167,6 +167,7 @@ CLSS public abstract interface static org.netbeans.modules.progress.spi.RunOffED
  outer org.netbeans.modules.progress.spi.RunOffEDTProvider
 intf org.netbeans.modules.progress.spi.RunOffEDTProvider$Progress
 meth public abstract void runOffEventThreadWithCustomDialogContent(java.lang.Runnable,java.lang.String,javax.swing.JPanel,int,int)
+ anno 0 java.lang.Deprecated()
 meth public abstract void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
 
 CLSS public final org.netbeans.modules.progress.spi.TaskModel
diff --git a/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig b/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
index 98426732a917..ed34cc8f9717 100644
--- a/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
+++ b/platform/api.progress.nb/nbproject/org-netbeans-api-progress-nb.sig
@@ -313,6 +313,7 @@ CLSS public abstract interface static org.netbeans.modules.progress.spi.RunOffED
  outer org.netbeans.modules.progress.spi.RunOffEDTProvider
 intf org.netbeans.modules.progress.spi.RunOffEDTProvider$Progress
 meth public abstract void runOffEventThreadWithCustomDialogContent(java.lang.Runnable,java.lang.String,javax.swing.JPanel,int,int)
+ anno 0 java.lang.Deprecated()
 meth public abstract void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
 
 CLSS public org.netbeans.modules.progress.spi.SwingController
diff --git a/platform/api.progress/nbproject/org-netbeans-api-progress.sig b/platform/api.progress/nbproject/org-netbeans-api-progress.sig
index fd88556e6919..b77c049c19a8 100644
--- a/platform/api.progress/nbproject/org-netbeans-api-progress.sig
+++ b/platform/api.progress/nbproject/org-netbeans-api-progress.sig
@@ -208,6 +208,7 @@ CLSS public abstract interface static org.netbeans.modules.progress.spi.RunOffED
  outer org.netbeans.modules.progress.spi.RunOffEDTProvider
 intf org.netbeans.modules.progress.spi.RunOffEDTProvider$Progress
 meth public abstract void runOffEventThreadWithCustomDialogContent(java.lang.Runnable,java.lang.String,javax.swing.JPanel,int,int)
+ anno 0 java.lang.Deprecated()
 meth public abstract void runOffEventThreadWithProgressDialog(java.lang.Runnable,java.lang.String,org.netbeans.api.progress.ProgressHandle,boolean,int,int)
 
 CLSS public final org.netbeans.modules.progress.spi.TaskModel
diff --git a/platform/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig b/platform/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig
index aafc0c53e825..2bb511fc76e3 100644
--- a/platform/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig
+++ b/platform/editor.mimelookup/nbproject/org-netbeans-modules-editor-mimelookup.sig
@@ -49,9 +49,13 @@ meth public abstract java.lang.annotation.ElementType[] value()
 
 CLSS public final org.netbeans.api.editor.mimelookup.MimeLookup
 meth public <%0 extends java.lang.Object> org.openide.util.Lookup$Result<{%%0}> lookup(org.openide.util.Lookup$Template<{%%0}>)
+ anno 0 java.lang.Deprecated()
 meth public <%0 extends java.lang.Object> {%%0} lookup(java.lang.Class<{%%0}>)
+ anno 0 java.lang.Deprecated()
 meth public org.netbeans.api.editor.mimelookup.MimeLookup childLookup(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public static org.netbeans.api.editor.mimelookup.MimeLookup getMimeLookup(java.lang.String)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.util.Lookup getLookup(java.lang.String)
 meth public static org.openide.util.Lookup getLookup(org.netbeans.api.editor.mimelookup.MimePath)
 supr org.openide.util.Lookup
diff --git a/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig b/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
index 623a2aca1c02..864876c427bb 100644
--- a/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
+++ b/platform/libs.flatlaf/nbproject/org-netbeans-libs-flatlaf.sig
@@ -86,7 +86,11 @@ fld public final static java.lang.String TEXT_FIELD_TRAILING_COMPONENT = "JTextF
 fld public final static java.lang.String TEXT_FIELD_TRAILING_ICON = "JTextField.trailingIcon"
 fld public final static java.lang.String TITLE_BAR_BACKGROUND = "JRootPane.titleBarBackground"
 fld public final static java.lang.String TITLE_BAR_FOREGROUND = "JRootPane.titleBarForeground"
+fld public final static java.lang.String TITLE_BAR_SHOW_CLOSE = "JRootPane.titleBarShowClose"
 fld public final static java.lang.String TITLE_BAR_SHOW_ICON = "JRootPane.titleBarShowIcon"
+fld public final static java.lang.String TITLE_BAR_SHOW_ICONIFFY = "JRootPane.titleBarShowIconify"
+fld public final static java.lang.String TITLE_BAR_SHOW_MAXIMIZE = "JRootPane.titleBarShowMaximize"
+fld public final static java.lang.String TITLE_BAR_SHOW_TITLE = "JRootPane.titleBarShowTitle"
 fld public final static java.lang.String TREE_PAINT_SELECTION = "JTree.paintSelection"
 fld public final static java.lang.String TREE_WIDE_SELECTION = "JTree.wideSelection"
 fld public final static java.lang.String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations"
@@ -195,8 +199,13 @@ meth public static boolean isUseNativeWindowDecorations()
 meth public static boolean setup(javax.swing.LookAndFeel)
 meth public static boolean supportsNativeWindowDecorations()
 meth public static java.lang.Object parseDefaultsValue(java.lang.String,java.lang.String,java.lang.Class<?>)
+meth public static java.lang.String getPreferredFontFamily()
+meth public static java.lang.String getPreferredLightFontFamily()
+meth public static java.lang.String getPreferredMonospacedFontFamily()
+meth public static java.lang.String getPreferredSemiboldFontFamily()
 meth public static java.util.Map<java.lang.String,java.lang.Class<?>> getStyleableInfos(javax.swing.JComponent)
 meth public static java.util.Map<java.lang.String,java.lang.String> getGlobalExtraDefaults()
+meth public static java.util.function.Function<java.lang.String,java.awt.Color> getSystemColorGetter()
 meth public static javax.swing.UIDefaults$ActiveValue createActiveFontValue(float)
 meth public static void hideMnemonics()
 meth public static void initIconColors(javax.swing.UIDefaults,boolean)
@@ -209,6 +218,11 @@ meth public static void repaintAllFramesAndDialogs()
 meth public static void revalidateAndRepaintAllFramesAndDialogs()
 meth public static void runWithUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>,java.lang.Runnable)
 meth public static void setGlobalExtraDefaults(java.util.Map<java.lang.String,java.lang.String>)
+meth public static void setPreferredFontFamily(java.lang.String)
+meth public static void setPreferredLightFontFamily(java.lang.String)
+meth public static void setPreferredMonospacedFontFamily(java.lang.String)
+meth public static void setPreferredSemiboldFontFamily(java.lang.String)
+meth public static void setSystemColorGetter(java.util.function.Function<java.lang.String,java.awt.Color>)
 meth public static void setUseNativeWindowDecorations(boolean)
 meth public static void showMnemonics(java.awt.Component)
 meth public static void unregisterCustomDefaultsSource(java.io.File)
@@ -223,7 +237,7 @@ meth public void setExtraDefaults(java.util.Map<java.lang.String,java.lang.Strin
 meth public void uninitialize()
 meth public void unregisterUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
 supr javax.swing.plaf.basic.BasicLookAndFeel
-hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,getUIMethod,getUIMethodInitialized,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,subMenuUsabilityHelperInstalled,uiDefaultsGetters,updateUIPending
+hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,getUIMethod,getUIMethodInitialized,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,preferredFontFamily,preferredLightFontFamily,preferredMonospacedFontFamily,preferredSemiboldFontFamily,subMenuUsabilityHelperInstalled,systemColorGetter,uiDefaultsGetters,updateUIPending
 hcls ActiveFont,FlatUIDefaults,ImageIconUIResource
 
 CLSS public abstract interface static com.formdev.flatlaf.FlatLaf$DisabledIconProvider
@@ -295,6 +309,26 @@ meth public java.lang.String getName()
 supr com.formdev.flatlaf.FlatLaf
 hfds theme
 
+CLSS public com.formdev.flatlaf.themes.FlatMacDarkLaf
+cons public init()
+fld public final static java.lang.String NAME = "FlatLaf macOS Dark"
+meth public boolean isDark()
+meth public java.lang.String getDescription()
+meth public java.lang.String getName()
+meth public static boolean setup()
+meth public static void installLafInfo()
+supr com.formdev.flatlaf.FlatDarkLaf
+
+CLSS public com.formdev.flatlaf.themes.FlatMacLightLaf
+cons public init()
+fld public final static java.lang.String NAME = "FlatLaf macOS Light"
+meth public boolean isDark()
+meth public java.lang.String getDescription()
+meth public java.lang.String getName()
+meth public static boolean setup()
+meth public static void installLafInfo()
+supr com.formdev.flatlaf.FlatLightLaf
+
 CLSS public abstract interface com.formdev.flatlaf.util.AnimatedIcon
 innr public static AnimationSupport
 intf javax.swing.Icon
@@ -362,6 +396,7 @@ meth public static float clamp(float)
 meth public static float luma(java.awt.Color)
 meth public static java.awt.Color darken(java.awt.Color,float)
 meth public static java.awt.Color desaturate(java.awt.Color,float)
+meth public static java.awt.Color fade(java.awt.Color,float)
 meth public static java.awt.Color lighten(java.awt.Color,float)
 meth public static java.awt.Color mix(java.awt.Color,java.awt.Color,float)
 meth public static java.awt.Color saturate(java.awt.Color,float)
@@ -437,6 +472,17 @@ meth public java.lang.String toString()
 supr javax.swing.plaf.ColorUIResource
 hfds baseOfDefaultColorRGB,functions,hasBaseOfDefaultColor
 
+CLSS public com.formdev.flatlaf.util.FontUtils
+cons public init()
+meth public static boolean installFont(java.net.URL)
+meth public static java.awt.Font getCompositeFont(java.lang.String,int,int)
+meth public static java.awt.Font[] getAllFonts()
+meth public static java.lang.String[] getAvailableFontFamilyNames()
+meth public static void loadFontFamily(java.lang.String)
+meth public static void registerFontFamilyLoader(java.lang.String,java.lang.Runnable)
+supr java.lang.Object
+hfds loadersMap
+
 CLSS public com.formdev.flatlaf.util.Graphics2DProxy
 cons public init(java.awt.Graphics2D)
 meth public boolean drawImage(java.awt.Image,int,int,int,int,int,int,int,int,java.awt.Color,java.awt.image.ImageObserver)
@@ -573,7 +619,7 @@ meth public static void drawStringWithYCorrection(javax.swing.JComponent,java.aw
 meth public static void paintAtScale1x(java.awt.Graphics2D,int,int,int,int,com.formdev.flatlaf.util.HiDPIUtils$Painter)
 meth public static void paintAtScale1x(java.awt.Graphics2D,javax.swing.JComponent,com.formdev.flatlaf.util.HiDPIUtils$Painter)
 supr java.lang.Object
-hfds useTextYCorrection
+hfds CORRECTION_INTER,CORRECTION_OPEN_SANS,CORRECTION_SEGOE_UI,CORRECTION_TAHOMA,SCALE_FACTORS,useDebugScaleFactor,useTextYCorrection
 
 CLSS public abstract interface static com.formdev.flatlaf.util.HiDPIUtils$Painter
  outer com.formdev.flatlaf.util.HiDPIUtils
diff --git a/platform/o.n.core/nbproject/org-netbeans-core.sig b/platform/o.n.core/nbproject/org-netbeans-core.sig
index d0c46c8d12f5..adaf0465265f 100644
--- a/platform/o.n.core/nbproject/org-netbeans-core.sig
+++ b/platform/o.n.core/nbproject/org-netbeans-core.sig
@@ -869,6 +869,7 @@ intf org.openide.explorer.propertysheet.editors.XMLPropertyEditor
 meth public boolean isPaintable()
 meth public boolean supportsCustomEditor()
 meth public final static boolean gtkShouldAntialias()
+ anno 0 java.lang.Deprecated()
 meth public java.awt.Component getCustomEditor()
 meth public java.lang.Object getValue()
 meth public java.lang.String getAsText()
@@ -1250,6 +1251,7 @@ hfds ATTR_COUNT,ATTR_INDEX,ATTR_VALUE,XML_STRING_ARRAY,XML_STRING_ITEM,editable,
 
 CLSS public org.netbeans.beaninfo.editors.StringCustomEditor
 cons public init(java.lang.String,boolean)
+ anno 0 java.lang.Deprecated()
 intf java.beans.PropertyChangeListener
 meth public void addNotify()
 meth public void propertyChange(java.beans.PropertyChangeEvent)
diff --git a/platform/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig b/platform/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig
index c7afc6551bed..72b90964337b 100644
--- a/platform/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig
+++ b/platform/o.n.swing.tabcontrol/nbproject/org-netbeans-swing-tabcontrol.sig
@@ -2456,6 +2456,7 @@ innr protected BasicSelectionListener
 innr protected BasicTabState
 meth protected abstract org.netbeans.swing.tabcontrol.plaf.TabCellRenderer createDefaultRenderer()
 meth protected boolean isAntialiased()
+ anno 0 java.lang.Deprecated()
 meth protected final java.awt.Point getLastKnownMouseLocation()
 meth protected final void cancelRequestAttention(int)
 meth protected final void getTabsVisibleArea(java.awt.Rectangle)
@@ -2556,6 +2557,7 @@ supr org.netbeans.swing.tabcontrol.plaf.BusyTabsSupport
 hfds busyIconDefault,busyIconSelected
 
 CLSS public org.netbeans.swing.tabcontrol.plaf.ChicletWrapper
+ anno 0 java.lang.Deprecated()
 cons public init()
 intf java.lang.Runnable
 meth public java.lang.Long hash()
@@ -2893,6 +2895,7 @@ hfds AQUA_INSTANCE,INSTANCE
 
 CLSS public final static org.netbeans.swing.tabcontrol.plaf.SlidingTabDisplayerButtonUI$Aqua
  outer org.netbeans.swing.tabcontrol.plaf.SlidingTabDisplayerButtonUI
+ anno 0 java.lang.Deprecated()
 cons public init()
 meth protected void installBorder(javax.swing.AbstractButton)
 meth protected void paintBackground(java.awt.Graphics2D,org.netbeans.swing.tabcontrol.plaf.BasicSlidingTabDisplayerUI$IndexButton)
diff --git a/platform/openide.compat/nbproject/org-openide-compat.sig b/platform/openide.compat/nbproject/org-openide-compat.sig
index ff79fea3d0a6..2fa14bce297a 100644
--- a/platform/openide.compat/nbproject/org-openide-compat.sig
+++ b/platform/openide.compat/nbproject/org-openide-compat.sig
@@ -1261,7 +1261,7 @@ intf java.util.EventListener
 meth public abstract void resultChanged(org.openide.util.LookupEvent)
 
 CLSS public org.openide.util.MapFormat
-cons public init(java.util.Map)
+cons public init(java.util.Map<java.lang.String,?>)
 meth protected java.lang.Object processKey(java.lang.String)
 meth public boolean isExactMatch()
 meth public boolean willThrowExceptionIfKeyWasNotFound()
@@ -1275,7 +1275,7 @@ meth public java.util.Map getMap()
 meth public static java.lang.String format(java.lang.String,java.util.Map)
 meth public void setExactMatch(boolean)
 meth public void setLeftBrace(java.lang.String)
-meth public void setMap(java.util.Map)
+meth public void setMap(java.util.Map<java.lang.String,?>)
 meth public void setRightBrace(java.lang.String)
 meth public void setThrowExceptionIfKeyWasNotFound(boolean)
 supr java.text.Format
@@ -1709,6 +1709,7 @@ meth public static java.net.URL toURL(java.io.File) throws java.net.MalformedURL
 meth public static java.util.List partialSort(java.util.List,java.util.Comparator,boolean)
  anno 0 java.lang.Deprecated()
 meth public static java.util.List<? extends javax.swing.Action> actionsForPath(java.lang.String)
+meth public static java.util.List<? extends javax.swing.Action> actionsForPath(java.lang.String,org.openide.util.Lookup)
 meth public static javax.swing.JPopupMenu actionsToPopup(javax.swing.Action[],java.awt.Component)
 meth public static javax.swing.JPopupMenu actionsToPopup(javax.swing.Action[],org.openide.util.Lookup)
 meth public static javax.swing.KeyStroke stringToKey(java.lang.String)
diff --git a/platform/openide.execution.compat8/nbproject/org-openide-execution-compat8.sig b/platform/openide.execution.compat8/nbproject/org-openide-execution-compat8.sig
index c35280a45986..9467c2e19848 100644
--- a/platform/openide.execution.compat8/nbproject/org-openide-execution-compat8.sig
+++ b/platform/openide.execution.compat8/nbproject/org-openide-execution-compat8.sig
@@ -155,6 +155,7 @@ CLSS public abstract org.openide.execution.ExecutionEngine
 cons public init()
 meth protected abstract java.security.PermissionCollection createPermissions(java.security.CodeSource,org.openide.windows.InputOutput)
 meth protected abstract org.openide.execution.NbClassPath createLibraryPath()
+ anno 0 java.lang.Deprecated()
 meth public abstract org.openide.execution.ExecutorTask execute(java.lang.String,java.lang.Runnable,org.openide.windows.InputOutput)
 meth public static org.openide.execution.ExecutionEngine getDefault()
 supr java.lang.Object
@@ -169,10 +170,14 @@ supr org.openide.util.Task
 
 CLSS public org.openide.execution.NbClassLoader
 cons public init()
+ anno 0 java.lang.Deprecated()
 cons public init(org.openide.filesystems.FileObject[],java.lang.ClassLoader,org.openide.windows.InputOutput)
 cons public init(org.openide.filesystems.FileSystem[])
+ anno 0 java.lang.Deprecated()
 cons public init(org.openide.filesystems.FileSystem[],java.lang.ClassLoader)
+ anno 0 java.lang.Deprecated()
 cons public init(org.openide.windows.InputOutput)
+ anno 0 java.lang.Deprecated()
 fld protected org.openide.windows.InputOutput inout
 meth protected final java.security.PermissionCollection getPermissions(java.security.CodeSource)
 meth protected java.lang.Class findClass(java.lang.String) throws java.lang.ClassNotFoundException
@@ -190,9 +195,13 @@ meth public boolean equals(java.lang.Object)
 meth public java.lang.Exception[] getExceptions()
 meth public java.lang.String getClassPath()
 meth public static java.io.File toFile(org.openide.filesystems.FileObject)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.execution.NbClassPath createBootClassPath()
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.execution.NbClassPath createClassPath()
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.execution.NbClassPath createLibraryPath()
+ anno 0 java.lang.Deprecated()
 supr java.lang.Object
 hfds classpath,items,serialVersionUID
 
@@ -222,6 +231,7 @@ supr java.lang.Object
 hfds arguments,execLog,info,processName,serialVersionUID
 
 CLSS public abstract org.openide.execution.ScriptType
+ anno 0 java.lang.Deprecated()
 cons public init()
 innr public static Context
 meth public abstract boolean acceptFileObject(org.openide.filesystems.FileObject)
diff --git a/platform/openide.execution/nbproject/org-openide-execution.sig b/platform/openide.execution/nbproject/org-openide-execution.sig
index 14608e789c12..80839ab12cb6 100644
--- a/platform/openide.execution/nbproject/org-openide-execution.sig
+++ b/platform/openide.execution/nbproject/org-openide-execution.sig
@@ -155,6 +155,7 @@ CLSS public abstract org.openide.execution.ExecutionEngine
 cons public init()
 meth protected abstract java.security.PermissionCollection createPermissions(java.security.CodeSource,org.openide.windows.InputOutput)
 meth protected abstract org.openide.execution.NbClassPath createLibraryPath()
+ anno 0 java.lang.Deprecated()
 meth public abstract org.openide.execution.ExecutorTask execute(java.lang.String,java.lang.Runnable,org.openide.windows.InputOutput)
 meth public static org.openide.execution.ExecutionEngine getDefault()
 supr java.lang.Object
@@ -169,10 +170,14 @@ supr org.openide.util.Task
 
 CLSS public org.openide.execution.NbClassLoader
 cons public init()
+ anno 0 java.lang.Deprecated()
 cons public init(org.openide.filesystems.FileObject[],java.lang.ClassLoader,org.openide.windows.InputOutput)
 cons public init(org.openide.filesystems.FileSystem[])
+ anno 0 java.lang.Deprecated()
 cons public init(org.openide.filesystems.FileSystem[],java.lang.ClassLoader)
+ anno 0 java.lang.Deprecated()
 cons public init(org.openide.windows.InputOutput)
+ anno 0 java.lang.Deprecated()
 fld protected org.openide.windows.InputOutput inout
 meth protected final java.security.PermissionCollection getPermissions(java.security.CodeSource)
 meth protected java.lang.Class findClass(java.lang.String) throws java.lang.ClassNotFoundException
@@ -190,9 +195,13 @@ meth public boolean equals(java.lang.Object)
 meth public java.lang.Exception[] getExceptions()
 meth public java.lang.String getClassPath()
 meth public static java.io.File toFile(org.openide.filesystems.FileObject)
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.execution.NbClassPath createBootClassPath()
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.execution.NbClassPath createClassPath()
+ anno 0 java.lang.Deprecated()
 meth public static org.openide.execution.NbClassPath createLibraryPath()
+ anno 0 java.lang.Deprecated()
 supr java.lang.Object
 hfds classpath,items,serialVersionUID
 
@@ -214,6 +223,7 @@ supr java.lang.Object
 hfds arguments,execLog,info,processName,serialVersionUID
 
 CLSS public abstract org.openide.execution.ScriptType
+ anno 0 java.lang.Deprecated()
 cons public init()
 innr public static Context
 meth public abstract boolean acceptFileObject(org.openide.filesystems.FileObject)
diff --git a/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig b/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
index ac73f56a6ffe..10fe29a35345 100644
--- a/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
+++ b/platform/openide.filesystems.compat8/nbproject/org-openide-filesystems-compat8.sig
@@ -592,6 +592,7 @@ meth public static java.net.URL getArchiveRoot(java.net.URL)
 meth public static java.net.URL urlForArchiveOrDir(java.io.File)
 meth public static java.net.URLStreamHandler nbfsURLStreamHandler()
  anno 0 java.lang.Deprecated()
+meth public static java.nio.file.Path toPath(org.openide.filesystems.FileObject)
 meth public static java.util.List<java.lang.String> getMIMETypeExtensions(java.lang.String)
 meth public static java.util.List<org.openide.filesystems.FileObject> getOrder(java.util.Collection<org.openide.filesystems.FileObject>,boolean)
 meth public static java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object> defaultAttributesTransformer()
@@ -611,6 +612,7 @@ meth public static org.openide.filesystems.FileObject getSystemConfigFile(java.l
 meth public static org.openide.filesystems.FileObject getSystemConfigRoot()
 meth public static org.openide.filesystems.FileObject moveFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
 meth public static org.openide.filesystems.FileObject toFileObject(java.io.File)
+meth public static org.openide.filesystems.FileObject toFileObject(java.nio.file.Path)
 meth public static org.openide.filesystems.FileObject[] fromFile(java.io.File)
  anno 0 java.lang.Deprecated()
 meth public static org.openide.filesystems.FileStatusListener weakFileStatusListener(org.openide.filesystems.FileStatusListener,java.lang.Object)
diff --git a/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig b/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
index 3206f9ac17d2..4afa5647894a 100644
--- a/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
+++ b/platform/openide.filesystems.nb/nbproject/org-openide-filesystems-nb.sig
@@ -521,6 +521,7 @@ meth public static java.net.URL getArchiveRoot(java.net.URL)
 meth public static java.net.URL urlForArchiveOrDir(java.io.File)
 meth public static java.net.URLStreamHandler nbfsURLStreamHandler()
  anno 0 java.lang.Deprecated()
+meth public static java.nio.file.Path toPath(org.openide.filesystems.FileObject)
 meth public static java.util.List<java.lang.String> getMIMETypeExtensions(java.lang.String)
 meth public static java.util.List<org.openide.filesystems.FileObject> getOrder(java.util.Collection<org.openide.filesystems.FileObject>,boolean)
 meth public static java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object> defaultAttributesTransformer()
@@ -540,6 +541,7 @@ meth public static org.openide.filesystems.FileObject getSystemConfigFile(java.l
 meth public static org.openide.filesystems.FileObject getSystemConfigRoot()
 meth public static org.openide.filesystems.FileObject moveFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
 meth public static org.openide.filesystems.FileObject toFileObject(java.io.File)
+meth public static org.openide.filesystems.FileObject toFileObject(java.nio.file.Path)
 meth public static org.openide.filesystems.FileObject[] fromFile(java.io.File)
  anno 0 java.lang.Deprecated()
 meth public static org.openide.filesystems.FileStatusListener weakFileStatusListener(org.openide.filesystems.FileStatusListener,java.lang.Object)
diff --git a/platform/openide.filesystems/nbproject/org-openide-filesystems.sig b/platform/openide.filesystems/nbproject/org-openide-filesystems.sig
index 3728af2c69da..c31e20941826 100644
--- a/platform/openide.filesystems/nbproject/org-openide-filesystems.sig
+++ b/platform/openide.filesystems/nbproject/org-openide-filesystems.sig
@@ -492,6 +492,7 @@ meth public static java.net.URL getArchiveRoot(java.net.URL)
 meth public static java.net.URL urlForArchiveOrDir(java.io.File)
 meth public static java.net.URLStreamHandler nbfsURLStreamHandler()
  anno 0 java.lang.Deprecated()
+meth public static java.nio.file.Path toPath(org.openide.filesystems.FileObject)
 meth public static java.util.List<java.lang.String> getMIMETypeExtensions(java.lang.String)
 meth public static java.util.List<org.openide.filesystems.FileObject> getOrder(java.util.Collection<org.openide.filesystems.FileObject>,boolean)
 meth public static java.util.function.BiFunction<java.lang.String,java.lang.Object,java.lang.Object> defaultAttributesTransformer()
@@ -511,6 +512,7 @@ meth public static org.openide.filesystems.FileObject getSystemConfigFile(java.l
 meth public static org.openide.filesystems.FileObject getSystemConfigRoot()
 meth public static org.openide.filesystems.FileObject moveFile(org.openide.filesystems.FileObject,org.openide.filesystems.FileObject,java.lang.String) throws java.io.IOException
 meth public static org.openide.filesystems.FileObject toFileObject(java.io.File)
+meth public static org.openide.filesystems.FileObject toFileObject(java.nio.file.Path)
 meth public static org.openide.filesystems.FileObject[] fromFile(java.io.File)
  anno 0 java.lang.Deprecated()
 meth public static org.openide.filesystems.FileStatusListener weakFileStatusListener(org.openide.filesystems.FileStatusListener,java.lang.Object)
diff --git a/platform/openide.loaders/nbproject/org-openide-loaders.sig b/platform/openide.loaders/nbproject/org-openide-loaders.sig
index 387b28016901..114cd6540314 100644
--- a/platform/openide.loaders/nbproject/org-openide-loaders.sig
+++ b/platform/openide.loaders/nbproject/org-openide-loaders.sig
@@ -3334,6 +3334,7 @@ CLSS public abstract interface org.openide.loaders.CreateFromTemplateAttributesP
 meth public abstract java.util.Map<java.lang.String,?> attributesFor(org.openide.loaders.DataObject,org.openide.loaders.DataFolder,java.lang.String)
 
 CLSS public abstract org.openide.loaders.CreateFromTemplateHandler
+ anno 0 java.lang.Deprecated()
 cons public init()
 fld public final static java.lang.String FREE_FILE_EXTENSION = "freeFileExtension"
 meth protected abstract boolean accept(org.openide.filesystems.FileObject)
diff --git a/platform/openide.options/nbproject/org-openide-options.sig b/platform/openide.options/nbproject/org-openide-options.sig
index 9ae36483e584..a9c3cb99c0cf 100644
--- a/platform/openide.options/nbproject/org-openide-options.sig
+++ b/platform/openide.options/nbproject/org-openide-options.sig
@@ -1324,6 +1324,7 @@ meth public abstract void addAnnotation(javax.swing.text.Position,int,org.openid
 meth public abstract void removeAnnotation(org.openide.text.Annotation)
 
 CLSS public final org.openide.text.NbDocument$Colors
+ anno 0 java.lang.Deprecated()
 cons public init()
 fld public final static java.lang.String PROP_BREAKPOINT = "NbBreakpointStyle"
 fld public final static java.lang.String PROP_CURRENT = "NbCurrentStyle"
diff --git a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
index 233e224cf6c7..1ac12190e803 100644
--- a/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
+++ b/platform/openide.util.ui/nbproject/org-openide-util-ui.sig
@@ -887,7 +887,7 @@ intf java.util.EventListener
 meth public abstract void resultChanged(org.openide.util.LookupEvent)
 
 CLSS public org.openide.util.MapFormat
-cons public init(java.util.Map)
+cons public init(java.util.Map<java.lang.String,?>)
 meth protected java.lang.Object processKey(java.lang.String)
 meth public boolean isExactMatch()
 meth public boolean willThrowExceptionIfKeyWasNotFound()
@@ -901,7 +901,7 @@ meth public java.util.Map getMap()
 meth public static java.lang.String format(java.lang.String,java.util.Map)
 meth public void setExactMatch(boolean)
 meth public void setLeftBrace(java.lang.String)
-meth public void setMap(java.util.Map)
+meth public void setMap(java.util.Map<java.lang.String,?>)
 meth public void setRightBrace(java.lang.String)
 meth public void setThrowExceptionIfKeyWasNotFound(boolean)
 supr java.text.Format
@@ -1335,6 +1335,7 @@ meth public static java.net.URL toURL(java.io.File) throws java.net.MalformedURL
 meth public static java.util.List partialSort(java.util.List,java.util.Comparator,boolean)
  anno 0 java.lang.Deprecated()
 meth public static java.util.List<? extends javax.swing.Action> actionsForPath(java.lang.String)
+meth public static java.util.List<? extends javax.swing.Action> actionsForPath(java.lang.String,org.openide.util.Lookup)
 meth public static javax.swing.JPopupMenu actionsToPopup(javax.swing.Action[],java.awt.Component)
 meth public static javax.swing.JPopupMenu actionsToPopup(javax.swing.Action[],org.openide.util.Lookup)
 meth public static javax.swing.KeyStroke stringToKey(java.lang.String)
diff --git a/platform/openide.util/nbproject/org-openide-util.sig b/platform/openide.util/nbproject/org-openide-util.sig
index 1808030b6f44..e0750de59687 100644
--- a/platform/openide.util/nbproject/org-openide-util.sig
+++ b/platform/openide.util/nbproject/org-openide-util.sig
@@ -669,7 +669,7 @@ intf java.util.EventListener
 meth public abstract void resultChanged(org.openide.util.LookupEvent)
 
 CLSS public org.openide.util.MapFormat
-cons public init(java.util.Map)
+cons public init(java.util.Map<java.lang.String,?>)
 meth protected java.lang.Object processKey(java.lang.String)
 meth public boolean isExactMatch()
 meth public boolean willThrowExceptionIfKeyWasNotFound()
@@ -683,7 +683,7 @@ meth public java.util.Map getMap()
 meth public static java.lang.String format(java.lang.String,java.util.Map)
 meth public void setExactMatch(boolean)
 meth public void setLeftBrace(java.lang.String)
-meth public void setMap(java.util.Map)
+meth public void setMap(java.util.Map<java.lang.String,?>)
 meth public void setRightBrace(java.lang.String)
 meth public void setThrowExceptionIfKeyWasNotFound(boolean)
 supr java.text.Format
diff --git a/platform/openide.windows/nbproject/org-openide-windows.sig b/platform/openide.windows/nbproject/org-openide-windows.sig
index 8f2a6a14fcfd..a89aaf6fb0dc 100644
--- a/platform/openide.windows/nbproject/org-openide-windows.sig
+++ b/platform/openide.windows/nbproject/org-openide-windows.sig
@@ -744,6 +744,7 @@ intf java.io.Serializable
 meth public boolean isEmpty()
 meth public java.util.Enumeration<org.openide.windows.CloneableTopComponent> getComponents()
 meth public org.openide.windows.CloneableTopComponent getAnyComponent()
+ anno 0 java.lang.Deprecated()
 meth public org.openide.windows.CloneableTopComponent getArbitraryComponent()
 supr java.lang.Object
 hfds LOCK,componentSet,myComponentSetListener,serialVersionUID
@@ -758,19 +759,25 @@ supr java.lang.Object
 CLSS public abstract interface org.openide.windows.Mode
 fld public final static java.lang.String PROP_BOUNDS = "bounds"
 fld public final static java.lang.String PROP_DISPLAY_NAME = "displayName"
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String PROP_NAME = "name"
+ anno 0 java.lang.Deprecated()
 fld public final static long serialVersionUID = -2650968323666215654
+ anno 0 java.lang.Deprecated()
 innr public abstract interface static Xml
 intf java.io.Serializable
 meth public abstract boolean canDock(org.openide.windows.TopComponent)
 meth public abstract boolean dockInto(org.openide.windows.TopComponent)
 meth public abstract java.awt.Image getIcon()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.awt.Rectangle getBounds()
 meth public abstract java.lang.String getDisplayName()
+ anno 0 java.lang.Deprecated()
 meth public abstract java.lang.String getName()
 meth public abstract org.openide.windows.TopComponent getSelectedTopComponent()
 meth public abstract org.openide.windows.TopComponent[] getTopComponents()
 meth public abstract org.openide.windows.Workspace getWorkspace()
+ anno 0 java.lang.Deprecated()
 meth public abstract void addPropertyChangeListener(java.beans.PropertyChangeListener)
 meth public abstract void removePropertyChangeListener(java.beans.PropertyChangeListener)
 meth public abstract void setBounds(java.awt.Rectangle)
@@ -1083,6 +1090,7 @@ meth public abstract void beforeLoad(org.openide.windows.WindowSystemEvent)
 meth public abstract void beforeSave(org.openide.windows.WindowSystemEvent)
 
 CLSS public abstract interface org.openide.windows.Workspace
+ anno 0 java.lang.Deprecated()
 fld public final static java.lang.String PROP_DISPLAY_NAME = "displayName"
 fld public final static java.lang.String PROP_MODES = "modes"
 fld public final static java.lang.String PROP_NAME = "name"
diff --git a/platform/options.api/nbproject/org-netbeans-modules-options-api.sig b/platform/options.api/nbproject/org-netbeans-modules-options-api.sig
index 846ba78476e0..ae3a097a2407 100644
--- a/platform/options.api/nbproject/org-netbeans-modules-options-api.sig
+++ b/platform/options.api/nbproject/org-netbeans-modules-options-api.sig
@@ -70,6 +70,7 @@ meth public abstract java.lang.String getCategoryName()
 meth public abstract java.lang.String getTitle()
 meth public abstract org.netbeans.spi.options.OptionsPanelController create()
 meth public java.lang.String getIconBase()
+ anno 0 java.lang.Deprecated()
 meth public javax.swing.Icon getIcon()
 supr java.lang.Object
 hfds ADVANCED_OPTIONS_FOLDER,CATEGORY_NAME,CONTROLLER,ICON,KEYWORDS,KEYWORDS_CATEGORY,TITLE

@ebarboni
Copy link
Contributor

ebarboni commented Feb 1, 2023

looks good for me

matthiasblaesing
matthiasblaesing approved these changes Feb 1, 2023
View reviewed changes
Copy link
Contributor

@matthiasblaesing matthiasblaesing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sane to me.

@neilcsmith-net
Copy link
Member Author

cc @matthiasblaesing @pepness will merge once tests pass. I rebased on master and resolved two conflicts keeping the contents from master. I don't think we've lost anything from the NB17 signature, but please flag any issue.

org-netbeans-modules-servletjspapi.sig from #5462

org-netbeans-modules-css-lib.sig from #5432

@neilcsmith-net neilcsmith-net merged commit aa6c56b into apache:master Feb 23, 2023
@neilcsmith-net neilcsmith-net removed the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Feb 23, 2023
@neilcsmith-net neilcsmith-net deleted the apis-nb170 branch January 16, 2024 09:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ebarboni ebarboni Awaiting requested review from ebarboni

@jtulach jtulach Awaiting requested review from jtulach

@lkishalmi lkishalmi Awaiting requested review from lkishalmi

@matthiasblaesing matthiasblaesing Awaiting requested review from matthiasblaesing

@pepness pepness Awaiting requested review from pepness

Assignees
No one assigned
Labels
Release process PRs (eg. versions, sync) that are part of the release process and can be ignored in release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@neilcsmith-net @ebarboni @matthiasblaesing