Resolve merge conflicts between delivery and master after 15-rc3
diff --git a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml
index df6e340..b408d54 100644
--- a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml
@@ -28,7 +28,7 @@
multiple: false
options:
- "Apache NetBeans 14"
-# - "Apache NetBeans 15 release candidate"
+ - "Apache NetBeans 15 release candidate"
- "Apache NetBeans latest daily build"
validations:
required: true
@@ -63,7 +63,7 @@
specified in the description.
multiple: false
options:
- - "No"
+ - "No / Don't know"
- "Apache NetBeans 14"
- "Apache NetBeans 13"
- "Apache NetBeans 12.6"
@@ -122,7 +122,6 @@
This is absolutely not required, but we are happy to guide you in the contribution process,
especially if you already have a good understanding of how to implement the fix. <br>
Apache NetBeans is a community-managed project and we love to bring new contributors in.
-
options:
- "Yes"
- "No"
diff --git a/.github/ISSUE_TEMPLATE/netbeans_feature_request.yml b/.github/ISSUE_TEMPLATE/netbeans_feature_request.yml
index d251ffc..1725b6f 100644
--- a/.github/ISSUE_TEMPLATE/netbeans_feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/netbeans_feature_request.yml
@@ -34,24 +34,29 @@
attributes:
label: Related issues
description: Is there currently another issue associated with this?
- - type: checkboxes
+ - type: dropdown
attributes:
- label: Are you willing to submit a PR?
+ label: Are you willing to submit a pull request?
description: >
This is absolutely not required, but we are happy to guide you in the contribution process,
- especially if you already have a good understanding of how to implement the fix.
+ especially if you already have a good understanding of how to implement the fix. <br>
Apache NetBeans is a community-managed project and we love to bring new contributors in.
options:
- - label: Yes I am willing to submit a PR!
- - type: checkboxes
+ - "Yes"
+ - "No"
+ validations:
+ required: true
+ - type: dropdown
attributes:
label: Code of Conduct
- description: The Code of Conduct helps create a safe space for everyone.
+ description: >
+ The Code of Conduct helps create a safe space for everyone.
+ I agree to follow the Apache Software Foundation's
+ [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
options:
- - label: >
- I agree to follow the Apache Software Foundation's
- [Code of Conduct](https://www.apache.org/foundation/policies/conduct.html)
- required: true
+ - "Yes"
+ validations:
+ required: true
- type: markdown
attributes:
- value: "Thanks for completing our form!"
+ value: "Thank you for completing our form!"
diff --git a/.travis.yml b/.travis.yml
index 1040546..b861c1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -654,7 +654,7 @@
before_install:
- nvm install 16.13.2
env:
- - OPTS="-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json -quiet -Dcluster.config=java -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true"
+ - OPTS="-Dmetabuild.jsonurl=https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/master/meta/netbeansrelease.json -quiet -Dcluster.config=release -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true"
before_script:
- nbbuild/travis/ant.sh $OPTS clean
- nbbuild/travis/ant.sh $OPTS build
diff --git a/apisupport/apisupport.ant/manifest.mf b/apisupport/apisupport.ant/manifest.mf
index a2e7f92..fa002d7 100644
--- a/apisupport/apisupport.ant/manifest.mf
+++ b/apisupport/apisupport.ant/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.apisupport.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.89
+OpenIDE-Module-Specification-Version: 2.90
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/resources/layer.xml
diff --git a/apisupport/apisupport.installer.maven/manifest.mf b/apisupport/apisupport.installer.maven/manifest.mf
index 447b490..b9c6cd7 100644
--- a/apisupport/apisupport.installer.maven/manifest.mf
+++ b/apisupport/apisupport.installer.maven/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.apisupport.installer.maven
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/installer/maven/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/apisupport/apisupport.installer/manifest.mf b/apisupport/apisupport.installer/manifest.mf
index d3d1ca0..9471f7f 100644
--- a/apisupport/apisupport.installer/manifest.mf
+++ b/apisupport/apisupport.installer/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.apisupport.installer
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/installer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.40
+OpenIDE-Module-Specification-Version: 1.41
diff --git a/apisupport/apisupport.kit/manifest.mf b/apisupport/apisupport.kit/manifest.mf
index 94535eb..75f50d2 100644
--- a/apisupport/apisupport.kit/manifest.mf
+++ b/apisupport/apisupport.kit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.apisupport.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
OpenIDE-Module-Provides: org.netbeans.modules.apisupport.kit
diff --git a/apisupport/apisupport.project/manifest.mf b/apisupport/apisupport.project/manifest.mf
index b1a5bf5..e6702d2 100644
--- a/apisupport/apisupport.project/manifest.mf
+++ b/apisupport/apisupport.project/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Requires: javax.script.ScriptEngine.freemarker
OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/resources/layer.xml
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.93
+OpenIDE-Module-Specification-Version: 1.94
diff --git a/apisupport/apisupport.refactoring/manifest.mf b/apisupport/apisupport.refactoring/manifest.mf
index 4191811..de171d0 100644
--- a/apisupport/apisupport.refactoring/manifest.mf
+++ b/apisupport/apisupport.refactoring/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.apisupport.refactoring
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/refactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
diff --git a/apisupport/apisupport.wizards/manifest.mf b/apisupport/apisupport.wizards/manifest.mf
index 8a9f779..d8365c2 100644
--- a/apisupport/apisupport.wizards/manifest.mf
+++ b/apisupport/apisupport.wizards/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.apisupport.wizards
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/ui/wizard/common/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/ui/wizard/common/layer.xml
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
diff --git a/apisupport/maven.apisupport/manifest.mf b/apisupport/maven.apisupport/manifest.mf
index 9b634ce..198c934 100644
--- a/apisupport/maven.apisupport/manifest.mf
+++ b/apisupport/maven.apisupport/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.maven.apisupport/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/apisupport/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.76
+OpenIDE-Module-Specification-Version: 1.77
diff --git a/apisupport/timers/manifest.mf b/apisupport/timers/manifest.mf
index cf0c000..e66fb5e 100644
--- a/apisupport/timers/manifest.mf
+++ b/apisupport/timers/manifest.mf
@@ -3,6 +3,6 @@
OpenIDE-Module-Layer: org/netbeans/modules/timers/resources/layer.xml
OpenIDE-Module-Install: org/netbeans/modules/timers/Install.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/timers/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: true
diff --git a/cpplite/cpplite.debugger/manifest.mf b/cpplite/cpplite.debugger/manifest.mf
index 329fb4d..46ebb03 100644
--- a/cpplite/cpplite.debugger/manifest.mf
+++ b/cpplite/cpplite.debugger/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.cpplite.debugger
OpenIDE-Module-Layer: org/netbeans/modules/cpplite/debugger/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/debugger/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
diff --git a/cpplite/cpplite.editor/manifest.mf b/cpplite/cpplite.editor/manifest.mf
index cb53c7e..796ec48 100644
--- a/cpplite/cpplite.editor/manifest.mf
+++ b/cpplite/cpplite.editor/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.cpplite.editor
OpenIDE-Module-Layer: org/netbeans/modules/cpplite/editor/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.8
+OpenIDE-Module-Specification-Version: 1.9
diff --git a/cpplite/cpplite.kit/manifest.mf b/cpplite/cpplite.kit/manifest.mf
index d4cd982..190d109 100644
--- a/cpplite/cpplite.kit/manifest.mf
+++ b/cpplite/cpplite.kit/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.cpplite.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.8
+OpenIDE-Module-Specification-Version: 1.9
diff --git a/cpplite/cpplite.project/manifest.mf b/cpplite/cpplite.project/manifest.mf
index e03bcf9..43c31f3 100644
--- a/cpplite/cpplite.project/manifest.mf
+++ b/cpplite/cpplite.project/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.cpplite.project
OpenIDE-Module-Layer: org/netbeans/modules/cpplite/project/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cpplite/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.8
+OpenIDE-Module-Specification-Version: 1.9
diff --git a/enterprise/api.web.webmodule/manifest.mf b/enterprise/api.web.webmodule/manifest.mf
index 8651e29..966c18d 100644
--- a/enterprise/api.web.webmodule/manifest.mf
+++ b/enterprise/api.web.webmodule/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.web.webmodule
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.56
OpenIDE-Module-Layer: org/netbeans/modules/web/webmodule/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/webmodule/Bundle.properties
diff --git a/enterprise/cloud.amazon/manifest.mf b/enterprise/cloud.amazon/manifest.mf
index 7c3c403..fd4395c 100644
--- a/enterprise/cloud.amazon/manifest.mf
+++ b/enterprise/cloud.amazon/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cloud/amazon/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/cloud/amazon/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.29
+OpenIDE-Module-Specification-Version: 1.30
diff --git a/enterprise/cloud.common/manifest.mf b/enterprise/cloud.common/manifest.mf
index 7d5499e..b8bf510 100644
--- a/enterprise/cloud.common/manifest.mf
+++ b/enterprise/cloud.common/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.cloud.common
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cloud/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.29
diff --git a/enterprise/cloud.oracle/manifest.mf b/enterprise/cloud.oracle/manifest.mf
index b257a80..eeac9bb 100644
--- a/enterprise/cloud.oracle/manifest.mf
+++ b/enterprise/cloud.oracle/manifest.mf
@@ -4,6 +4,6 @@
OpenIDE-Module-Layer: org/netbeans/modules/cloud/oracle/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cloud/oracle/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 1.2
+OpenIDE-Module-Specification-Version: 1.3
OpenIDE-Module-Display-Category: Cloud
diff --git a/enterprise/cloud.oracle/nbproject/project.xml b/enterprise/cloud.oracle/nbproject/project.xml
index ff2ee28..94c6240 100644
--- a/enterprise/cloud.oracle/nbproject/project.xml
+++ b/enterprise/cloud.oracle/nbproject/project.xml
@@ -64,6 +64,32 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.apache.commons.lang3</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.10</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.api.lsp</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.10</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.api.progress</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.65</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.libs.asm</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -73,6 +99,8 @@
</dependency>
<dependency>
<code-name-base>org.netbeans.libs.jackson</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
<run-dependency>
<release-version>2</release-version>
<specification-version>2.12.0</specification-version>
@@ -87,6 +115,49 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.modules.cloud.common</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.29</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.db</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.85</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.57</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.project.dependency</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <implementation-version/>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.87</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.server</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -121,6 +192,14 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.openide.filesystems</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>9.28</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.openide.loaders</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -145,6 +224,33 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.libs.git</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.51</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.versioning</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.64</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.103.0.9</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.openide.util</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -180,31 +286,6 @@
<code-name-base>slf4j.api</code-name-base>
<run-dependency/>
</dependency>
- <dependency>
- <code-name-base>org.apache.commons.lang3</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>1.10</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.openide.filesystems</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <specification-version>9.28</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.modules.db</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.85</specification-version>
- </run-dependency>
- </dependency>
</module-dependencies>
<test-dependencies>
<test-type>
@@ -220,8 +301,7 @@
</test-dependency>
</test-type>
</test-dependencies>
- <public-packages>
- </public-packages>
+ <public-packages/>
<class-path-extension>
<runtime-relative-path>ext/jersey-apache-connector-2.34.jar</runtime-relative-path>
<binary-origin>external/jersey-apache-connector-2.34.jar</binary-origin>
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIManager.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIManager.java
index f7648dd..2f0a6fe 100644
--- a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIManager.java
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCIManager.java
@@ -77,6 +77,10 @@
Exceptions.printStackTrace(ex);
}
}
+
+ public boolean isValid() {
+ return configProvider != null;
+ }
public static synchronized OCIManager getDefault() {
if (instance == null) {
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/AuditCache.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/AuditCache.java
new file mode 100644
index 0000000..d8be7c4
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/AuditCache.java
@@ -0,0 +1,233 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.openide.modules.Places;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.PropertyWriter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import java.io.OutputStream;
+import java.lang.reflect.Method;
+import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Caches audit results in NB cache folder. Uses Jackson to serialize the audit summary +
+ * vulnerability items into $cache/{@link #CACHE_SUBDIR}/sXX/{@link #FILE_REPORT} files.
+ * Knowledge base IDs are mapped to segments using segments file to prevent issues with
+ * characters in OCIDs.
+ *
+ * @author sdedic
+ */
+final class AuditCache {
+ private static final Logger LOG = Logger.getLogger(AuditCache.class.getName());
+
+ private static final String FILE_REPORT = "audit-report.json"; // NOI18N
+ private static final String CACHE_SUBDIR = "oracle-cloud-adm"; // NOI18N
+ private static final String SEGMENTS_FILE = "segments"; // NOI18N
+ private static final AuditCache INSTANCE = new AuditCache();
+
+ private Properties segments = new Properties();
+ private long loadTimestamp;
+
+ private AuditCache() {
+ }
+
+ static AuditCache getInstance() {
+ return INSTANCE;
+ }
+
+ Properties loadSegments() {
+ File cacheDir = Places.getCacheSubdirectory(CACHE_SUBDIR);
+ Path segPath = cacheDir.toPath().resolve(SEGMENTS_FILE);
+ if (!Files.exists(segPath)) {
+ return segments;
+ }
+ Properties p;
+ try {
+ long ts;
+ synchronized (this) {
+ ts = Files.getLastModifiedTime(segPath).toMillis();
+ if (ts < loadTimestamp) {
+ return segments;
+ }
+ }
+ p = new Properties();
+ p.load(Files.newBufferedReader(segPath));
+ synchronized (this) {
+ if (ts > loadTimestamp) {
+ this.segments = p;
+ } else {
+ p = this.segments;
+ }
+ }
+ } catch (IOException ex) {
+ LOG.log(Level.SEVERE, "Could not load segment properties", ex);
+ p = this.segments;
+ }
+ return p;
+ }
+
+
+ static class ExplicitlySetFilter extends SimpleBeanPropertyFilter {
+ private static final Method NO_METHOD;
+
+ private Map<Class, Method> explicitlySetMethods = new HashMap<>();
+
+ static {
+ try {
+ NO_METHOD = ExplicitlySetFilter.class.getDeclaredMethod("isExplicitlySet", Object.class, String.class);
+ } catch (ReflectiveOperationException ex) {
+ throw new IllegalStateException(ex);
+ }
+ }
+
+ private boolean isExplicitlySet(Object v, String name) {
+ if (v == null) {
+ return true;
+ }
+ Method m = explicitlySetMethods.get(v.getClass());
+ if (m == null) {
+ try {
+ m = v.getClass().getMethod("get__explicitlySet__");
+ m.setAccessible(true);
+ } catch (ReflectiveOperationException ex) {
+ m = NO_METHOD;
+ }
+ explicitlySetMethods.put(v.getClass(), m);
+ }
+ if (m == NO_METHOD) {
+ return true;
+ }
+ try {
+ Set<String> props = (Set<String>)m.invoke(v);
+ return props == null || props.contains(name);
+ } catch (ReflectiveOperationException ex) {
+ return true;
+ }
+ }
+ @Override
+ public void serializeAsElement(Object elementValue, JsonGenerator jgen, SerializerProvider provider, PropertyWriter writer) throws Exception {
+ if (isExplicitlySet(elementValue, writer.getName())) {
+ super.serializeAsElement(elementValue, jgen, provider, writer);
+ }
+ }
+
+ @Override
+ public void serializeAsField(Object pojo, JsonGenerator jgen, SerializerProvider provider, PropertyWriter writer) throws Exception {
+ if (isExplicitlySet(pojo, writer.getName())) {
+ super.serializeAsField(pojo, jgen, provider, writer);
+ }
+ }
+ }
+ public VulnerabilityReport cacheAuditResults(VulnerabilityReport report) throws IOException {
+ Properties segments = loadSegments();
+ String k = "knowledge.segment." + report.summary.getKnowledgeBaseId();
+ String segName = segments.getProperty(k);
+
+ if (segName == null) {
+ int segNo = 1;
+ IOException saveException = null;
+
+ for (int attempts = 0; attempts < 5; attempts++) {
+ while (segments.get("s" + segNo) != null) {
+ segNo++;
+ }
+ String sN = "s" + segNo;
+ segments.put(sN, k);
+ segments.put(k, sN);
+ File cacheDir = Places.getCacheSubdirectory(CACHE_SUBDIR);
+
+ Path dirPath = cacheDir.toPath().resolve(sN);
+ try {
+ Files.createDirectories(dirPath);
+ segName = sN;
+ break;
+ } catch (IOException ex) {
+ saveException = ex;
+ continue;
+ }
+ }
+ if (segName == null) {
+ throw saveException;
+ }
+
+ File cacheDir = Places.getCacheSubdirectory(CACHE_SUBDIR);
+ Path segPath = cacheDir.toPath().resolve(SEGMENTS_FILE);
+ try (OutputStream ostm = Files.newOutputStream(segPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
+ segments.store(ostm, null);
+ }
+ }
+
+ File cacheDir = Places.getCacheSubdirectory(CACHE_SUBDIR);
+ Path dirPath = cacheDir.toPath().resolve(segName);
+
+ Path reportData = dirPath.resolve(FILE_REPORT);
+ ObjectWriter om = new ObjectMapper()
+ .writer(new SimpleFilterProvider().addFilter("explicitlySetFilter", new ExplicitlySetFilter())); // NOI18N
+ om.writeValue(reportData.toFile(), report);
+ Path stampPath = reportData.resolveSibling("lastReadStamp"); // NOI18N
+ Files.write(stampPath, Arrays.asList(""), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+ return report;
+ }
+
+ /**
+ * Loads the cached audit for the given knowledgebase.
+ * @param knowledgeBaseId
+ * @return
+ */
+ public VulnerabilityReport loadAudit(String knowledgeBaseId) throws IOException {
+ Properties segments = loadSegments();
+ String k = "knowledge.segment." + knowledgeBaseId;
+ String segName = segments.getProperty(k);
+
+ if (segName == null) {
+ return null;
+ }
+ File cacheDir = Places.getCacheSubdirectory(CACHE_SUBDIR);
+ Path dirPath = cacheDir.toPath().resolve(segName);
+
+ Path reportData = dirPath.resolve(FILE_REPORT);
+ if (!Files.exists(reportData)) {
+ return null;
+ }
+
+ ObjectMapper om = new ObjectMapper();
+
+ VulnerabilityReport res = om.readValue(reportData.toFile(), VulnerabilityReport.class);
+
+ Path stampPath = reportData.resolveSibling("lastReadStamp");
+ Files.write(stampPath, Arrays.asList(""), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+ return res;
+ }
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/Bundle.properties b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/Bundle.properties
new file mode 100644
index 0000000..490cb46
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/Bundle.properties
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+CreateKnowledgeBaseDialog.jTextArea1.text=Creates a new Knowledge Base.
+
+CreateKnowledgeBaseDialog.jLabel1.text=Knowledge Base Name:
+CreateKnowledgeBaseDialog.jTextField1.text=
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseAction.java
new file mode 100644
index 0000000..b8755c3
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseAction.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import com.oracle.bmc.adm.ApplicationDependencyManagementClient;
+import com.oracle.bmc.adm.model.CreateKnowledgeBaseDetails;
+import com.oracle.bmc.adm.requests.CreateKnowledgeBaseRequest;
+import com.oracle.bmc.adm.responses.CreateKnowledgeBaseResponse;
+import com.oracle.bmc.model.BmcException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Optional;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.modules.cloud.oracle.OCIManager;
+import org.netbeans.modules.cloud.oracle.compartment.CompartmentItem;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.NbBundle;
+import org.openide.util.RequestProcessor;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+@ActionID(
+ category = "Tools",
+ id = "org.netbeans.modules.cloud.oracle.adm.CreateKnowledgeBaseAction"
+)
+@ActionRegistration(
+ displayName = "#CTL_CreateKnowledgeBaseAction",
+ asynchronous = true
+)
+
+@ActionReferences(value = {
+ @ActionReference(path = "Cloud/Oracle/Compartment/Actions", position = 270)
+})
+@NbBundle.Messages({
+ "CTL_CreateKnowledgeBaseAction=Create Knowledge Base",
+ "# {0} - Knowledge Base name",
+ "MSG_CreatingKnowledgeBase=Creating Knowledge base {0}...",
+ "# {0} - Knowledge Base name",
+ "MSG_KBCreated=Knowledge Base {0} was created.",
+ "# {0} - Knowledge Base name",
+ "MSG_KBNotCreated=Creating Knowledge Base {0} failed.",
+ "MSG_KBNameIsNotFilled=You must fill in the displayed name of the knowledge base."
+
+})
+public class CreateKnowledgeBaseAction implements ActionListener {
+
+ private final CompartmentItem context;
+
+ public CreateKnowledgeBaseAction(CompartmentItem context) {
+ this.context = context;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ Optional<String> result = CreateKnowledgeBaseDialog.showDialog(context);
+ if (!result.isPresent()) {
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(Bundle.MSG_KBNameIsNotFilled()));
+ }
+ result.ifPresent((p) -> {
+ RequestProcessor.getDefault().execute(() -> {
+ ProgressHandle progressHandle = ProgressHandle.createHandle(Bundle.MSG_CreatingKnowledgeBase(p));
+ progressHandle.start();
+
+ try (ApplicationDependencyManagementClient client
+ = new ApplicationDependencyManagementClient(OCIManager.getDefault().getConfigProvider())) {
+
+ CreateKnowledgeBaseDetails params = CreateKnowledgeBaseDetails.builder()
+ .compartmentId(context.getKey().getValue())
+ .displayName(result.get()).build();
+ CreateKnowledgeBaseRequest request = CreateKnowledgeBaseRequest.builder()
+ .createKnowledgeBaseDetails(params).build();
+ CreateKnowledgeBaseResponse response = client.createKnowledgeBase(request);
+ int resultCode = response.get__httpStatusCode__();
+ String message;
+ if (resultCode == 202) {
+ context.refresh();
+ message = Bundle.MSG_KBCreated(result.get());
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(message));
+ } else {
+ ErrorUtils.processError(response, Bundle.MSG_KBNotCreated(result.get()));
+ }
+ } catch (BmcException e) {
+ System.out.println("Proces exception");
+ ErrorUtils.processError(e, Bundle.MSG_KBNotCreated(result.get()));
+ } finally {
+ progressHandle.finish();
+ }
+
+ });
+ });
+ }
+
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseDialog.form b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseDialog.form
new file mode 100644
index 0000000..7262ac4
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseDialog.form
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+
+<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+ <AuxValues>
+ <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+ <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+ <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+ <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+ <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+ </AuxValues>
+
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="1" attributes="0">
+ <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" pref="29" max="-2" attributes="0"/>
+ <Component id="jTextField1" max="32767" attributes="0"/>
+ </Group>
+ <Component id="jTextArea1" alignment="0" max="32767" attributes="0"/>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="jTextArea1" min="-2" pref="18" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+ <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
+ <SubComponents>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/netbeans/modules/cloud/oracle/adm/Bundle.properties" key="CreateKnowledgeBaseDialog.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
+ <Component class="javax.swing.JTextField" name="jTextField1">
+ <Properties>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/netbeans/modules/cloud/oracle/adm/Bundle.properties" key="CreateKnowledgeBaseDialog.jTextField1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+ <Dimension value="[100, 27]"/>
+ </Property>
+ </Properties>
+ <Events>
+ <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jTextField1ActionPerformed"/>
+ </Events>
+ </Component>
+ <Component class="javax.swing.JTextArea" name="jTextArea1">
+ <Properties>
+ <Property name="editable" type="boolean" value="false"/>
+ <Property name="columns" type="int" value="20"/>
+ <Property name="lineWrap" type="boolean" value="true"/>
+ <Property name="rows" type="int" value="5"/>
+ <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString bundle="org/netbeans/modules/cloud/oracle/adm/Bundle.properties" key="CreateKnowledgeBaseDialog.jTextArea1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
+ </Property>
+ <Property name="autoscrolls" type="boolean" value="false"/>
+ <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
+ <Border info="null"/>
+ </Property>
+ <Property name="focusable" type="boolean" value="false"/>
+ <Property name="opaque" type="boolean" value="false"/>
+ </Properties>
+ </Component>
+ </SubComponents>
+</Form>
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseDialog.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseDialog.java
new file mode 100644
index 0000000..de62adc
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/CreateKnowledgeBaseDialog.java
@@ -0,0 +1,150 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import java.awt.Dialog;
+import java.awt.GraphicsEnvironment;
+import java.util.Optional;
+import javax.swing.JPanel;
+import org.netbeans.modules.cloud.oracle.compartment.CompartmentItem;
+import org.openide.DialogDescriptor;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+@NbBundle.Messages({
+ "CreateKB=Create Knowledge Base",
+ "KBName=Knowledge Base Name"
+})
+public class CreateKnowledgeBaseDialog extends JPanel {
+
+ private DialogDescriptor descriptor;
+
+ /**
+ * Creates new form CreateAutonomousDBDialog
+ */
+ public CreateKnowledgeBaseDialog() {
+ initComponents();
+ }
+
+ static Optional<String> showDialog(CompartmentItem compartment) {
+ if (!GraphicsEnvironment.isHeadless()) {
+ CreateKnowledgeBaseDialog dlgPanel = new CreateKnowledgeBaseDialog();
+ DialogDescriptor descriptor = new DialogDescriptor(dlgPanel, Bundle.CreateKB()); //NOI18N
+ descriptor.createNotificationLineSupport();
+ Dialog dialog = DialogDisplayer.getDefault().createDialog(descriptor);
+ dialog.setMinimumSize(dlgPanel.getPreferredSize());
+ dialog.setVisible(true);
+ if (DialogDescriptor.OK_OPTION == descriptor.getValue()) {
+ String kbName = dlgPanel.jTextField1.getText();
+ return Optional.of(kbName);
+ }
+ } else {
+ NotifyDescriptor.InputLine inp = new NotifyDescriptor.InputLine(Bundle.KBName(), Bundle.KBName());
+ Object selected = DialogDisplayer.getDefault().notify(inp);
+ if (DialogDescriptor.OK_OPTION != selected) {
+ return Optional.empty();
+ }
+ String kbName = inp.getInputText();
+
+ return Optional.of(kbName);
+ }
+ return Optional.empty();
+ }
+
+ private void showError(String msg) {
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(msg));
+ }
+
+ /**
+ * This method is called from within the constructor to initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is always
+ * regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ jLabel1 = new javax.swing.JLabel();
+ jTextField1 = new javax.swing.JTextField();
+ jTextArea1 = new javax.swing.JTextArea();
+
+ org.openide.awt.Mnemonics.setLocalizedText(jLabel1, org.openide.util.NbBundle.getMessage(CreateKnowledgeBaseDialog.class, "CreateKnowledgeBaseDialog.jLabel1.text")); // NOI18N
+
+ jTextField1.setText(org.openide.util.NbBundle.getMessage(CreateKnowledgeBaseDialog.class, "CreateKnowledgeBaseDialog.jTextField1.text")); // NOI18N
+ jTextField1.setPreferredSize(new java.awt.Dimension(100, 27));
+ jTextField1.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jTextField1ActionPerformed(evt);
+ }
+ });
+
+ jTextArea1.setEditable(false);
+ jTextArea1.setColumns(20);
+ jTextArea1.setLineWrap(true);
+ jTextArea1.setRows(5);
+ jTextArea1.setText(org.openide.util.NbBundle.getMessage(CreateKnowledgeBaseDialog.class, "CreateKnowledgeBaseDialog.jTextArea1.text")); // NOI18N
+ jTextArea1.setAutoscrolls(false);
+ jTextArea1.setBorder(null);
+ jTextArea1.setFocusable(false);
+ jTextArea1.setOpaque(false);
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(jLabel1)
+ .addGap(29, 29, 29)
+ .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(jTextArea1))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jTextArea1, javax.swing.GroupLayout.PREFERRED_SIZE, 18, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+ }// </editor-fold>//GEN-END:initComponents
+
+ private void jTextField1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextField1ActionPerformed
+ // TODO add your handling code here:
+ }//GEN-LAST:event_jTextField1ActionPerformed
+
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JTextArea jTextArea1;
+ private javax.swing.JTextField jTextField1;
+ // End of variables declaration//GEN-END:variables
+
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/DefaultKnowledgeBaseStorage.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/DefaultKnowledgeBaseStorage.java
new file mode 100644
index 0000000..b1584ef
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/DefaultKnowledgeBaseStorage.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.util.prefs.PreferenceChangeEvent;
+import java.util.prefs.PreferenceChangeListener;
+import org.openide.util.NbPreferences;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+class DefaultKnowledgeBaseStorage implements PreferenceChangeListener {
+ private static final String KEY_KNOWLEDGEBASEID = "default_knowledge_base";
+ private static final String KEY_COMPARTMENTID = "default_compartment";
+
+ private static DefaultKnowledgeBaseStorage INSTANCE;
+
+ private final PropertyChangeSupport pcs;
+ private String knowledgeBaseId;
+ private String compartmentId;
+
+ private DefaultKnowledgeBaseStorage() {
+ this.pcs = new PropertyChangeSupport(this);
+ NbPreferences.root().addPreferenceChangeListener(this);
+ knowledgeBaseId = NbPreferences.root().get(KEY_KNOWLEDGEBASEID, null);
+ compartmentId = NbPreferences.root().get(KEY_COMPARTMENTID, null);
+ }
+
+ public static DefaultKnowledgeBaseStorage getInstance() {
+ if (INSTANCE == null) {
+ synchronized(DefaultKnowledgeBaseStorage.class) {
+ if (INSTANCE == null) {
+ INSTANCE = new DefaultKnowledgeBaseStorage();
+ }
+ }
+ }
+ return INSTANCE;
+ }
+
+ public void setAsDefault(String compartmentId, String knowledgeBaseId) {
+ NbPreferences.root().put(KEY_KNOWLEDGEBASEID, knowledgeBaseId);
+ NbPreferences.root().put(KEY_COMPARTMENTID, compartmentId);
+ }
+
+ public String getDefaultKnowledgeBaseId() {
+ return NbPreferences.root().get(KEY_KNOWLEDGEBASEID, null);
+ }
+
+ public String getDefaultCompartmentId() {
+ return NbPreferences.root().get(KEY_COMPARTMENTID, null);
+ }
+
+ @Override
+ public void preferenceChange(PreferenceChangeEvent evt) {
+ if (evt.getKey().equals(KEY_KNOWLEDGEBASEID)) {
+ pcs.firePropertyChange(KEY_KNOWLEDGEBASEID, knowledgeBaseId, evt.getNewValue());
+ knowledgeBaseId = evt.getNewValue();
+ }
+
+ if (evt.getKey().equals(KEY_COMPARTMENTID)) {
+ pcs.firePropertyChange(KEY_COMPARTMENTID, compartmentId, evt.getNewValue());
+ compartmentId = evt.getNewValue();
+ }
+ }
+
+ public void addChangeListener(PropertyChangeListener pcl) {
+ pcs.addPropertyChangeListener(pcl);
+ }
+
+ public void removeChangeListener(PropertyChangeListener pcl) {
+ pcs.removePropertyChangeListener(pcl);
+ }
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ErrorUtils.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ErrorUtils.java
new file mode 100644
index 0000000..d78f8bf
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ErrorUtils.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import com.oracle.bmc.model.BmcException;
+import com.oracle.bmc.responses.BmcResponse;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+
+@NbBundle.Messages({
+ "# {0} - error code number",
+ "MSG_Error_Code=Error Code {0} - ",
+ "MSG_Error_400=Bad request",
+ "MSG_Error_401=Unauthorized",
+ "MSG_Error_404=Not Found",
+ "MSG_Error_412=Precondition failed",
+ "MSG_Error_429=Too Many Requests",
+ "MSG_Error_500=Internal Server Error",
+})
+class ErrorUtils {
+
+ private static String getErrorDescription(int code) {
+ switch (code) {
+ case 400: return Bundle.MSG_Error_400();
+ case 401: return Bundle.MSG_Error_401();
+ case 404: return Bundle.MSG_Error_404();
+ case 412: return Bundle.MSG_Error_412();
+ case 429: return Bundle.MSG_Error_429();
+ case 500: return Bundle.MSG_Error_429();
+ default: return "Unknown";
+ }
+ }
+
+ public static void processError(BmcResponse reqest, String errorMessage) {
+ StringBuilder sb = new StringBuilder(errorMessage);
+ sb.append('\n').append(Bundle.MSG_Error_Code(reqest.get__httpStatusCode__()));
+ sb.append(getErrorDescription(reqest.get__httpStatusCode__()));
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(sb.toString()));
+ }
+
+ public static void processError(BmcException exc, String errorMessage) {
+ StringBuilder sb = new StringBuilder(errorMessage);
+ sb.append('\n').append(Bundle.MSG_Error_Code(exc.getStatusCode()));
+ sb.append(getErrorDescription(exc.getStatusCode()));
+ sb.append('n').append(exc.getMessage());
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(sb.toString()));
+ }
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseItem.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseItem.java
index d33b513..b4050f8 100644
--- a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseItem.java
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseItem.java
@@ -18,22 +18,74 @@
*/
package org.netbeans.modules.cloud.oracle.adm;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
import org.netbeans.modules.cloud.oracle.items.OCID;
import org.netbeans.modules.cloud.oracle.items.OCIItem;
+import org.openide.util.Exceptions;
/**
*
* @author Jan Horvath
*/
-public class KnowledgeBaseItem extends OCIItem {
-
- public KnowledgeBaseItem(OCID id, String name) {
- super(id, name);
+public class KnowledgeBaseItem extends OCIItem implements URLProvider{
+
+ private static Map<OCID, Collection<Reference<KnowledgeBaseItem>>> itemInstances = new HashMap<>();
+
+ protected final Date timeUpdated;
+ protected final String compartmentId;
+
+ public KnowledgeBaseItem(OCID id, String compartmentId, String displayName, Date timeUpdated) {
+ super(id, displayName);
+ this.timeUpdated = timeUpdated;
+ this.compartmentId = compartmentId;
+ registerItem();
+ }
+
+ void registerItem() {
+ synchronized (KnowledgeBaseItem.class) {
+ itemInstances.computeIfAbsent(getKey(), x -> new ArrayList<>()).add(new WeakReference<>(this));
+ }
+ }
+
+ @Override
+ public URL getURL() {
+ try {
+ return new URL("https://cloud.oracle.com/adm/knowledgeBases/" + getKey().getValue());
+ } catch (MalformedURLException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ return null;
}
@Override
public int maxInProject() {
return 1;
}
-
+
+ static Collection<KnowledgeBaseItem> findKnownInstances(OCID ocid) {
+ Collection<KnowledgeBaseItem> items = new ArrayList<>();
+
+ synchronized (KnowledgeBaseItem.class) {
+ Collection<Reference<KnowledgeBaseItem>> refItems = itemInstances.get(ocid);
+ for (Iterator<Reference<KnowledgeBaseItem>> it = refItems.iterator(); it.hasNext(); ) {
+ Reference<KnowledgeBaseItem> r = it.next();
+ KnowledgeBaseItem i = r.get();
+ if (i == null) {
+ it.remove();
+ } else {
+ items.add(i);
+ }
+ }
+ }
+ return items;
+ }
}
\ No newline at end of file
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseNode.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseNode.java
index 3546421..1e2d5af 100644
--- a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseNode.java
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/KnowledgeBaseNode.java
@@ -87,8 +87,10 @@
.compartmentId(compartment.getKey().getValue()).build();
ListKnowledgeBasesResponse response = client.listKnowledgeBases(request);
List<KnowledgeBaseSummary> projects = response.getKnowledgeBaseCollection().getItems();
- return projects.stream().map(p -> new KnowledgeBaseItem(OCID.of(p.getId(), "KnowledgeBase"), // NOI18N
- p.getDisplayName())).collect(Collectors.toList());
+ return projects.stream().map(p -> new KnowledgeBaseItem(
+ OCID.of(p.getId(), "KnowledgeBase"), // NOI18N
+ p.getCompartmentId(),
+ p.getDisplayName(), p.getTimeUpdated())).collect(Collectors.toList());
}
};
}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ProjectVulnerability.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ProjectVulnerability.java
new file mode 100644
index 0000000..037d6d6
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ProjectVulnerability.java
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import com.oracle.bmc.adm.ApplicationDependencyManagementClient;
+import com.oracle.bmc.adm.model.KnowledgeBase;
+import com.oracle.bmc.adm.requests.GetKnowledgeBaseRequest;
+import com.oracle.bmc.adm.responses.GetKnowledgeBaseResponse;
+import java.util.Collection;
+import java.util.Date;
+import java.util.concurrent.CompletableFuture;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.cloud.oracle.OCIManager;
+import org.netbeans.modules.cloud.oracle.items.OCID;
+import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.openide.util.RequestProcessor;
+
+/**
+ * This is a pseudo API that allows an integration LSP module to
+ * configure and work with the vulnerability feature. Allows to temporarily configure a knowledge
+ * base for a given project. The setting is kept just in memory.
+ *
+ * @author sdedic
+ */
+@ProjectServiceProvider(service = ProjectVulnerability.class, projectTypes = {
+ @ProjectType(id = "org-netbeans-modules-maven"),
+ @ProjectType(id = "org.netbeans.modules-gradle")
+})
+public final class ProjectVulnerability {
+ private final RequestProcessor AUDIT_PROCESSOR = new RequestProcessor(ProjectVulnerability.class);
+ private final RequestProcessor CALL_PROCESSOR = new RequestProcessor(ProjectVulnerability.class);
+
+ private final Project project;
+
+ // @GuardedBy(this)
+ private KnowledgeBaseItem knowledgeBaseItem = null;
+
+ public ProjectVulnerability(Project project) {
+ this.project = project;
+ }
+
+ public KnowledgeBaseItem getProjectKnowledgeBase() {
+ synchronized (this) {
+ return knowledgeBaseItem;
+ }
+ }
+
+ public CompletableFuture<Void> runProjectAudit(KnowledgeBaseItem item, boolean force) {
+ if (item != null) {
+ setProjectKnowledgeBase(item);
+ }
+ CompletableFuture<Void> result = new CompletableFuture<>();
+ AUDIT_PROCESSOR.post(() -> {
+ try {
+ VulnerabilityWorker.getInstance().findVulnerability(project, force);
+ result.complete(null);
+ } catch (ThreadDeath x) {
+ throw x;
+ } catch (Exception | Error e) {
+ result.completeExceptionally(e);
+ }
+ });
+ // PENDING: handle CF.cancel() by cancelling the WorkRequest
+ return result;
+ }
+
+ public CompletableFuture<KnowledgeBaseItem> findKnowledgeBase(String compartmentId, String knowledgeBaseId) {
+ CompletableFuture<KnowledgeBaseItem> result = new CompletableFuture<>();
+ CALL_PROCESSOR.post(() -> {
+ try ( ApplicationDependencyManagementClient client
+ = new ApplicationDependencyManagementClient(OCIManager.getDefault().getConfigProvider())) {
+
+ GetKnowledgeBaseRequest request = GetKnowledgeBaseRequest.builder()
+ .knowledgeBaseId(knowledgeBaseId).
+ build();
+
+ GetKnowledgeBaseResponse response = client.getKnowledgeBase(request);
+ KnowledgeBase p = response.getKnowledgeBase();
+ result.complete(new KnowledgeBaseItemProxy(
+ OCID.of(p.getId(), "KnowledgeBase"), // NOI18N
+ p.getCompartmentId(),
+ p.getDisplayName(), p.getTimeUpdated())
+ );
+ } catch (ThreadDeath x) {
+ throw x;
+ } catch (Exception | Error e) {
+ result.completeExceptionally(e);
+ }
+ });
+ return result;
+ }
+
+
+ /**
+ * This special item just fires a refresh in any "real" KnowledgeBaseItems that may have been created
+ * + presented in the IDE UI.
+ */
+ static class KnowledgeBaseItemProxy extends KnowledgeBaseItem {
+ public KnowledgeBaseItemProxy(OCID id, String compartmentId, String displayName, Date timeUpdated) {
+ super(id, compartmentId, displayName, timeUpdated);
+ }
+
+ @Override
+ void registerItem() {
+ // do not register self.
+ }
+
+ @Override
+ public void refresh() {
+ super.refresh();
+ Collection<KnowledgeBaseItem> delegates = findKnownInstances(getKey());
+ for (KnowledgeBaseItem kbi : delegates) {
+ kbi.refresh();
+ }
+ }
+ }
+
+ public KnowledgeBaseItem setProjectKnowledgeBase(KnowledgeBaseItem item) {
+ synchronized (this) {
+ return knowledgeBaseItem = item;
+ }
+ }
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java
new file mode 100644
index 0000000..b33f2b2
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/RunFileADMAction.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Optional;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.cloud.oracle.OCIManager;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionRegistration;
+import org.openide.filesystems.FileObject;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+
+@ActionID(
+ category = "Tools",
+ id = "org.netbeans.modules.cloud.oracle.adm.RunFileADMAction"
+)
+@ActionRegistration(
+ displayName = "#CTL_RunFileAudit",
+ asynchronous = true
+)
+
+@ActionReferences(value = {
+ @ActionReference(position = 251, path = "Loaders/text/x-maven-pom+xml/Actions"),
+ @ActionReference(position = 1800, path = "Projects/org-netbeans-modules-maven/Actions")
+})
+
+@NbBundle.Messages({
+ "CTL_RunFileAudit=Vulnerability Audit",})
+public class RunFileADMAction implements ActionListener{
+
+ private final FileObject file;
+
+ public RunFileADMAction(FileObject file) {
+ this.file = file;
+ }
+
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ Project project = FileOwnerQuery.getOwner(file);
+ System.out.println("Running adm action:");
+ System.out.println(" Project: " + project.toString());
+ System.out.println(" File: " + file.getPath());
+// CloudResourcesStorage storage = project.getLookup().lookup(CloudResourcesStorage.class);
+ KnowledgeBaseItem kbItem = VulnerabilityWorker.getKnowledgeBaseForProject(project);
+ if (kbItem != null) {
+ VulnerabilityWorker.getInstance().findVulnerability(project, true);
+ } else {
+ System.out.println("!!!!!! KnowledgeBase neni");
+ if (OCIManager.getDefault().getConfigProvider() == null
+ || OCIManager.getDefault().getTenancy().equals(Optional.empty())) {
+ String message = "Project Audits in GraalVM Ext Pack performs check for "
+ + "vulnerable dependencies using Vulnerabilities knowledgebase in Oracle OCI. "
+ + "If you want to learn more and setup OCI account, go to https://www.oracle.com/cloud/free/ .";
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(message));
+ } else {
+ String message = "No Knowlege Base assigned for " + ProjectUtils.getInformation(project).getDisplayName()
+ + ".\n Select or create in Cloud Explorer a Knowledge Base, where to run Vulnerability Audit for this project.";
+ DialogDisplayer.getDefault().notifyLater(new NotifyDescriptor.Message(message));
+ }
+ System.out.println("Config provider: " + OCIManager.getDefault().getConfigProvider());
+ System.out.println("Tenancy: " + OCIManager.getDefault().getTenancy());
+ }
+ }
+
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ShowInBrowserAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ShowInBrowserAction.java
new file mode 100644
index 0000000..6dd876d
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/ShowInBrowserAction.java
@@ -0,0 +1,70 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.URL;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.awt.ActionRegistration;
+import org.openide.awt.HtmlBrowser.URLDisplayer;
+import org.openide.util.NbBundle;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+@ActionID(
+ category = "Tools",
+ id = "org.netbeans.modules.cloud.oracle.adm.ShowInBrowserAction"
+)
+@ActionRegistration(
+ displayName = "#CTL_ShowInBrowserAction",
+ asynchronous = true
+)
+
+@ActionReferences(value = {
+ @ActionReference(path = "Cloud/Oracle/KnowledgeBase/Actions", position = 260),
+ @ActionReference(path = "Cloud/Oracle/Vulnerability/Actions", position = 260),
+ @ActionReference(path = "Cloud/Oracle/VulnerabilityAudit/Actions", position = 260),
+})
+
+@NbBundle.Messages({
+ "CTL_ShowInBrowserAction=Show in Browser",})
+public class ShowInBrowserAction implements ActionListener {
+
+
+ private final URLProvider urlProvider;
+
+ public ShowInBrowserAction(URLProvider provider) {
+ this.urlProvider = provider;
+ }
+
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ URL url = urlProvider.getURL();
+ if (url != null) {
+ URLDisplayer.getDefault().showURL(urlProvider.getURL());
+ }
+ }
+
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/URLProvider.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/URLProvider.java
new file mode 100644
index 0000000..bb6d5c4
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/URLProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import java.net.URL;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+public interface URLProvider {
+
+ public URL getURL();
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityReport.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityReport.java
new file mode 100644
index 0000000..75d3a27
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityReport.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import com.oracle.bmc.adm.model.ApplicationDependencyVulnerabilitySummary;
+import com.oracle.bmc.adm.model.VulnerabilityAuditSummary;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Holder that just glues necessary data together. Contains summary, list of vulnerabilities
+ * and an initial mapping to project files.
+ *
+ * @author sdedic
+ */
+final class VulnerabilityReport {
+ public VulnerabilityAuditSummary summary;
+ public List<ApplicationDependencyVulnerabilitySummary> items;
+
+ /**
+ * For some vulnerabilities, the source could not be found, still we want to display them. But
+ * vulnerabilities that have been successfully mapped, but THEN 'disappeared' from the dependency
+ * report should be either removed or reported as 'info' only: the user may have edited the
+ * file, altered the artifact specs, so the report does not apply.
+ */
+ public Set<String> mappedVulnerabilities;
+
+ public VulnerabilityReport() {
+ }
+
+ VulnerabilityReport(VulnerabilityAuditSummary summary, List<ApplicationDependencyVulnerabilitySummary> items) {
+ this.summary = summary;
+ this.items = items;
+ this.mappedVulnerabilities = mappedVulnerabilities;
+ }
+
+ public VulnerabilityAuditSummary getSummary() {
+ return summary;
+ }
+
+ public void setSummary(VulnerabilityAuditSummary summary) {
+ this.summary = summary;
+ }
+
+ public List<ApplicationDependencyVulnerabilitySummary> getItems() {
+ return items;
+ }
+
+ public void setItems(List<ApplicationDependencyVulnerabilitySummary> items) {
+ this.items = items;
+ }
+
+ public Set<String> getMappedVulnerabilities() {
+ return mappedVulnerabilities;
+ }
+
+ public void setMappedVulnerabilities(Set<String> mappedVulnerabilities) {
+ this.mappedVulnerabilities = mappedVulnerabilities;
+ }
+}
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityWorker.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityWorker.java
new file mode 100644
index 0000000..e8de38a
--- /dev/null
+++ b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/adm/VulnerabilityWorker.java
@@ -0,0 +1,610 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.cloud.oracle.adm;
+
+import com.oracle.bmc.adm.ApplicationDependencyManagementClient;
+import com.oracle.bmc.adm.model.ApplicationDependency;
+import com.oracle.bmc.adm.model.ApplicationDependencyVulnerabilitySummary;
+import com.oracle.bmc.adm.model.CreateVulnerabilityAuditDetails;
+import com.oracle.bmc.adm.model.SortOrder;
+import com.oracle.bmc.adm.model.Vulnerability;
+import com.oracle.bmc.adm.model.VulnerabilityAudit;
+import com.oracle.bmc.adm.model.VulnerabilityAudit.LifecycleState;
+import com.oracle.bmc.adm.model.VulnerabilityAuditConfiguration;
+import com.oracle.bmc.adm.model.VulnerabilityAuditSummary;
+import com.oracle.bmc.adm.requests.CreateVulnerabilityAuditRequest;
+import com.oracle.bmc.adm.requests.ListApplicationDependencyVulnerabilitiesRequest;
+import com.oracle.bmc.adm.requests.ListVulnerabilityAuditsRequest;
+import com.oracle.bmc.adm.responses.CreateVulnerabilityAuditResponse;
+import com.oracle.bmc.adm.responses.ListApplicationDependencyVulnerabilitiesResponse;
+import com.oracle.bmc.adm.responses.ListVulnerabilityAuditsResponse;
+import com.oracle.bmc.model.BmcException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import org.netbeans.api.editor.mimelookup.MimeRegistration;
+import org.netbeans.api.lsp.Diagnostic;
+import org.netbeans.api.progress.ProgressHandle;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.cloud.oracle.OCIManager;
+import org.netbeans.modules.project.dependency.ArtifactSpec;
+import org.netbeans.modules.project.dependency.Dependency;
+import org.netbeans.modules.project.dependency.DependencyResult;
+import org.netbeans.modules.project.dependency.ProjectDependencies;
+import org.netbeans.modules.project.dependency.Scopes;
+import org.netbeans.modules.project.dependency.SourceLocation;
+import org.netbeans.spi.lsp.ErrorProvider;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.filesystems.FileObject;
+import org.openide.util.Exceptions;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.util.RequestProcessor;
+
+/**
+ *
+ * @author Petr Pisl
+ */
+@NbBundle.Messages({
+ "# {0} - project name",
+ "MSG_Audit_Pass=Vulnerability audit for project {0} is done.\nNo vulnerability was found.",
+ "# {0} - project name",
+ "MSG_Audit_Failed_One=Vulnerability audit for project {0} is done.\nOne vulnerability was found.\nThe vulnerability is listed in Problems window.",
+ "# {0} - project name",
+ "# {1} - number of vulnerabilities",
+ "MSG_Audit_Failed_More=Vulnerability audit for project {0} is done.\n{1} vulnerabilities were found.\nThe vulnerabilities are listed in Problems window.",
+ "# {0} - project name",
+ "MSG_CreatingAuditFailed=Creating Vulnerablity audit for project {0} failed.",
+ "# {0} - project name",
+ "MSG_ListingAuditFailed=Obtaining newly created vulnerablity audit for project {0} failed.",
+ "MSG_ListingVulnerabilitiesFailed=Obtaining vulnerabilities for newly created audit failed.",
+ "# {0} - project name",
+ "MSG_AuditIsRunning=Audit of {0} project is running ...",
+ "MSG_NotAvailable=Not available",
+ "MSG_Diagnostic=Vulnerability\n"
+ + " Cvss V2 Score: %s\n"
+ + " Cvss V3 Score: %s\n"
+ + " Caused by dependence: %s"
+})
+
+@MimeRegistration(mimeType = "text/x-maven-pom+xml", service = ErrorProvider.class)
+public class VulnerabilityWorker implements ErrorProvider{
+ private static final RequestProcessor SOURCE_REFRESH_PROCESSOR = new RequestProcessor(VulnerabilityWorker.class.getName());
+
+ private static final Logger LOG = Logger.getLogger(VulnerabilityWorker.class.getName());
+
+ // PENDING: should be customizable from project configuration somehow.
+ private static final String GOV_DETAIL_URL = "https://nvd.nist.gov/vuln/detail/";
+
+ // @GuardedBy(self)
+ private static final HashMap<Project, CacheItem> cache = new HashMap();
+
+ // @GuardedBy(class)
+ private static VulnerabilityWorker instance;
+
+ /**
+ * Cached information + watcher over the project file data. Will watch for dependency change event,
+ * that is fired e.g. after project reload, and will REPLACE ITSELF in the cache + fire
+ * event that causes LSP to re-evaluate errors for the affected project file(s).
+ */
+ static class CacheItem {
+ private final Project project;
+ private final DependencyResult dependencyResult;
+ private final VulnerabilityReport report;
+
+ /**
+ * Maps GAV -> dependency.
+ */
+ private Map<String, Dependency> dependencyMap;
+
+ // @GuardedBy(this)
+ private ChangeListener depChange;
+
+ // @GuardedBy(this)
+ private RequestProcessor.Task pendingRefresh;
+
+ public CacheItem(Project project, DependencyResult dependency, VulnerabilityReport report) {
+ this.project = project;
+ this.dependencyResult = dependency;
+ this.report = report;
+ }
+
+ public DependencyResult getDependency() {
+ return dependencyResult;
+ }
+
+ public VulnerabilityAuditSummary getAudit() {
+ return report.summary;
+ }
+
+ public List<ApplicationDependencyVulnerabilitySummary> getVulnerabilities() {
+ return report.items;
+ }
+
+ public Map<String, Dependency> getDependencyMap() {
+ if (dependencyMap == null) {
+ dependencyMap = new HashMap();
+ buildDependecyMap(dependencyResult.getRoot(), dependencyMap);
+ }
+ return dependencyMap;
+ }
+
+ private void buildDependecyMap(Dependency dependency, Map<String, Dependency> result) {
+ String gav = createGAV(dependency.getArtifact());
+ result.put(gav, dependency);
+ dependency.getChildren().forEach((childDependency) -> {
+ buildDependecyMap(childDependency, result);
+ });
+ }
+
+ public Set<FileObject> getProblematicFiles() {
+ if (getAudit().getIsSuccess()) {
+ return Collections.EMPTY_SET;
+ }
+ Set<FileObject> result = new HashSet();
+ for (ApplicationDependencyVulnerabilitySummary v: getVulnerabilities()){
+ List<Vulnerability> vulnerabilities = v.getVulnerabilities();
+ if (!vulnerabilities.isEmpty()) {
+ Dependency dep = getDependencyMap().get(v.getGav());
+ if (dep != null) {
+ try {
+ SourceLocation declarationRange = this.dependencyResult.getDeclarationRange(dep, null);
+ if (declarationRange == null) {
+ declarationRange = this.dependencyResult.getDeclarationRange(dep, DependencyResult.PART_CONTAINER);
+ }
+ if(declarationRange != null && declarationRange.getFile() != null) {
+ result.add(declarationRange.getFile());
+ }
+ } catch (IOException ex) {
+ // expected, ignore.
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ void refreshDependencies(RequestProcessor.Task t) {
+ DependencyResult dr = ProjectDependencies.findDependencies(project, ProjectDependencies.newQuery(Scopes.RUNTIME));
+ LOG.log(Level.FINER, "{0} - dependencies refreshed", this);
+ synchronized (this) {
+ if (pendingRefresh != t) {
+ return;
+ }
+ }
+ synchronized (this) {
+ if (depChange != null) {
+ dependencyResult.removeChangeListener(depChange);
+ }
+ }
+ CacheItem novy = new CacheItem( project, dr, report);
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.log(Level.FINER, "{0} - trying to replace for {1}", new Object[] { this, novy });
+ }
+ if (replaceCacheItem(this, novy)) {
+ novy.startListening();
+ Diagnostic.ReporterControl reporter = Diagnostic.findReporterControl(Lookup.getDefault(), project.getProjectDirectory());
+ Set<FileObject> allFiles = new HashSet<>();
+ allFiles.addAll(getProblematicFiles());
+ allFiles.addAll(novy.getProblematicFiles());
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.log(Level.FINER, "{0} - refreshing files: {1}", new Object[] { this, allFiles });
+ }
+ reporter.diagnosticChanged(novy.getProblematicFiles(), null);
+ }
+ }
+
+ void scheduleDependencyRefresh(ChangeEvent e) {
+ synchronized (this) {
+ if (pendingRefresh != null) {
+ pendingRefresh.cancel();
+ }
+
+ RequestProcessor.Task[] task = new RequestProcessor.Task[1];
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.log(Level.FINER, "{0} - scheduling refresh for {1}", new Object[] { this, project });
+ }
+ pendingRefresh = task[0] = SOURCE_REFRESH_PROCESSOR.post(() -> {
+ synchronized (this) {
+ refreshDependencies(task[0]);
+ }
+ });
+ }
+ }
+
+ SourceLocation getDependencyRange(Dependency d) throws IOException {
+ return getDependencyRange(d, null);
+ }
+
+ void startListening() {
+ synchronized (this) {
+ if (depChange == null) {
+ dependencyResult.addChangeListener(depChange = this::scheduleDependencyRefresh);
+ LOG.log(Level.FINER, "{0} - start listen for dependencies", this);
+ }
+ }
+ }
+
+ SourceLocation getDependencyRange(Dependency d, String part) throws IOException {
+ startListening();
+ return dependencyResult.getDeclarationRange(d, part);
+ }
+
+ public List<Diagnostic> getDiagnosticsForFile(FileObject file) {
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.log(Level.FINER, "{0} getDiagnostics called for {1}", new Object[] { this, file });
+ }
+ if (getVulnerabilities() == null || getVulnerabilities().isEmpty()) {
+ return null;
+ }
+
+ List<Diagnostic> result = new ArrayList();
+ for (ApplicationDependencyVulnerabilitySummary v: getVulnerabilities()){
+ List<Vulnerability> vulnerabilities = v.getVulnerabilities();
+ if (!vulnerabilities.isEmpty()) {
+ startListening();
+ Dependency dependency = getDependencyMap().get(v.getGav());
+ SourceLocation declarationRange = null;
+
+ if (dependency != null) {
+ try {
+ declarationRange = getDependencyRange(dependency);
+ } catch (IOException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ // display the vulnerabilities that were never mapped on the dependency container's line.
+ // also display the vulnerabilities that we KNOW about, but do can not map them back to the project file, i.e.
+ // plugin-introduced dependencies (gradle).
+ if (declarationRange == null && (dependency != null || !report.mappedVulnerabilities.contains(v.getGav()))) {
+ try {
+ if (LOG.isLoggable(Level.FINER)) {
+ LOG.log(Level.FINER, "{0} getDiagnostics called for {1}", new Object[] { this, file });
+ }
+
+ declarationRange = getDependencyRange(dependency, DependencyResult.PART_CONTAINER);
+ if (declarationRange != null) {
+ // discard end location, since it could span a whole section
+ declarationRange = new SourceLocation(declarationRange.getFile(),
+ declarationRange.getStartOffset(), declarationRange.getStartOffset(), null);
+ }
+ } catch (IOException ex) {
+ // ignore
+ }
+ }
+
+ if (declarationRange != null && declarationRange.hasPosition() && declarationRange.getFile().equals(file)) {
+ final SourceLocation fDeclarationRange = declarationRange;
+ for(Vulnerability vulnerability: vulnerabilities) {
+ String message = String.format(Bundle.MSG_Diagnostic(),
+ formatCvssScore(vulnerability.getCvssV2Score()),
+ formatCvssScore(vulnerability.getCvssV3Score()),
+ createGAV(dependency.getArtifact()));
+ Diagnostic.Builder builder = Diagnostic.Builder.create(() -> fDeclarationRange.getStartOffset(), () -> fDeclarationRange.getEndOffset(), message);
+ builder.setSeverity(Diagnostic.Severity.Warning).setCode(vulnerability.getId());
+ try {
+ builder.setCodeDescription(new URL(GOV_DETAIL_URL + vulnerability.getId()));
+ } catch (MalformedURLException ex) {
+ // perhaps should not happen at all
+ LOG.log(Level.INFO, "Could not link to vulnerability: {0}", vulnerability.getId());
+ }
+ result.add(builder.build());
+ }
+ }
+ }
+ }
+ return result;
+ }
+
+ private String formatCvssScore(Float value) {
+ if (value != null) {
+ return String.format("%.2f", value);
+ }
+ return Bundle.MSG_NotAvailable();
+ }
+ }
+
+ private static boolean replaceCacheItem(CacheItem old, CacheItem novy) {
+ synchronized (cache) {
+ CacheItem registered = cache.get(old.project);
+ if (registered != old) {
+ return false;
+ }
+ cache.put(novy.project, novy);
+ }
+ return true;
+ }
+
+ private VulnerabilityWorker() {
+ }
+
+ public static VulnerabilityWorker getInstance() {
+ synchronized (VulnerabilityWorker.class) {
+ if (instance == null) {
+ instance = new VulnerabilityWorker();
+
+ }
+ }
+ return instance;
+ }
+
+ public void findVulnerability(Project project, boolean forceAudit) {
+ LOG.log(Level.FINER, "Trying to obtain audit for project {0}, force:{1}", new Object[] { project, forceAudit });
+ final String projectDisplayName = ProjectUtils.getInformation(project).getDisplayName();
+ KnowledgeBaseItem kbItem = getKnowledgeBaseForProject(project);
+ if (kbItem == null) {
+ return;
+ }
+
+ // remove from the cache old values
+ ProgressHandle progressHandle = ProgressHandle.createHandle(Bundle.MSG_AuditIsRunning(projectDisplayName));
+ progressHandle.start();
+ try {
+ doFindVulnerability(project, kbItem.compartmentId, kbItem.getKey().getValue(),
+ projectDisplayName, progressHandle, forceAudit);
+ } finally {
+ progressHandle.finish();
+ kbItem.refresh();
+ }
+ }
+
+ public void doFindVulnerability(Project project, String compartmentId, String knowledgeBaseId, String projectDisplayName,
+ ProgressHandle progressHandle, boolean forceAudit) {
+ DependencyResult dr = ProjectDependencies.findDependencies(project, ProjectDependencies.newQuery(Scopes.RUNTIME));
+ List<ApplicationDependency> result = new ArrayList();
+ convert(dr.getRoot(), 0, result);
+
+ CacheItem cacheItem;
+ VulnerabilityReport savedAudit = null;
+
+ if (!forceAudit) {
+ try {
+ savedAudit = AuditCache.getInstance().loadAudit(knowledgeBaseId);
+ if (savedAudit != null) {
+ cacheItem = new CacheItem(project, dr, savedAudit);
+ }
+ } catch (IOException ex) {
+ LOG.log(Level.WARNING, "Could not load cached audit data", ex);
+ }
+ }
+
+ boolean auditDone = false;
+
+ if (!forceAudit && savedAudit == null) {
+ // attempt to find an active most recent audit:
+ try (ApplicationDependencyManagementClient admClient
+ = new ApplicationDependencyManagementClient(OCIManager.getDefault().getConfigProvider())) {
+ ListVulnerabilityAuditsRequest request = ListVulnerabilityAuditsRequest
+ .builder()
+ .compartmentId(compartmentId)
+ .knowledgeBaseId(knowledgeBaseId)
+ .lifecycleState(LifecycleState.Active)
+ .sortBy(ListVulnerabilityAuditsRequest.SortBy.TimeCreated)
+ .sortOrder(SortOrder.Desc).build();
+ ListVulnerabilityAuditsResponse response = admClient.listVulnerabilityAudits(request);
+ if (!response.getVulnerabilityAuditCollection().getItems().isEmpty()) {
+ VulnerabilityAuditSummary summary = response.getVulnerabilityAuditCollection().getItems().get(0);
+ cacheItem = fetchVulnerabilityItems(project, admClient, dr, summary, projectDisplayName);
+ }
+ } catch (BmcException ex) {
+ LOG.log(Level.FINE, "Unable to list newest audit for knowledgebase {0}, compartment {1}", new Object[] {
+ knowledgeBaseId, compartmentId
+ });
+ }
+ }
+
+ if (savedAudit == null) {
+ try (ApplicationDependencyManagementClient admClient
+ = new ApplicationDependencyManagementClient(OCIManager.getDefault().getConfigProvider())) {
+ final VulnerabilityAuditConfiguration auditConfiguration = VulnerabilityAuditConfiguration
+ .builder()
+ .maxPermissibleCvssV2Score(1f)
+ .maxPermissibleCvssV3Score(1f)
+ .exclusions(Collections.unmodifiableList(Collections.EMPTY_LIST))
+ .build();
+ final CreateVulnerabilityAuditDetails auditDetails = CreateVulnerabilityAuditDetails
+ .builder()
+ .compartmentId(compartmentId)
+ .knowledgeBaseId(knowledgeBaseId)
+ .displayName(projectDisplayName)
+ .buildType(VulnerabilityAudit.BuildType.Maven)
+ .configuration(auditConfiguration)
+ .applicationDependencies(result)
+ .build();
+ CreateVulnerabilityAuditResponse response = admClient.createVulnerabilityAudit(CreateVulnerabilityAuditRequest
+ .builder()
+ .createVulnerabilityAuditDetails(auditDetails)
+ .build());
+ if (response.get__httpStatusCode__() != 201 && response.get__httpStatusCode__() != 200) {
+ ErrorUtils.processError(response, Bundle.MSG_CreatingAuditFailed(projectDisplayName));
+ return;
+ }
+ // audit is ok
+ cacheItem = waitToAuditFinish(project, admClient, dr, response.getVulnerabilityAudit(), projectDisplayName);
+ auditDone = true;
+ } catch (BmcException exc) {
+ ErrorUtils.processError(exc, compartmentId);
+ return;
+ } finally {
+ progressHandle.finish();
+ }
+ } else {
+ cacheItem = new CacheItem(project, dr, savedAudit);
+ }
+
+ if (cacheItem != null) {
+ synchronized (cache) {
+ cache.put(project, cacheItem);
+ }
+
+ Set<FileObject> problematicFiles = new HashSet();
+ problematicFiles.addAll(cacheItem.getProblematicFiles());
+
+ String message;
+ if (cacheItem.getAudit().getIsSuccess()) {
+ message = Bundle.MSG_Audit_Pass(projectDisplayName);
+ problematicFiles.addAll(dr.getDependencyFiles());
+ } else if(cacheItem.getAudit().getVulnerableArtifactsCount() == 1) {
+ message = Bundle.MSG_Audit_Failed_One(projectDisplayName);
+ } else {
+ message = Bundle.MSG_Audit_Failed_More(projectDisplayName, cacheItem.getAudit().getVulnerableArtifactsCount());
+ }
+ if (auditDone) {
+ DialogDisplayer.getDefault().notifyLater(
+ new NotifyDescriptor.Message(message));
+ }
+ Diagnostic.ReporterControl reporter = Diagnostic.findReporterControl(Lookup.getDefault(), project.getProjectDirectory());
+ reporter.diagnosticChanged(problematicFiles, null);
+ }
+ }
+
+ public static KnowledgeBaseItem getKnowledgeBaseForProject(Project project) {
+ ProjectVulnerability vs = project.getLookup().lookup(ProjectVulnerability.class);
+ return vs != null ? vs.getProjectKnowledgeBase() : null;
+ }
+
+ private int convert(Dependency dependency, int counter, List<ApplicationDependency> result) {
+ ApplicationDependency.Builder builder = ApplicationDependency.builder();
+ builder.gav(createGAV(dependency.getArtifact()));
+ List<String> childrenNodeIds = new ArrayList(dependency.getChildren().size());
+ for (Dependency childDependency : dependency.getChildren()) {
+ counter = convert(childDependency, counter, result);
+ childrenNodeIds.add(Integer.toString(counter));
+ }
+ builder.applicationDependencyNodeIds(childrenNodeIds);
+ builder.nodeId(Integer.toString(++counter));
+ result.add(builder.build());
+ return counter;
+ }
+
+ private static String createGAV(ArtifactSpec artifact) {
+ StringBuffer sb = new StringBuffer();
+ sb.append(artifact.getGroupId()).append(':');
+ sb.append(artifact.getArtifactId()).append(':');
+ sb.append(artifact.getVersionSpec());
+ return sb.toString();
+ }
+
+ private CacheItem waitToAuditFinish(Project project, ApplicationDependencyManagementClient client,
+ DependencyResult dr, VulnerabilityAudit audit, String projectName) {
+ ListVulnerabilityAuditsRequest request = ListVulnerabilityAuditsRequest.builder()
+ .knowledgeBaseId(audit.getKnowledgeBaseId()).id(audit.getId()).build();
+ VulnerabilityAuditSummary auditSummary;
+ boolean first = true;
+ do {
+ if (first) {
+ first = false;
+ } else {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ex) {
+ Exceptions.printStackTrace(ex);
+ }
+ }
+ ListVulnerabilityAuditsResponse response = client.listVulnerabilityAudits(request);
+ if (response.get__httpStatusCode__() != 200) {
+ ErrorUtils.processError(response, Bundle.MSG_ListingAuditFailed(projectName));
+ return null;
+ }
+ List<VulnerabilityAuditSummary> items = response.getVulnerabilityAuditCollection().getItems();
+ auditSummary = items.get(0);
+ } while (auditSummary.getLifecycleState() == VulnerabilityAudit.LifecycleState.Creating);
+ return fetchVulnerabilityItems(project, client, dr, auditSummary, projectName);
+ }
+
+ private CacheItem fetchVulnerabilityItems(Project project, ApplicationDependencyManagementClient client,
+ DependencyResult dr, VulnerabilityAuditSummary auditSummary, String projectName) {
+ List<ApplicationDependencyVulnerabilitySummary> items = new ArrayList<>();
+ if (auditSummary.getVulnerableArtifactsCount() > 0) {
+ String nextPage = null;
+ do {
+ ListApplicationDependencyVulnerabilitiesRequest.Builder b = ListApplicationDependencyVulnerabilitiesRequest.builder().vulnerabilityAuditId(auditSummary.getId());
+ if (nextPage != null) {
+ b.page(nextPage);
+ }
+ ListApplicationDependencyVulnerabilitiesRequest advRequest = b.build();
+ ListApplicationDependencyVulnerabilitiesResponse vulners = client.listApplicationDependencyVulnerabilities(advRequest);
+ if (vulners.get__httpStatusCode__() == 200) {
+ vulners.getApplicationDependencyVulnerabilityCollection().getItems().stream().filter(v -> !v.getVulnerabilities().isEmpty())
+ .forEach(v -> items.add(v));
+ } else {
+ ErrorUtils.processError(vulners, Bundle.MSG_ListingVulnerabilitiesFailed());
+ return null;
+ }
+ nextPage = vulners.getOpcNextPage();
+ } while (nextPage != null);
+ }
+ // Make an initial scan for the dependency locations in the Dependency report.
+ Set<String> mapped = new HashSet<>();
+ VulnerabilityReport report = new VulnerabilityReport(auditSummary, items);
+ CacheItem cache = new CacheItem(project, dr, report);
+ for (ApplicationDependencyVulnerabilitySummary v : items) {
+ List<Vulnerability> vulnerabilities = v.getVulnerabilities();
+ if (!vulnerabilities.isEmpty()) {
+ Dependency dependency = cache.getDependencyMap().get(v.getGav());
+ if (dependency != null) {
+ mapped.add(v.getGav());
+ }
+ }
+ }
+ report.setMappedVulnerabilities(mapped);
+
+ try {
+ AuditCache.getInstance().cacheAuditResults(report);
+ } catch (IOException ex) {
+ LOG.log(Level.WARNING, "Could not cache audit results for knowledgebase {0}, compartment {1}, project {2}", new Object[] {
+ auditSummary.getKnowledgeBaseId(), auditSummary.getCompartmentId(),
+ projectName
+ });
+ LOG.log(Level.WARNING, "The exception was: ", ex);
+ }
+ return cache;
+ }
+
+ @Override
+ public List<? extends Diagnostic> computeErrors(Context context) {
+ List<Diagnostic> result = new ArrayList();
+ Collection<CacheItem> items;
+
+ synchronized (cache) {
+ items = new ArrayList<>(cache.values());
+ }
+ for (CacheItem cacheItem : items) {
+ List<Diagnostic> diagnostics = cacheItem.getDiagnosticsForFile(context.file());
+ if (diagnostics != null) {
+ result.addAll(cacheItem.getDiagnosticsForFile(context.file()));
+ }
+ }
+ return result;
+ }
+}
diff --git a/enterprise/el.lexer/manifest.mf b/enterprise/el.lexer/manifest.mf
index 7cd0959..e06f78d 100644
--- a/enterprise/el.lexer/manifest.mf
+++ b/enterprise/el.lexer/manifest.mf
@@ -1,5 +1,5 @@
OpenIDE-Module: org.netbeans.modules.el.lexer/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/el/lexer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
OpenIDE-Module-Layer: org/netbeans/modules/el/lexer/resources/layer.xml
diff --git a/enterprise/glassfish.common/manifest.mf b/enterprise/glassfish.common/manifest.mf
index fe81e53..eee546e 100644
--- a/enterprise/glassfish.common/manifest.mf
+++ b/enterprise/glassfish.common/manifest.mf
@@ -4,6 +4,6 @@
OpenIDE-Module-Install: org/netbeans/modules/glassfish/common/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/glassfish/common/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.91
+OpenIDE-Module-Specification-Version: 1.92
OpenIDE-Module-Provides: org.netbeans.modules.glassfish.common
diff --git a/enterprise/glassfish.eecommon/nbproject/project.properties b/enterprise/glassfish.eecommon/nbproject/project.properties
index dbd92d0..8a495f9 100644
--- a/enterprise/glassfish.eecommon/nbproject/project.properties
+++ b/enterprise/glassfish.eecommon/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.54.0
+spec.version.base=1.55.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/enterprise/glassfish.javaee/manifest.mf b/enterprise/glassfish.javaee/manifest.mf
index 465c573..80ebd1e 100644
--- a/enterprise/glassfish.javaee/manifest.mf
+++ b/enterprise/glassfish.javaee/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/glassfish/javaee/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/javaee/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 1.58
+OpenIDE-Module-Specification-Version: 1.59
diff --git a/enterprise/glassfish.tooling/manifest.mf b/enterprise/glassfish.tooling/manifest.mf
index 2f0591b..c959f14 100644
--- a/enterprise/glassfish.tooling/manifest.mf
+++ b/enterprise/glassfish.tooling/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.glassfish.tooling/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/glassfish/tooling/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
diff --git a/enterprise/gradle.javaee/manifest.mf b/enterprise/gradle.javaee/manifest.mf
index af33fc8..0eeada9 100644
--- a/enterprise/gradle.javaee/manifest.mf
+++ b/enterprise/gradle.javaee/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.gradle.javaee
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/javaee/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
diff --git a/enterprise/j2ee.ant/nbproject/project.properties b/enterprise/j2ee.ant/nbproject/project.properties
index bfeba27..e0776a8 100644
--- a/enterprise/j2ee.ant/nbproject/project.properties
+++ b/enterprise/j2ee.ant/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
ant.jar=${ant.core.lib}
-spec.version.base=1.51.0
+spec.version.base=1.52.0
diff --git a/enterprise/j2ee.api.ejbmodule/manifest.mf b/enterprise/j2ee.api.ejbmodule/manifest.mf
index 545d754..ddc2376 100644
--- a/enterprise/j2ee.api.ejbmodule/manifest.mf
+++ b/enterprise/j2ee.api.ejbmodule/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.api.ejbmodule
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbjar/Bundle.properties
diff --git a/enterprise/j2ee.clientproject/nbproject/project.properties b/enterprise/j2ee.clientproject/nbproject/project.properties
index 304e462..da233b3 100644
--- a/enterprise/j2ee.clientproject/nbproject/project.properties
+++ b/enterprise/j2ee.clientproject/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-spec.version.base=1.63.0
+spec.version.base=1.64.0
javadoc.arch=${basedir}/arch.xml
javadoc.preview=true
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/enterprise/j2ee.common/manifest.mf b/enterprise/j2ee.common/manifest.mf
index 388024c..44374dd 100644
--- a/enterprise/j2ee.common/manifest.mf
+++ b/enterprise/j2ee.common/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.j2ee.common/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/common/Bundle.properties
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.120
+OpenIDE-Module-Specification-Version: 1.121
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.core/manifest.mf b/enterprise/j2ee.core/manifest.mf
index 69edac7..b1ceaa8 100644
--- a/enterprise/j2ee.core/manifest.mf
+++ b/enterprise/j2ee.core/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.core/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/core/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.dd.webservice/manifest.mf b/enterprise/j2ee.dd.webservice/manifest.mf
index 14b6fec..1ff41de 100644
--- a/enterprise/j2ee.dd.webservice/manifest.mf
+++ b/enterprise/j2ee.dd.webservice/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.dd.webservice
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/dd/webservice/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
diff --git a/enterprise/j2ee.dd/nbproject/project.properties b/enterprise/j2ee.dd/nbproject/project.properties
index 6276766..c383afa 100644
--- a/enterprise/j2ee.dd/nbproject/project.properties
+++ b/enterprise/j2ee.dd/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.compilerargs=-Xlint:all -Xlint:-serial
javac.source=1.8
javac.fork=true
-spec.version.base=1.57.0
+spec.version.base=1.58.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
diff --git a/enterprise/j2ee.ddloaders/nbproject/project.properties b/enterprise/j2ee.ddloaders/nbproject/project.properties
index c87133e..3c68124 100644
--- a/enterprise/j2ee.ddloaders/nbproject/project.properties
+++ b/enterprise/j2ee.ddloaders/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:all -Xlint:-serial
javac.source=1.8
-spec.version.base=1.54.0
+spec.version.base=1.55.0
javadoc.arch=${basedir}/arch.xml
diff --git a/enterprise/j2ee.earproject/manifest.mf b/enterprise/j2ee.earproject/manifest.mf
index d8b9b39..059f711 100644
--- a/enterprise/j2ee.earproject/manifest.mf
+++ b/enterprise/j2ee.earproject/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.j2ee.earproject
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/earproject/ui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/earproject/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.68
+OpenIDE-Module-Specification-Version: 1.69
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.ejbcore/manifest.mf b/enterprise/j2ee.ejbcore/manifest.mf
index 15a2c05..2d24fd1 100644
--- a/enterprise/j2ee.ejbcore/manifest.mf
+++ b/enterprise/j2ee.ejbcore/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbcore/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbcore/Bundle.properties
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.68
+OpenIDE-Module-Specification-Version: 1.69
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.ejbjarproject/manifest.mf b/enterprise/j2ee.ejbjarproject/manifest.mf
index 6d40216..7614796 100644
--- a/enterprise/j2ee.ejbjarproject/manifest.mf
+++ b/enterprise/j2ee.ejbjarproject/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.j2ee.ejbjarproject
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbjarproject/ui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbjarproject/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.70
+OpenIDE-Module-Specification-Version: 1.71
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.ejbrefactoring/manifest.mf b/enterprise/j2ee.ejbrefactoring/manifest.mf
index a8ddb46..17e339b 100644
--- a/enterprise/j2ee.ejbrefactoring/manifest.mf
+++ b/enterprise/j2ee.ejbrefactoring/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.ejbrefactoring
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbrefactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.ejbverification/manifest.mf b/enterprise/j2ee.ejbverification/manifest.mf
index 3bbaaa0..d300078 100644
--- a/enterprise/j2ee.ejbverification/manifest.mf
+++ b/enterprise/j2ee.ejbverification/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.ejbverification
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/ejbverification/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/ejbverification/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.genericserver/manifest.mf b/enterprise/j2ee.genericserver/manifest.mf
index 0fcfeca..b3b4022 100644
--- a/enterprise/j2ee.genericserver/manifest.mf
+++ b/enterprise/j2ee.genericserver/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.genericserver
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/genericserver/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/genericserver/resources/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.kit/manifest.mf b/enterprise/j2ee.kit/manifest.mf
index 9a6d2d7..f60f180 100644
--- a/enterprise/j2ee.kit/manifest.mf
+++ b/enterprise/j2ee.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/enterprise/j2ee.platform/manifest.mf b/enterprise/j2ee.platform/manifest.mf
index 6dbaef7..4d1f9b9 100644
--- a/enterprise/j2ee.platform/manifest.mf
+++ b/enterprise/j2ee.platform/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.platform/1
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/platform/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/j2ee.sun.appsrv/nbproject/project.properties b/enterprise/j2ee.sun.appsrv/nbproject/project.properties
index dd5920e..2452af5 100644
--- a/enterprise/j2ee.sun.appsrv/nbproject/project.properties
+++ b/enterprise/j2ee.sun.appsrv/nbproject/project.properties
@@ -17,6 +17,6 @@
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.52.0
+spec.version.base=1.53.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/enterprise/j2ee.sun.dd/nbproject/project.properties b/enterprise/j2ee.sun.dd/nbproject/project.properties
index 38e282a..d3d55a0 100644
--- a/enterprise/j2ee.sun.dd/nbproject/project.properties
+++ b/enterprise/j2ee.sun.dd/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
is.autoload=true
-spec.version.base=1.50.0
+spec.version.base=1.51.0
javac.source=1.6
diff --git a/enterprise/j2ee.sun.ddui/nbproject/project.properties b/enterprise/j2ee.sun.ddui/nbproject/project.properties
index 1520191..8cceaa1 100644
--- a/enterprise/j2ee.sun.ddui/nbproject/project.properties
+++ b/enterprise/j2ee.sun.ddui/nbproject/project.properties
@@ -19,6 +19,6 @@
###is.autoload=true
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.53.0
+spec.version.base=1.54.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/enterprise/j2eeapis/manifest.mf b/enterprise/j2eeapis/manifest.mf
index 0a9977e..d8b3ab1 100644
--- a/enterprise/j2eeapis/manifest.mf
+++ b/enterprise/j2eeapis/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2eeapis/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2eeapis/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/enterprise/j2eeserver/nbproject/project.properties b/enterprise/j2eeserver/nbproject/project.properties
index 54caaaf..09d0396 100644
--- a/enterprise/j2eeserver/nbproject/project.properties
+++ b/enterprise/j2eeserver/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.128.0
+spec.version.base=1.129.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/enterprise/jakartaee8.api/manifest.mf b/enterprise/jakartaee8.api/manifest.mf
index 87c29fc..cff2e07 100644
--- a/enterprise/jakartaee8.api/manifest.mf
+++ b/enterprise/jakartaee8.api/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.jakartaee8.api
OpenIDE-Module-Layer: org/netbeans/modules/jakartaee8/api/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jakartaee8/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.18
+OpenIDE-Module-Specification-Version: 1.19
diff --git a/enterprise/jakartaee8.platform/manifest.mf b/enterprise/jakartaee8.platform/manifest.mf
index 83b5d04..c78d3df 100644
--- a/enterprise/jakartaee8.platform/manifest.mf
+++ b/enterprise/jakartaee8.platform/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jakartaee8.platform/1
-OpenIDE-Module-Specification-Version: 1.18
+OpenIDE-Module-Specification-Version: 1.19
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jakartaee8/platform/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/jakartaee9.api/manifest.mf b/enterprise/jakartaee9.api/manifest.mf
index c61f31f..fb37095 100644
--- a/enterprise/jakartaee9.api/manifest.mf
+++ b/enterprise/jakartaee9.api/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.jakartaee9.api
OpenIDE-Module-Layer: org/netbeans/modules/jakartaee9/api/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jakartaee9/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/enterprise/jakartaee9.platform/manifest.mf b/enterprise/jakartaee9.platform/manifest.mf
index c1ec2ad..41b0319 100644
--- a/enterprise/jakartaee9.platform/manifest.mf
+++ b/enterprise/jakartaee9.platform/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jakartaee9.platform/1
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jakartaee9/platform/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/javaee.api/manifest.mf b/enterprise/javaee.api/manifest.mf
index a0e6be8..d63f558 100644
--- a/enterprise/javaee.api/manifest.mf
+++ b/enterprise/javaee.api/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javaee.api
OpenIDE-Module-Layer: org/netbeans/modules/javaee/api/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
diff --git a/enterprise/javaee.beanvalidation/manifest.mf b/enterprise/javaee.beanvalidation/manifest.mf
index ba05bed..bdff2f6 100644
--- a/enterprise/javaee.beanvalidation/manifest.mf
+++ b/enterprise/javaee.beanvalidation/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javaee.beanvalidation
OpenIDE-Module-Layer: org/netbeans/modules/javaee/beanvalidation/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/beanvalidation/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.36
+OpenIDE-Module-Specification-Version: 1.37
diff --git a/enterprise/javaee.project/manifest.mf b/enterprise/javaee.project/manifest.mf
index 0b00dc1..9f356bb 100644
--- a/enterprise/javaee.project/manifest.mf
+++ b/enterprise/javaee.project/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.javaee.project
OpenIDE-Module-Layer: org/netbeans/modules/javaee/project/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.36
+OpenIDE-Module-Specification-Version: 1.37
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/javaee.resources/manifest.mf b/enterprise/javaee.resources/manifest.mf
index 5796ca8..a81015e 100644
--- a/enterprise/javaee.resources/manifest.mf
+++ b/enterprise/javaee.resources/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javaee.resources
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/resources/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
diff --git a/enterprise/javaee.specs.support/manifest.mf b/enterprise/javaee.specs.support/manifest.mf
index ed200cf..337eabb 100644
--- a/enterprise/javaee.specs.support/manifest.mf
+++ b/enterprise/javaee.specs.support/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javaee.specs.support/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/specs/support/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/enterprise/javaee.wildfly/manifest.mf b/enterprise/javaee.wildfly/manifest.mf
index 68936c3..2f3fe4f 100644
--- a/enterprise/javaee.wildfly/manifest.mf
+++ b/enterprise/javaee.wildfly/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Layer: org/netbeans/modules/javaee/wildfly/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/wildfly/resources/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 2.9
+OpenIDE-Module-Specification-Version: 2.10
diff --git a/enterprise/javaee7.api/manifest.mf b/enterprise/javaee7.api/manifest.mf
index ba68e70..81d27c5 100644
--- a/enterprise/javaee7.api/manifest.mf
+++ b/enterprise/javaee7.api/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javaee7.api
OpenIDE-Module-Layer: org/netbeans/modules/javaee7/api/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee7/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
diff --git a/enterprise/javaee8.api/manifest.mf b/enterprise/javaee8.api/manifest.mf
index b2ce8ac..a71b9d4 100644
--- a/enterprise/javaee8.api/manifest.mf
+++ b/enterprise/javaee8.api/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javaee8.api
OpenIDE-Module-Layer: org/netbeans/modules/javaee8/api/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee8/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/enterprise/jellytools.enterprise/manifest.mf b/enterprise/jellytools.enterprise/manifest.mf
index a4abcb8..7fb2282 100644
--- a/enterprise/jellytools.enterprise/manifest.mf
+++ b/enterprise/jellytools.enterprise/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jellytools.enterprise/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jellytools/enterprise/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.43
+OpenIDE-Module-Specification-Version: 3.44
diff --git a/enterprise/jsp.lexer/manifest.mf b/enterprise/jsp.lexer/manifest.mf
index 40f4eea..02383dd 100644
--- a/enterprise/jsp.lexer/manifest.mf
+++ b/enterprise/jsp.lexer/manifest.mf
@@ -1,5 +1,5 @@
OpenIDE-Module: org.netbeans.modules.jsp.lexer/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/jsp/lexer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
OpenIDE-Module-Layer: org/netbeans/lib/jsp/lexer/layer.xml
diff --git a/enterprise/libs.amazon/manifest.mf b/enterprise/libs.amazon/manifest.mf
index 49a1f6e..0835083 100644
--- a/enterprise/libs.amazon/manifest.mf
+++ b/enterprise/libs.amazon/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.amazon/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/amazon/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
diff --git a/enterprise/libs.commons_fileupload/manifest.mf b/enterprise/libs.commons_fileupload/manifest.mf
index 84f8833..96f0339 100644
--- a/enterprise/libs.commons_fileupload/manifest.mf
+++ b/enterprise/libs.commons_fileupload/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.commons_fileupload/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/commons_fileupload/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
diff --git a/enterprise/libs.elimpl/nbproject/project.properties b/enterprise/libs.elimpl/nbproject/project.properties
index 7062d8a..110eb31 100644
--- a/enterprise/libs.elimpl/nbproject/project.properties
+++ b/enterprise/libs.elimpl/nbproject/project.properties
@@ -20,6 +20,6 @@
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
release.external/el-impl-3.0-b07.jar=modules/ext/el-impl.jar
-spec.version.base=1.36.0
+spec.version.base=1.37.0
sigtest.gen.fail.on.error=false
diff --git a/enterprise/libs.glassfish_logging/nbproject/project.properties b/enterprise/libs.glassfish_logging/nbproject/project.properties
index 0163dca..cbe22bf 100644
--- a/enterprise/libs.glassfish_logging/nbproject/project.properties
+++ b/enterprise/libs.glassfish_logging/nbproject/project.properties
@@ -19,4 +19,4 @@
javac.source=1.6
release.external/logging-api-1.0.4.jar=modules/ext/logging-api-1.0.4.jar
-spec.version.base=1.42.0
+spec.version.base=1.43.0
diff --git a/enterprise/libs.jackson/manifest.mf b/enterprise/libs.jackson/manifest.mf
index 8884635..7dec166 100644
--- a/enterprise/libs.jackson/manifest.mf
+++ b/enterprise/libs.jackson/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jackson/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jackson/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.14
+OpenIDE-Module-Specification-Version: 2.15
diff --git a/enterprise/libs.jstl/nbproject/project.properties b/enterprise/libs.jstl/nbproject/project.properties
index 6e8fc75..939ca08 100644
--- a/enterprise/libs.jstl/nbproject/project.properties
+++ b/enterprise/libs.jstl/nbproject/project.properties
@@ -20,4 +20,4 @@
release.external/javax.servlet.jsp.jstl-api-1.2.1.jar=modules/ext/jstl-api.jar
release.external/javax.servlet.jsp.jstl-1.2.2.jar=modules/ext/jstl-impl.jar
-spec.version.base=2.51.0
+spec.version.base=2.52.0
diff --git a/enterprise/maven.j2ee/manifest.mf b/enterprise/maven.j2ee/manifest.mf
index 631b4a2..f78da96 100644
--- a/enterprise/maven.j2ee/manifest.mf
+++ b/enterprise/maven.j2ee/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/j2ee/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/j2ee/layer.xml
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.78
+OpenIDE-Module-Specification-Version: 1.79
diff --git a/enterprise/maven.jaxws/manifest.mf b/enterprise/maven.jaxws/manifest.mf
index 51be964..7e132e5 100644
--- a/enterprise/maven.jaxws/manifest.mf
+++ b/enterprise/maven.jaxws/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.jaxws
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/jaxws/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/enterprise/micronaut/nbproject/project.properties b/enterprise/micronaut/nbproject/project.properties
index 8390eb2..fff7dfb 100644
--- a/enterprise/micronaut/nbproject/project.properties
+++ b/enterprise/micronaut/nbproject/project.properties
@@ -19,5 +19,5 @@
javac.compilerargs=-Xlint -Xlint:-serial
release.external/spring-boot-configuration-metadata-2.4.4.jar=modules/ext/spring-boot-configuration-metadata-2.4.4.jar
release.external/android-json-0.0.20131108.vaadin1.jar=modules/ext/android-json-0.0.20131108.vaadin1.jar
-spec.version.base=1.6.0
+spec.version.base=1.7.0
requires.nb.javac=true
diff --git a/enterprise/payara.common/manifest.mf b/enterprise/payara.common/manifest.mf
index 07b93e5..7750126 100644
--- a/enterprise/payara.common/manifest.mf
+++ b/enterprise/payara.common/manifest.mf
@@ -4,6 +4,6 @@
OpenIDE-Module-Install: org/netbeans/modules/payara/common/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/payara/common/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/payara/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.12
+OpenIDE-Module-Specification-Version: 2.13
OpenIDE-Module-Provides: org.netbeans.modules.payara.common
diff --git a/enterprise/payara.eecommon/nbproject/project.properties b/enterprise/payara.eecommon/nbproject/project.properties
index 5c66d3e..e142cbe 100644
--- a/enterprise/payara.eecommon/nbproject/project.properties
+++ b/enterprise/payara.eecommon/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.13.0
+spec.version.base=2.14.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/enterprise/payara.jakartaee/manifest.mf b/enterprise/payara.jakartaee/manifest.mf
index ea8f179..b4ea929 100644
--- a/enterprise/payara.jakartaee/manifest.mf
+++ b/enterprise/payara.jakartaee/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/payara/jakartaee/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/payara/jakartaee/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 2.12
+OpenIDE-Module-Specification-Version: 2.13
diff --git a/enterprise/payara.micro/manifest.mf b/enterprise/payara.micro/manifest.mf
index 4603d53..e14b561 100644
--- a/enterprise/payara.micro/manifest.mf
+++ b/enterprise/payara.micro/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.payara.micro/0
OpenIDE-Module-Layer: org/netbeans/modules/fish/payara/micro/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/fish/payara/micro/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.12
+OpenIDE-Module-Specification-Version: 2.13
diff --git a/enterprise/payara.tooling/manifest.mf b/enterprise/payara.tooling/manifest.mf
index f20ef03..3cf5cfb 100644
--- a/enterprise/payara.tooling/manifest.mf
+++ b/enterprise/payara.tooling/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.payara.tooling/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/payara/tooling/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.12
+OpenIDE-Module-Specification-Version: 2.13
diff --git a/enterprise/profiler.j2ee/manifest.mf b/enterprise/profiler.j2ee/manifest.mf
index 01435c3..e9cdedb 100644
--- a/enterprise/profiler.j2ee/manifest.mf
+++ b/enterprise/profiler.j2ee/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.profiler.j2ee/1
OpenIDE-Module-Layer: org/netbeans/modules/profiler/j2ee/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/j2ee/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/enterprise/projectimport.eclipse.web/nbproject/project.properties b/enterprise/projectimport.eclipse.web/nbproject/project.properties
index 823c8e0..fe53395 100644
--- a/enterprise/projectimport.eclipse.web/nbproject/project.properties
+++ b/enterprise/projectimport.eclipse.web/nbproject/project.properties
@@ -17,4 +17,4 @@
is.eager=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.41.0
+spec.version.base=1.42.0
diff --git a/enterprise/servletjspapi/nbproject/project.properties b/enterprise/servletjspapi/nbproject/project.properties
index 83c9309..2b4da2a 100644
--- a/enterprise/servletjspapi/nbproject/project.properties
+++ b/enterprise/servletjspapi/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.47.0
+spec.version.base=1.48.0
release.external/generated-servlet-jsp-api-3.1_2.3.jar=modules/ext/servlet3.1-jsp2.3-api.jar
extra.module.files=modules/ext/servlet3.1-jsp2.3-api.jar
diff --git a/enterprise/spring.webmvc/manifest.mf b/enterprise/spring.webmvc/manifest.mf
index dc8ef06..d094b60 100644
--- a/enterprise/spring.webmvc/manifest.mf
+++ b/enterprise/spring.webmvc/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spring.webmvc
OpenIDE-Module-Layer: org/netbeans/modules/spring/webmvc/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spring/webmvc/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.53
+OpenIDE-Module-Specification-Version: 1.54
OpenIDE-Module-Provides: org.netbeans.modules.web.project.framework
diff --git a/enterprise/tomcat5/manifest.mf b/enterprise/tomcat5/manifest.mf
index 2e3caa0..09f8769 100644
--- a/enterprise/tomcat5/manifest.mf
+++ b/enterprise/tomcat5/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tomcat5/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/tomcat5/resources/layer.xml
OpenIDE-Module-Provides: org.netbeans.modules.serverplugins.javaee
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
diff --git a/enterprise/web.beans/manifest.mf b/enterprise/web.beans/manifest.mf
index 529b3cb..9e3d063 100644
--- a/enterprise/web.beans/manifest.mf
+++ b/enterprise/web.beans/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.web.beans/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/beans/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/web/beans/resources/layer.xml
-OpenIDE-Module-Specification-Version: 2.36
+OpenIDE-Module-Specification-Version: 2.37
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.bootsfaces/manifest.mf b/enterprise/web.bootsfaces/manifest.mf
index 5f1d6f3..3a1a082 100644
--- a/enterprise/web.bootsfaces/manifest.mf
+++ b/enterprise/web.bootsfaces/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.bootsfaces
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/bootsfaces/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.88
+OpenIDE-Module-Specification-Version: 1.89
AutoUpdate-Show-In-Client: true
OpenIDE-Module-Provides: org.netbeans.modules.web.jsf.complib
diff --git a/enterprise/web.client.rest/manifest.mf b/enterprise/web.client.rest/manifest.mf
index a4e65fe..bd7920f 100644
--- a/enterprise/web.client.rest/manifest.mf
+++ b/enterprise/web.client.rest/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.client.rest
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/client/rest/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
OpenIDE-Module-Layer: org/netbeans/modules/web/client/rest/layer.xml
diff --git a/enterprise/web.core.syntax/nbproject/project.properties b/enterprise/web.core.syntax/nbproject/project.properties
index 0d58e37..0c31202 100644
--- a/enterprise/web.core.syntax/nbproject/project.properties
+++ b/enterprise/web.core.syntax/nbproject/project.properties
@@ -25,7 +25,7 @@
requires.nb.javac=true
javadoc.arch=${basedir}/arch.xml
-spec.version.base=2.61.0
+spec.version.base=2.62.0
test.config.validation.includes=\
**/AutoCompletionTest.class,**/CompletionTest.class
diff --git a/enterprise/web.core/nbproject/project.properties b/enterprise/web.core/nbproject/project.properties
index 7cd9e39..8214ab1 100644
--- a/enterprise/web.core/nbproject/project.properties
+++ b/enterprise/web.core/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.7
-spec.version.base=2.49.0
+spec.version.base=2.50.0
requires.nb.javac=true
test.config.stableBTD.includes=**/*Test.class
diff --git a/enterprise/web.debug/manifest.mf b/enterprise/web.debug/manifest.mf
index a6a9f9d..4df791a 100644
--- a/enterprise/web.debug/manifest.mf
+++ b/enterprise/web.debug/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.web.debug/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/debug/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/web/debug/resources/layer.xml
-OpenIDE-Module-Specification-Version: 2.53
+OpenIDE-Module-Specification-Version: 2.54
OpenIDE-Module-Requires: org.netbeans.spi.debugger.jpda.EditorContext, org.netbeans.modules.debugger.jpda.ui
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.el/manifest.mf b/enterprise/web.el/manifest.mf
index 7b6c970..743a90c 100644
--- a/enterprise/web.el/manifest.mf
+++ b/enterprise/web.el/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.web.el
OpenIDE-Module-Layer: org/netbeans/modules/web/el/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/el/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.69
+OpenIDE-Module-Specification-Version: 1.70
diff --git a/enterprise/web.freeform/manifest.mf b/enterprise/web.freeform/manifest.mf
index 6064dda..f0e3f29 100644
--- a/enterprise/web.freeform/manifest.mf
+++ b/enterprise/web.freeform/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.freeform
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/freeform/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/web/freeform/resources/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.jsf.editor/manifest.mf b/enterprise/web.jsf.editor/manifest.mf
index e47e143..9cefbad 100644
--- a/enterprise/web.jsf.editor/manifest.mf
+++ b/enterprise/web.jsf.editor/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.web.jsf.editor
OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/editor/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/editor/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.68
+OpenIDE-Module-Specification-Version: 1.69
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.jsf.icefaces/manifest.mf b/enterprise/web.jsf.icefaces/manifest.mf
index 258c35f..c124e35 100644
--- a/enterprise/web.jsf.icefaces/manifest.mf
+++ b/enterprise/web.jsf.icefaces/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.web.jsf.icefaces
OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/icefaces/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/icefaces/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
AutoUpdate-Show-In-Client: true
OpenIDE-Module-Provides: org.netbeans.modules.web.jsf.complib
diff --git a/enterprise/web.jsf.kit/manifest.mf b/enterprise/web.jsf.kit/manifest.mf
index 43e11a3..2b7d57e 100644
--- a/enterprise/web.jsf.kit/manifest.mf
+++ b/enterprise/web.jsf.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.jsf.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
OpenIDE-Module-Provides: org.netbeans.modules.web.project.framework
diff --git a/enterprise/web.jsf.navigation/manifest.mf b/enterprise/web.jsf.navigation/manifest.mf
index bfbc053..7cc3883 100644
--- a/enterprise/web.jsf.navigation/manifest.mf
+++ b/enterprise/web.jsf.navigation/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.web.jsf.navigation/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/navigation/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/navigation/mf-layer.xml
-OpenIDE-Module-Specification-Version: 2.43
+OpenIDE-Module-Specification-Version: 2.44
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.jsf.richfaces/manifest.mf b/enterprise/web.jsf.richfaces/manifest.mf
index 03cb730..39e273c 100644
--- a/enterprise/web.jsf.richfaces/manifest.mf
+++ b/enterprise/web.jsf.richfaces/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.web.jsf.richfaces
OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/richfaces/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/richfaces/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
AutoUpdate-Show-In-Client: true
OpenIDE-Module-Provides: org.netbeans.modules.web.jsf.complib
diff --git a/enterprise/web.jsf/nbproject/project.properties b/enterprise/web.jsf/nbproject/project.properties
index 12e6fef..a8bf15f 100644
--- a/enterprise/web.jsf/nbproject/project.properties
+++ b/enterprise/web.jsf/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.86.0
+spec.version.base=1.87.0
test.config.stable.includes=\
**/JSFSupportSuite.class
diff --git a/enterprise/web.jsf12/nbproject/project.properties b/enterprise/web.jsf12/nbproject/project.properties
index d0b7280..3626638 100644
--- a/enterprise/web.jsf12/nbproject/project.properties
+++ b/enterprise/web.jsf12/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
release.external/jsf-api-1.2_05.jar=modules/ext/jsf-1_2/jsf-api.jar
-spec.version.base=1.41.0
+spec.version.base=1.42.0
diff --git a/enterprise/web.jsf12ri/nbproject/project.properties b/enterprise/web.jsf12ri/nbproject/project.properties
index 8a4985b..3486653 100644
--- a/enterprise/web.jsf12ri/nbproject/project.properties
+++ b/enterprise/web.jsf12ri/nbproject/project.properties
@@ -18,4 +18,4 @@
release.external/jsf-impl-1.2_05.jar=modules/ext/jsf-1_2/jsf-impl.jar
sigtest.gen.fail.on.error=false
-spec.version.base=1.41.0
+spec.version.base=1.42.0
diff --git a/enterprise/web.jsf20/nbproject/project.properties b/enterprise/web.jsf20/nbproject/project.properties
index 8f83c59..5b77115 100644
--- a/enterprise/web.jsf20/nbproject/project.properties
+++ b/enterprise/web.jsf20/nbproject/project.properties
@@ -19,4 +19,4 @@
javac.source=1.7
release.external/javax.faces-2.3.9.jar=modules/ext/jsf-2_2/javax.faces.jar
release.external/javax.faces-2.3.9-license.txt=modules/ext/jsf-2_2/license.txt
-spec.version.base=1.50.0
+spec.version.base=1.51.0
diff --git a/enterprise/web.jsfapi/manifest.mf b/enterprise/web.jsfapi/manifest.mf
index 94b86aa..7040471 100644
--- a/enterprise/web.jsfapi/manifest.mf
+++ b/enterprise/web.jsfapi/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.web.jsfapi/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsfapi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/enterprise/web.jspparser/manifest.mf b/enterprise/web.jspparser/manifest.mf
index f86fc44..51e4931 100644
--- a/enterprise/web.jspparser/manifest.mf
+++ b/enterprise/web.jspparser/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.jspparser/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jspparser/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.46
+OpenIDE-Module-Specification-Version: 3.47
OpenIDE-Module-Requires: org.openide.windows.IOProvider
diff --git a/enterprise/web.kit/manifest.mf b/enterprise/web.kit/manifest.mf
index b5c2c28..c557af7 100644
--- a/enterprise/web.kit/manifest.mf
+++ b/enterprise/web.kit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
OpenIDE-Module-Recommends: org.netbeans.modules.web.project.framework
diff --git a/enterprise/web.monitor/manifest.mf b/enterprise/web.monitor/manifest.mf
index 2ba0091..7916aa3 100644
--- a/enterprise/web.monitor/manifest.mf
+++ b/enterprise/web.monitor/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.web.monitor/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/monitor/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/web/monitor/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.60
+OpenIDE-Module-Specification-Version: 1.61
OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.primefaces/manifest.mf b/enterprise/web.primefaces/manifest.mf
index 2895a79..0254e94 100644
--- a/enterprise/web.primefaces/manifest.mf
+++ b/enterprise/web.primefaces/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.web.primefaces
OpenIDE-Module-Layer: org/netbeans/modules/web/primefaces/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/primefaces/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.89
+OpenIDE-Module-Specification-Version: 1.90
AutoUpdate-Show-In-Client: true
OpenIDE-Module-Provides: org.netbeans.modules.web.jsf.complib
diff --git a/enterprise/web.project/nbproject/project.properties b/enterprise/web.project/nbproject/project.properties
index 247704b..0b54832 100644
--- a/enterprise/web.project/nbproject/project.properties
+++ b/enterprise/web.project/nbproject/project.properties
@@ -31,7 +31,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.91.0
+spec.version.base=1.92.0
# needed for the TestUtil class
test.unit.cp.extra=
diff --git a/enterprise/web.refactoring/nbproject/project.properties b/enterprise/web.refactoring/nbproject/project.properties
index d6190e1..27a57d2 100644
--- a/enterprise/web.refactoring/nbproject/project.properties
+++ b/enterprise/web.refactoring/nbproject/project.properties
@@ -17,4 +17,4 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
-spec.version.base=1.43.0
+spec.version.base=1.44.0
diff --git a/enterprise/web.struts/nbproject/project.properties b/enterprise/web.struts/nbproject/project.properties
index e6d61e5..a2b131e 100644
--- a/enterprise/web.struts/nbproject/project.properties
+++ b/enterprise/web.struts/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.7
-spec.version.base=1.50.0
+spec.version.base=1.51.0
extra.module.files=\
modules/ext/struts/antlr-2.7.2.jar,\
diff --git a/enterprise/weblogic.common/manifest.mf b/enterprise/weblogic.common/manifest.mf
index 13c25db..71e223b 100644
--- a/enterprise/weblogic.common/manifest.mf
+++ b/enterprise/weblogic.common/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.weblogic.common
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/weblogic/common/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
diff --git a/enterprise/websocket/manifest.mf b/enterprise/websocket/manifest.mf
index b028271..3d75eb8 100644
--- a/enterprise/websocket/manifest.mf
+++ b/enterprise/websocket/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.websocket
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websocket/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/websocket/layer.xml
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.clientapi/manifest.mf b/enterprise/websvc.clientapi/manifest.mf
index 5079bb8..2f7f724 100644
--- a/enterprise/websvc.clientapi/manifest.mf
+++ b/enterprise/websvc.clientapi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.clientapi
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/client/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.core/nbproject/project.properties b/enterprise/websvc.core/nbproject/project.properties
index 7ddcf25..11e6871 100644
--- a/enterprise/websvc.core/nbproject/project.properties
+++ b/enterprise/websvc.core/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.61.0
+spec.version.base=1.62.0
javadoc.arch=${basedir}/arch.xml
diff --git a/enterprise/websvc.customization/nbproject/project.properties b/enterprise/websvc.customization/nbproject/project.properties
index 8810de7..ec510a5 100644
--- a/enterprise/websvc.customization/nbproject/project.properties
+++ b/enterprise/websvc.customization/nbproject/project.properties
@@ -17,4 +17,4 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.43.0
+spec.version.base=1.44.0
diff --git a/enterprise/websvc.design/manifest.mf b/enterprise/websvc.design/manifest.mf
index b7798fe..884613c 100644
--- a/enterprise/websvc.design/manifest.mf
+++ b/enterprise/websvc.design/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.websvc.design
OpenIDE-Module-Layer: org/netbeans/modules/websvc/design/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/design/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.editor.hints/manifest.mf b/enterprise/websvc.editor.hints/manifest.mf
index d851af6..668fd7d 100644
--- a/enterprise/websvc.editor.hints/manifest.mf
+++ b/enterprise/websvc.editor.hints/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.editor.hints
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/editor/hints/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.jaxws.lightapi/manifest.mf b/enterprise/websvc.jaxws.lightapi/manifest.mf
index 7996b47..777bf0f 100644
--- a/enterprise/websvc.jaxws.lightapi/manifest.mf
+++ b/enterprise/websvc.jaxws.lightapi/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.jaxws.lightapi
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxws/light/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/enterprise/websvc.jaxwsapi/manifest.mf b/enterprise/websvc.jaxwsapi/manifest.mf
index 4692681..102b5b3 100644
--- a/enterprise/websvc.jaxwsapi/manifest.mf
+++ b/enterprise/websvc.jaxwsapi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.jaxwsapi
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxws/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.jaxwsmodel/manifest.mf b/enterprise/websvc.jaxwsmodel/manifest.mf
index 5e4aea2..f3016c9 100644
--- a/enterprise/websvc.jaxwsmodel/manifest.mf
+++ b/enterprise/websvc.jaxwsmodel/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.websvc.jaxwsmodel/1
OpenIDE-Module-Layer: org/netbeans/modules/websvc/jaxwsmodel/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxwsmodel/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.kit/manifest.mf b/enterprise/websvc.kit/manifest.mf
index bd90eda..fd16abd 100644
--- a/enterprise/websvc.kit/manifest.mf
+++ b/enterprise/websvc.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
diff --git a/enterprise/websvc.manager/manifest.mf b/enterprise/websvc.manager/manifest.mf
index 6a612af..2cceee8 100644
--- a/enterprise/websvc.manager/manifest.mf
+++ b/enterprise/websvc.manager/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.websvc.manager
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/manager/Bundle.properties
OpenIDE-Module-Install: org/netbeans/modules/websvc/manager/WebServiceModuleInstaller.class
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/enterprise/websvc.metro.lib/manifest.mf b/enterprise/websvc.metro.lib/manifest.mf
index e8b923e..2e56498 100644
--- a/enterprise/websvc.metro.lib/manifest.mf
+++ b/enterprise/websvc.metro.lib/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.metro.lib/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/metro/lib/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
OpenIDE-Module-Layer: org/netbeans/modules/websvc/metro/lib/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.owsm/manifest.mf b/enterprise/websvc.owsm/manifest.mf
index dffd1e7..9030468 100644
--- a/enterprise/websvc.owsm/manifest.mf
+++ b/enterprise/websvc.owsm/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.owsm
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/owsm/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.31
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.projectapi/manifest.mf b/enterprise/websvc.projectapi/manifest.mf
index 14769f5..13ebd77 100644
--- a/enterprise/websvc.projectapi/manifest.mf
+++ b/enterprise/websvc.projectapi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.projectapi/0
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/project/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.rest/manifest.mf b/enterprise/websvc.rest/manifest.mf
index 0335dd0..7c4a79a 100644
--- a/enterprise/websvc.rest/manifest.mf
+++ b/enterprise/websvc.rest/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.websvc.rest/0
OpenIDE-Module-Layer: org/netbeans/modules/websvc/rest/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/rest/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.restapi/manifest.mf b/enterprise/websvc.restapi/manifest.mf
index 9d7282d..088b788 100644
--- a/enterprise/websvc.restapi/manifest.mf
+++ b/enterprise/websvc.restapi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.restapi/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/rest/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.53
+OpenIDE-Module-Specification-Version: 1.54
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.restkit/manifest.mf b/enterprise/websvc.restkit/manifest.mf
index cd08c21..489c80c 100644
--- a/enterprise/websvc.restkit/manifest.mf
+++ b/enterprise/websvc.restkit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.restkit/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/restkit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
diff --git a/enterprise/websvc.restlib/manifest.mf b/enterprise/websvc.restlib/manifest.mf
index 214e106..feaca5c 100644
--- a/enterprise/websvc.restlib/manifest.mf
+++ b/enterprise/websvc.restlib/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.restlib/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/swdp/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.25
+OpenIDE-Module-Specification-Version: 2.26
OpenIDE-Module-Layer: org/netbeans/modules/websvc/swdp/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.saas.codegen.j2ee/manifest.mf b/enterprise/websvc.saas.codegen.j2ee/manifest.mf
index 6d1851c..abf0788 100644
--- a/enterprise/websvc.saas.codegen.j2ee/manifest.mf
+++ b/enterprise/websvc.saas.codegen.j2ee/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.saas.codegen.j2ee
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/codegen/j2ee/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
OpenIDE-Module-Layer: org/netbeans/modules/websvc/saas/codegen/j2ee/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.utilities/manifest.mf b/enterprise/websvc.utilities/manifest.mf
index 0fc423b..4653fca 100644
--- a/enterprise/websvc.utilities/manifest.mf
+++ b/enterprise/websvc.utilities/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.utilities/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/utilities/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.websvcapi/manifest.mf b/enterprise/websvc.websvcapi/manifest.mf
index 7d341e6..b7105cd 100644
--- a/enterprise/websvc.websvcapi/manifest.mf
+++ b/enterprise/websvc.websvcapi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.websvcapi
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/webservices/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/enterprise/websvc.wsstackapi/manifest.mf b/enterprise/websvc.wsstackapi/manifest.mf
index 64393c7..1118331 100644
--- a/enterprise/websvc.wsstackapi/manifest.mf
+++ b/enterprise/websvc.wsstackapi/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.wsstackapi/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/wsstack/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.40
+OpenIDE-Module-Specification-Version: 1.41
AutoUpdate-Show-In-Client: false
diff --git a/ergonomics/ide.ergonomics/manifest.mf b/ergonomics/ide.ergonomics/manifest.mf
index 4354cb2..932e2c0 100644
--- a/ergonomics/ide.ergonomics/manifest.mf
+++ b/ergonomics/ide.ergonomics/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module-Install: org/netbeans/modules/ide/ergonomics/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/ide/ergonomics/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ide/ergonomics/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
OpenIDE-Module-Recommends: org.netbeans.modules.server
diff --git a/extide/gradle.dists/manifest.mf b/extide/gradle.dists/manifest.mf
index 9aae6bc..774fa7f 100644
--- a/extide/gradle.dists/manifest.mf
+++ b/extide/gradle.dists/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.gradle.dists
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/dists/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
diff --git a/extide/gradle/manifest.mf b/extide/gradle/manifest.mf
index 8376f62..7165f4a 100644
--- a/extide/gradle/manifest.mf
+++ b/extide/gradle/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.gradle/2
OpenIDE-Module-Layer: org/netbeans/modules/gradle/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.25
+OpenIDE-Module-Specification-Version: 2.26
diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf
index 9cdebba..dbb1bad 100644
--- a/extide/libs.gradle/manifest.mf
+++ b/extide/libs.gradle/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.libs.gradle/7
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 7.5.0.1
+OpenIDE-Module-Specification-Version: 7.6
diff --git a/extide/o.apache.tools.ant.module/nbproject/project.properties b/extide/o.apache.tools.ant.module/nbproject/project.properties
index 41eb37d..7cddb16 100644
--- a/extide/o.apache.tools.ant.module/nbproject/project.properties
+++ b/extide/o.apache.tools.ant.module/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=3.101.0
+spec.version.base=3.102.0
compile.ant.jar=${ant.core.lib}
compile.ant-launcher.jar=${ant.core.lib}/../ant-launcher.jar
src-bridge.cp.extra=build/classes:${compile.ant.jar}:${compile.ant-launcher.jar}
diff --git a/extide/options.java/manifest.mf b/extide/options.java/manifest.mf
index 72525d6..38577da 100644
--- a/extide/options.java/manifest.mf
+++ b/extide/options.java/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/options/java/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/java/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.options.java
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
diff --git a/extra/libs.javafx.linux/manifest.mf b/extra/libs.javafx.linux/manifest.mf
index 22080d0..12b9cda 100644
--- a/extra/libs.javafx.linux/manifest.mf
+++ b/extra/libs.javafx.linux/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.libs.javafx.linux
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/linux/Bundle.properties
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
-OpenIDE-Module-Specification-Version: 17.4
+OpenIDE-Module-Specification-Version: 17.5
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Requires: org.openide.modules.os.Linux
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.macosx/manifest.mf b/extra/libs.javafx.macosx/manifest.mf
index 8a1b9df..35f6f08 100644
--- a/extra/libs.javafx.macosx/manifest.mf
+++ b/extra/libs.javafx.macosx/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.libs.javafx.macosx
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/macosx/Bundle.properties
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
-OpenIDE-Module-Specification-Version: 17.4
+OpenIDE-Module-Specification-Version: 17.5
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Requires: org.openide.modules.os.MacOSX
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/extra/libs.javafx.win/manifest.mf b/extra/libs.javafx.win/manifest.mf
index 4fa7fe2..e652c41 100644
--- a/extra/libs.javafx.win/manifest.mf
+++ b/extra/libs.javafx.win/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.libs.javafx.win
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/win/Bundle.properties
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javafx
-OpenIDE-Module-Specification-Version: 17.4
+OpenIDE-Module-Specification-Version: 17.5
OpenIDE-Module-Java-Dependencies: Java > 11
OpenIDE-Module-Requires: org.openide.modules.os.Windows
OpenIDE-Module-Provides: org.openide.modules.jre.JavaFX
diff --git a/groovy/gradle.groovy/manifest.mf b/groovy/gradle.groovy/manifest.mf
index ef0a3bc..79368be 100644
--- a/groovy/gradle.groovy/manifest.mf
+++ b/groovy/gradle.groovy/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle.groovy
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/groovy/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.6
+OpenIDE-Module-Specification-Version: 1.7
diff --git a/groovy/groovy.antproject/manifest.mf b/groovy/groovy.antproject/manifest.mf
index 5d0d4cf..cea2c94 100644
--- a/groovy/groovy.antproject/manifest.mf
+++ b/groovy/groovy.antproject/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.groovy.antproject
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/antproject/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
diff --git a/groovy/groovy.debug/manifest.mf b/groovy/groovy.debug/manifest.mf
index e04d36c..d2714e2 100644
--- a/groovy/groovy.debug/manifest.mf
+++ b/groovy/groovy.debug/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.groovy.debug/1
OpenIDE-Module-Layer: org/netbeans/modules/groovy/debug/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/debug/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
+OpenIDE-Module-Specification-Version: 1.1
diff --git a/groovy/groovy.editor/manifest.mf b/groovy/groovy.editor/manifest.mf
index 2c6b286..2bd157e 100644
--- a/groovy/groovy.editor/manifest.mf
+++ b/groovy/groovy.editor/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.groovy.editor/3
OpenIDE-Module-Layer: org/netbeans/modules/groovy/editor/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.86
+OpenIDE-Module-Specification-Version: 1.87
diff --git a/groovy/groovy.gsp/manifest.mf b/groovy/groovy.gsp/manifest.mf
index cfedbf3..ad6bb2e 100644
--- a/groovy/groovy.gsp/manifest.mf
+++ b/groovy/groovy.gsp/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.groovy.gsp
OpenIDE-Module-Layer: org/netbeans/modules/groovy/gsp/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/gsp/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/groovy/groovy.kit/manifest.mf b/groovy/groovy.kit/manifest.mf
index 311fc55..083e1b8 100644
--- a/groovy/groovy.kit/manifest.mf
+++ b/groovy/groovy.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.groovy.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/groovy/groovy.refactoring/manifest.mf b/groovy/groovy.refactoring/manifest.mf
index cd86a07..c4d4a47 100644
--- a/groovy/groovy.refactoring/manifest.mf
+++ b/groovy/groovy.refactoring/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.groovy.refactoring
OpenIDE-Module-Layer: org/netbeans/modules/groovy/refactoring/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/refactoring/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/groovy/groovy.samples/manifest.mf b/groovy/groovy.samples/manifest.mf
index e334a2a..302df3c 100644
--- a/groovy/groovy.samples/manifest.mf
+++ b/groovy/groovy.samples/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.groovy.samples
OpenIDE-Module-Layer: org/netbeans/modules/groovy/samples/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/samples/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
diff --git a/groovy/groovy.support/manifest.mf b/groovy/groovy.support/manifest.mf
index 417c8e7..1a95008 100644
--- a/groovy/groovy.support/manifest.mf
+++ b/groovy/groovy.support/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.groovy.support
OpenIDE-Module-Layer: org/netbeans/modules/groovy/support/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/support/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
diff --git a/groovy/libs.groovy/manifest.mf b/groovy/libs.groovy/manifest.mf
index d957d99..e5f7805 100644
--- a/groovy/libs.groovy/manifest.mf
+++ b/groovy/libs.groovy/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.libs.groovy
OpenIDE-Module-Layer: org/netbeans/modules/libs/groovy/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/libs/groovy/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.17
+OpenIDE-Module-Specification-Version: 2.18
diff --git a/groovy/maven.groovy/manifest.mf b/groovy/maven.groovy/manifest.mf
index 8763031..c7ee93d 100644
--- a/groovy/maven.groovy/manifest.mf
+++ b/groovy/maven.groovy/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.maven.groovy
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/groovy/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.29
+OpenIDE-Module-Specification-Version: 1.30
diff --git a/harness/apisupport.harness/manifest.mf b/harness/apisupport.harness/manifest.mf
index 67bacf6..9a93da5 100644
--- a/harness/apisupport.harness/manifest.mf
+++ b/harness/apisupport.harness/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.apisupport.harness
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/harness/Bundle.properties
diff --git a/harness/jellytools.platform/manifest.mf b/harness/jellytools.platform/manifest.mf
index 2f6ae53..8bd4b3a 100644
--- a/harness/jellytools.platform/manifest.mf
+++ b/harness/jellytools.platform/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.jellytools.platform/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jellytools/platform/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.46
+OpenIDE-Module-Specification-Version: 3.47
diff --git a/harness/jemmy/manifest.mf b/harness/jemmy/manifest.mf
index 44a5b43..bcd23fe 100644
--- a/harness/jemmy/manifest.mf
+++ b/harness/jemmy/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jemmy/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jemmy/idemodule/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.44
+OpenIDE-Module-Specification-Version: 3.45
diff --git a/harness/libs.nbi.ant/manifest.mf b/harness/libs.nbi.ant/manifest.mf
index 98066fc..ddf8435 100644
--- a/harness/libs.nbi.ant/manifest.mf
+++ b/harness/libs.nbi.ant/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.nbi.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/nbi/ant/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/harness/libs.nbi.engine/manifest.mf b/harness/libs.nbi.engine/manifest.mf
index 35b6b28..66a2ec2 100644
--- a/harness/libs.nbi.engine/manifest.mf
+++ b/harness/libs.nbi.engine/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.nbi.engine
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/nbi/engine/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.38
+OpenIDE-Module-Specification-Version: 1.39
diff --git a/harness/nbjunit/manifest.mf b/harness/nbjunit/manifest.mf
index 732ad0c..11612de 100644
--- a/harness/nbjunit/manifest.mf
+++ b/harness/nbjunit/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.nbjunit/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/junit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.107
+OpenIDE-Module-Specification-Version: 1.108
diff --git a/harness/o.n.insane/nbproject/project.properties b/harness/o.n.insane/nbproject/project.properties
index 2f6ee06..ca16045 100644
--- a/harness/o.n.insane/nbproject/project.properties
+++ b/harness/o.n.insane/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.46.0
+spec.version.base=1.47.0
cp.extra=build/hookclasses
diff --git a/ide/api.debugger/manifest.mf b/ide/api.debugger/manifest.mf
index a94590c..393b837 100644
--- a/ide/api.debugger/manifest.mf
+++ b/ide/api.debugger/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.debugger/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/debugger/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.72
+OpenIDE-Module-Specification-Version: 1.73
OpenIDE-Module-Layer: org/netbeans/api/debugger/layer.xml
diff --git a/ide/api.java.classpath/manifest.mf b/ide/api.java.classpath/manifest.mf
index a7f9a5d..bc3ae50 100644
--- a/ide/api.java.classpath/manifest.mf
+++ b/ide/api.java.classpath/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.api.java.classpath/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/classpath/Bundle.properties
OpenIDE-Module-Recommends: cnb.org.netbeans.api.java.classpath.nb
-OpenIDE-Module-Specification-Version: 1.71
+OpenIDE-Module-Specification-Version: 1.72
diff --git a/ide/api.lsp/apichanges.xml b/ide/api.lsp/apichanges.xml
index 967bc85..bd810db 100644
--- a/ide/api.lsp/apichanges.xml
+++ b/ide/api.lsp/apichanges.xml
@@ -51,6 +51,18 @@
<!-- ACTUAL CHANGES BEGIN HERE: -->
<changes>
+ <change id="DiagnosticURL">
+ <api name="LSP_API"/>
+ <summary>Added URL to diagnostic code description</summary>
+ <version major="1" minor="12"/>
+ <date day="3" month="8" year="2022"/>
+ <author login="sdedic"/>
+ <compatibility binary="compatible" source="compatible" addition="yes" deletion="no"/>
+ <description>
+ <a href="@TOP@/org/netbeans/api/lsp/Diagnostic.html">Diagnostic</a> can link to the details of the error code using URL.
+ </description>
+ <class package="org.netbeans.api.lsp" name="Diagnostic"/>
+ </change>
<change id="CodeLensProvider">
<api name="LSP_API"/>
<summary>Added CodeLensProvider and relevant elements</summary>
diff --git a/ide/api.lsp/manifest.mf b/ide/api.lsp/manifest.mf
index 4dc12dc..dd052c0 100644
--- a/ide/api.lsp/manifest.mf
+++ b/ide/api.lsp/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.lsp/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/lsp/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.13
AutoUpdate-Show-In-Client: false
diff --git a/ide/api.lsp/src/org/netbeans/api/lsp/Diagnostic.java b/ide/api.lsp/src/org/netbeans/api/lsp/Diagnostic.java
index 89b21af..9f8cbaa 100644
--- a/ide/api.lsp/src/org/netbeans/api/lsp/Diagnostic.java
+++ b/ide/api.lsp/src/org/netbeans/api/lsp/Diagnostic.java
@@ -19,6 +19,7 @@
package org.netbeans.api.lsp;
import java.util.Collection;
+import java.net.URL;
import java.util.List;
import java.util.function.Consumer;
import org.netbeans.api.annotations.common.NullAllowed;
@@ -39,14 +40,16 @@
private final Severity severity;
private final String code;
private final LazyCodeActions actions;
+ private final URL codeDescription;
private Diagnostic(Position startPosition, Position endPosition, String description,
- Severity severity, String code, LazyCodeActions actions) {
+ Severity severity, String code, URL codeDescription, LazyCodeActions actions) {
this.startPosition = startPosition;
this.endPosition = endPosition;
this.description = description;
this.severity = severity;
this.code = code;
+ this.codeDescription = codeDescription;
this.actions = actions;
}
@@ -90,6 +93,14 @@
public String getCode() {
return code;
}
+
+ /**
+ * The URL where the problem is described.
+ * @return URL with problem description
+ */
+ public URL getCodeDescription() {
+ return this.codeDescription;
+ }
/**
* The actions associated with the diagnostic.
@@ -115,6 +126,7 @@
private final String description;
private Severity severity;
private String code;
+ private URL codeDescription;
private LazyCodeActions actions;
private Builder(Position startPosition, Position endPosition, String description) {
@@ -156,6 +168,16 @@
this.code = code;
return this;
}
+
+ /**
+ * Set the URL, where the problem is described
+ * @param codeDescription URL with problem description
+ * @return this builder
+ */
+ public Builder setCodeDescription(URL codeDescription) {
+ this.codeDescription = codeDescription;
+ return this;
+ }
/**
* Set the actions associated with the diagnostic.
@@ -174,7 +196,7 @@
* @return the new Diagnostic
*/
public Diagnostic build() {
- return new Diagnostic(startPosition, endPosition, description, severity, code, actions);
+ return new Diagnostic(startPosition, endPosition, description, severity, code, codeDescription, actions);
}
}
diff --git a/ide/api.xml.ui/manifest.mf b/ide/api.xml.ui/manifest.mf
index 1613970..85fc67b 100644
--- a/ide/api.xml.ui/manifest.mf
+++ b/ide/api.xml.ui/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.xml.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/xml/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
diff --git a/ide/api.xml/manifest.mf b/ide/api.xml/manifest.mf
index 1ced659..bc8424c 100644
--- a/ide/api.xml/manifest.mf
+++ b/ide/api.xml/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.xml/1
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/xml/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/api/xml/resources/mf-layer.xml
diff --git a/ide/bugtracking.bridge/manifest.mf b/ide/bugtracking.bridge/manifest.mf
index b7f250a..94ad7bd 100644
--- a/ide/bugtracking.bridge/manifest.mf
+++ b/ide/bugtracking.bridge/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.bugtracking.bridge
OpenIDE-Module-Layer: org/netbeans/modules/bugtracking/bridge/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/bridge/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
diff --git a/ide/bugtracking.commons/manifest.mf b/ide/bugtracking.commons/manifest.mf
index 67fb847..6fde81e 100644
--- a/ide/bugtracking.commons/manifest.mf
+++ b/ide/bugtracking.commons/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.bugtracking.commons
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/commons/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
diff --git a/ide/bugtracking/manifest.mf b/ide/bugtracking/manifest.mf
index 71dac34..07de796 100644
--- a/ide/bugtracking/manifest.mf
+++ b/ide/bugtracking/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.bugtracking
OpenIDE-Module-Layer: org/netbeans/modules/bugtracking/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.126
+OpenIDE-Module-Specification-Version: 1.127
Netigso-Export-Package: org.netbeans.modules.bugtracking.api,org.netbeans.modules.bugtracking.spi
diff --git a/ide/bugzilla/manifest.mf b/ide/bugzilla/manifest.mf
index 59a422a..82c91f6 100644
--- a/ide/bugzilla/manifest.mf
+++ b/ide/bugzilla/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.bugzilla
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugzilla/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.94
+OpenIDE-Module-Specification-Version: 1.95
diff --git a/ide/c.google.guava/nbproject/project.properties b/ide/c.google.guava/nbproject/project.properties
index e194d2b..e0de62d 100644
--- a/ide/c.google.guava/nbproject/project.properties
+++ b/ide/c.google.guava/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=27.10.0
+spec.version.base=27.11.0
release.external/guava-27.0-jre.jar=modules/com-google-guava.jar
is.autoload=true
nbm.module.author=Tomas Stupka
diff --git a/ide/c.jcraft.jzlib/nbproject/project.properties b/ide/c.jcraft.jzlib/nbproject/project.properties
index 404ddcd..fa54b9e 100644
--- a/ide/c.jcraft.jzlib/nbproject/project.properties
+++ b/ide/c.jcraft.jzlib/nbproject/project.properties
@@ -17,5 +17,5 @@
is.autoload=true
extra.license.files=external/jzlib-1.1.3-license.txt
-spec.version.base=1.41.0
+spec.version.base=1.42.0
sigtest.gen.fail.on.error=false
diff --git a/ide/code.analysis/manifest.mf b/ide/code.analysis/manifest.mf
index e8cb596..5ea8caf 100644
--- a/ide/code.analysis/manifest.mf
+++ b/ide/code.analysis/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.code.analysis/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/analysis/Bundle.properties
OpenIDE-Module-Recommends: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
OpenIDE-Module-Layer: org/netbeans/modules/analysis/resources/layer.xml
diff --git a/ide/core.browser.webview/nbproject/project.properties b/ide/core.browser.webview/nbproject/project.properties
index b2dcf7b..f4c3ee5 100644
--- a/ide/core.browser.webview/nbproject/project.properties
+++ b/ide/core.browser.webview/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.32.0
+spec.version.base=1.33.0
is.eager=true
cp.extra=../libs.javafx/build/openjfx.zip
diff --git a/ide/core.browser/nbproject/project.properties b/ide/core.browser/nbproject/project.properties
index f1a042c..0a8a486 100644
--- a/ide/core.browser/nbproject/project.properties
+++ b/ide/core.browser/nbproject/project.properties
@@ -17,4 +17,4 @@
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.45.0
+spec.version.base=1.46.0
diff --git a/ide/core.ide/manifest.mf b/ide/core.ide/manifest.mf
index 4702653..67da403 100644
--- a/ide/core.ide/manifest.mf
+++ b/ide/core.ide/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.ide/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/ide/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.58
+OpenIDE-Module-Specification-Version: 1.59
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Layer: org/netbeans/core/ide/resources/layer.xml
diff --git a/ide/core.multitabs.project/nbproject/project.properties b/ide/core.multitabs.project/nbproject/project.properties
index 1d3591d..8b812d7 100644
--- a/ide/core.multitabs.project/nbproject/project.properties
+++ b/ide/core.multitabs.project/nbproject/project.properties
@@ -17,4 +17,4 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
nbm.needs.restart=true
-spec.version.base=1.27.0
+spec.version.base=1.28.0
diff --git a/ide/csl.api/nbproject/project.properties b/ide/csl.api/nbproject/project.properties
index 8ceac29..b8e8c57 100644
--- a/ide/csl.api/nbproject/project.properties
+++ b/ide/csl.api/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-spec.version.base=2.74.0
+spec.version.base=2.75.0
is.autoload=true
javac.source=1.8
diff --git a/ide/csl.types/manifest.mf b/ide/csl.types/manifest.mf
index 7a2fa05..f2956c2 100644
--- a/ide/csl.types/manifest.mf
+++ b/ide/csl.types/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.csl.types/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/csl/types/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/ide/css.editor/manifest.mf b/ide/css.editor/manifest.mf
index 8707b9b..4015865 100644
--- a/ide/css.editor/manifest.mf
+++ b/ide/css.editor/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.css.editor/1
OpenIDE-Module-Layer: org/netbeans/modules/css/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.85
+OpenIDE-Module-Specification-Version: 1.86
AutoUpdate-Show-In-Client: false
diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
index 87510e9..acef45a 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/Bundle.properties
@@ -53,6 +53,7 @@
css-module-displayname-paged_media=Paged Media
css-module-displayname-alignment=Box Alignment
css-module-displayname-fragmentation=Fragmentation
+css-module-displayname-positioning=Positioning
completion-help-no-documentation-found=No documentation found
diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
index 4fb61b5..8b63bd8 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/DefaultCssEditorModule.java
@@ -104,7 +104,8 @@
module("presentation_levels", "http://www.w3.org/TR/css3-preslev"), //NOI18N
module("generated_and_replaced_content", "http://www.w3.org/TR/css3-content"), //NOI18N
module("alignment", "http://www.w3.org/TR/css-align-3"), //NOI18N
- module("fragmentation", "http://www.w3.org/TR/css-break-3") //NOI18N
+ module("fragmentation", "http://www.w3.org/TR/css-break-3"), //NOI18N
+ module("positioning", "http://www.w3.org/TR/css3-positioning") //NOI18N
};
private static Map<String, PropertyDefinition> propertyDescriptors;
diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
index f7dcbd9..3da6a2f 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/default_module.properties
@@ -72,8 +72,6 @@
play-during=<uri> [ mix || repeat ]? | auto | none | <var-fn>
-position=static | relative | absolute | fixed | <var-fn>
-
quotes=[<string> <string>]+ | none | <var-fn>
richness=<number>
diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties
new file mode 100644
index 0000000..9867713
--- /dev/null
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/module/main/properties/positioning.properties
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#CSS Positioning Module
+
+$category=positioning
+
+position=static | relative | absolute | fixed | sticky | <var-fn>
diff --git a/ide/css.lib/manifest.mf b/ide/css.lib/manifest.mf
index 36f8ec8..f3e9fa9 100644
--- a/ide/css.lib/manifest.mf
+++ b/ide/css.lib/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.css.lib/1
OpenIDE-Module-Layer: org/netbeans/modules/css/lib/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/lib/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.100
+OpenIDE-Module-Specification-Version: 1.101
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java
index 44bcb6f..7ac45bb 100644
--- a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java
+++ b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/PropertyCategory.java
@@ -54,6 +54,7 @@
MARQUEE,
MULTI_COLUMN_LAYOUT,
PAGED_MEDIA,
+ POSITIONING,
RUBY,
SPEECH,
TEXT,
diff --git a/ide/css.model/manifest.mf b/ide/css.model/manifest.mf
index 5138265..baa6d1e 100644
--- a/ide/css.model/manifest.mf
+++ b/ide/css.model/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.css.model
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/model/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: true
diff --git a/ide/css.prep/manifest.mf b/ide/css.prep/manifest.mf
index 434d826..5988110 100644
--- a/ide/css.prep/manifest.mf
+++ b/ide/css.prep/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.css.prep
OpenIDE-Module-Layer: org/netbeans/modules/css/prep/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/prep/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
diff --git a/ide/css.visual/manifest.mf b/ide/css.visual/manifest.mf
index 86cfa5c..a9bb5ff 100644
--- a/ide/css.visual/manifest.mf
+++ b/ide/css.visual/manifest.mf
@@ -5,4 +5,4 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/visual/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.IOProvider
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 3.49
+OpenIDE-Module-Specification-Version: 3.50
diff --git a/ide/db.core/manifest.mf b/ide/db.core/manifest.mf
index 1f03ce3..16d0864 100644
--- a/ide/db.core/manifest.mf
+++ b/ide/db.core/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.db.core
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/core/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/db/core/resources/layer.xml
OpenIDE-Module-Requires: org.openide.windows.IOProvider
diff --git a/ide/db.dataview/manifest.mf b/ide/db.dataview/manifest.mf
index 67ea1c9..1e1c90c 100644
--- a/ide/db.dataview/manifest.mf
+++ b/ide/db.dataview/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.db.dataview
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/dataview/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
AutoUpdate-Show-In-Client: false
diff --git a/ide/db.drivers/manifest.mf b/ide/db.drivers/manifest.mf
index 7a56cb6..6c0a874 100644
--- a/ide/db.drivers/manifest.mf
+++ b/ide/db.drivers/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.db.drivers
OpenIDE-Module-Layer: org/netbeans/modules/db/drivers/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/drivers/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
AutoUpdate-Show-In-Client: false
diff --git a/ide/db.kit/manifest.mf b/ide/db.kit/manifest.mf
index fc90419..abe46f3 100644
--- a/ide/db.kit/manifest.mf
+++ b/ide/db.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.db.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
diff --git a/ide/db.metadata.model/manifest.mf b/ide/db.metadata.model/manifest.mf
index 51d8135..c90f08e 100644
--- a/ide/db.metadata.model/manifest.mf
+++ b/ide/db.metadata.model/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.db.metadata.model/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/db/metadata/model/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.29
AutoUpdate-Show-In-Client: false
diff --git a/ide/db.mysql/nbproject/project.properties b/ide/db.mysql/nbproject/project.properties
index 857d8b8..6342b43 100644
--- a/ide/db.mysql/nbproject/project.properties
+++ b/ide/db.mysql/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=0.45.0
+spec.version.base=0.46.0
test.unit.cp.extra=external/mysql-connector-java-8.0.17.jar
diff --git a/ide/db.sql.editor/nbproject/project.properties b/ide/db.sql.editor/nbproject/project.properties
index 76f0b38..b237e6f 100644
--- a/ide/db.sql.editor/nbproject/project.properties
+++ b/ide/db.sql.editor/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.54.0
+spec.version.base=1.55.0
# org-netbeans-core: for /xml/lookups in the default fs
# (needed in order to load database connections from the SFS)
diff --git a/ide/db.sql.visualeditor/nbproject/project.properties b/ide/db.sql.visualeditor/nbproject/project.properties
index d14e45a..99427d3 100644
--- a/ide/db.sql.visualeditor/nbproject/project.properties
+++ b/ide/db.sql.visualeditor/nbproject/project.properties
@@ -27,4 +27,4 @@
#javadoc.title=Creator Designtime API
#javadoc.arch=${basedir}/arch.xml
#javadoc.arch=${basedir}/arch/arch-designtime.xml
-spec.version.base=2.49.0
+spec.version.base=2.50.0
diff --git a/ide/db/nbproject/project.properties b/ide/db/nbproject/project.properties
index c73ec38..ff2c4c5 100644
--- a/ide/db/nbproject/project.properties
+++ b/ide/db/nbproject/project.properties
@@ -20,7 +20,7 @@
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.86.0
+spec.version.base=1.87.0
extra.module.files=modules/ext/ddl.jar
diff --git a/ide/dbapi/nbproject/project.properties b/ide/dbapi/nbproject/project.properties
index 631dab5..6f5588e 100644
--- a/ide/dbapi/nbproject/project.properties
+++ b/ide/dbapi/nbproject/project.properties
@@ -19,7 +19,7 @@
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.51.0
+spec.version.base=1.52.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/defaults/manifest.mf b/ide/defaults/manifest.mf
index 00e7afe..8b00c72 100644
--- a/ide/defaults/manifest.mf
+++ b/ide/defaults/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.defaults/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/defaults/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/defaults/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: false
diff --git a/ide/derby/manifest.mf b/ide/derby/manifest.mf
index ddd8224..f692b15 100644
--- a/ide/derby/manifest.mf
+++ b/ide/derby/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.derby
OpenIDE-Module-Layer: org/netbeans/modules/derby/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/derby/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
AutoUpdate-Show-In-Client: false
diff --git a/ide/diff/nbproject/project.properties b/ide/diff/nbproject/project.properties
index e85fbcf..d4eba89 100644
--- a/ide/diff/nbproject/project.properties
+++ b/ide/diff/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.68.0
+spec.version.base=1.69.0
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/dlight.nativeexecution.nb/manifest.mf b/ide/dlight.nativeexecution.nb/manifest.mf
index aaf2937..e550f02 100644
--- a/ide/dlight.nativeexecution.nb/manifest.mf
+++ b/ide/dlight.nativeexecution.nb/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.dlight.nativeexecution.nb
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nativeexecution/nb/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Provides: org.netbeans.modules.nativeexecution.spi.NativeExecutionUIProvider
diff --git a/ide/dlight.nativeexecution/nbproject/project.properties b/ide/dlight.nativeexecution/nbproject/project.properties
index 6566f9d..350e9d0 100644
--- a/ide/dlight.nativeexecution/nbproject/project.properties
+++ b/ide/dlight.nativeexecution/nbproject/project.properties
@@ -21,7 +21,7 @@
project.license=apache20-asf
nbm.executable.files=bin/nativeexecution/**
jnlp.indirect.files=bin/nativeexecution/**
-spec.version.base=1.56.0
+spec.version.base=1.57.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/dlight.terminal/nbproject/project.properties b/ide/dlight.terminal/nbproject/project.properties
index af98359..c7205bb 100644
--- a/ide/dlight.terminal/nbproject/project.properties
+++ b/ide/dlight.terminal/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.40.0
+spec.version.base=1.41.0
diff --git a/ide/docker.api/manifest.mf b/ide/docker.api/manifest.mf
index 753ba56..f1546fd 100644
--- a/ide/docker.api/manifest.mf
+++ b/ide/docker.api/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.docker.api/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/docker/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
AutoUpdate-Show-In-Client: false
diff --git a/ide/docker.editor/manifest.mf b/ide/docker.editor/manifest.mf
index 5c8dde1..cb7d5b9 100644
--- a/ide/docker.editor/manifest.mf
+++ b/ide/docker.editor/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.docker.editor/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/docker/editor/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/docker/editor/layer.xml
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/ide/docker.ui/manifest.mf b/ide/docker.ui/manifest.mf
index 5121eb4..bbd72b8 100644
--- a/ide/docker.ui/manifest.mf
+++ b/ide/docker.ui/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.docker.ui/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/docker/ui/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
AutoUpdate-Show-In-Client: true
diff --git a/ide/editor.actions/nbproject/project.properties b/ide/editor.actions/nbproject/project.properties
index 32a4b1a..cf452ac 100644
--- a/ide/editor.actions/nbproject/project.properties
+++ b/ide/editor.actions/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.7
javadoc.title=Editor Actions
-spec.version.base=1.48.0
+spec.version.base=1.49.0
#javadoc.arch=${basedir}/arch.xml
#javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/ide/editor.autosave/manifest.mf b/ide/editor.autosave/manifest.mf
index 74d734a..507c664 100644
--- a/ide/editor.autosave/manifest.mf
+++ b/ide/editor.autosave/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.editor.autosave/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/autosave/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.editor.autosave
-OpenIDE-Module-Specification-Version: 1.8
+OpenIDE-Module-Specification-Version: 1.9
AutoUpdate-Show-In-Client: false
diff --git a/ide/editor.bookmarks/manifest.mf b/ide/editor.bookmarks/manifest.mf
index 3d8b40b..13c6996 100644
--- a/ide/editor.bookmarks/manifest.mf
+++ b/ide/editor.bookmarks/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.bookmarks/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/bookmarks/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
OpenIDE-Module-Layer: org/netbeans/modules/editor/bookmarks/resources/layer.xml
OpenIDE-Module-Install: org/netbeans/modules/editor/bookmarks/EditorBookmarksModule.class
AutoUpdate-Show-In-Client: false
diff --git a/ide/editor.bracesmatching/nbproject/project.properties b/ide/editor.bracesmatching/nbproject/project.properties
index 810b48a..acd0e03 100644
--- a/ide/editor.bracesmatching/nbproject/project.properties
+++ b/ide/editor.bracesmatching/nbproject/project.properties
@@ -19,7 +19,7 @@
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.56.0
+spec.version.base=1.57.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
**/MasterMatcherTest.class
diff --git a/ide/editor.breadcrumbs/manifest.mf b/ide/editor.breadcrumbs/manifest.mf
index 2f3297e..144696e 100644
--- a/ide/editor.breadcrumbs/manifest.mf
+++ b/ide/editor.breadcrumbs/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.breadcrumbs/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/breadcrumbs/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/ide/editor.codetemplates/nbproject/project.properties b/ide/editor.codetemplates/nbproject/project.properties
index 68b9b19..be27af4 100644
--- a/ide/editor.codetemplates/nbproject/project.properties
+++ b/ide/editor.codetemplates/nbproject/project.properties
@@ -20,6 +20,6 @@
#javadoc.name=EditorCodeTemplates
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.61.0
+spec.version.base=1.62.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/editor.completion/nbproject/project.properties b/ide/editor.completion/nbproject/project.properties
index 4a88d94..cdfd6db 100644
--- a/ide/editor.completion/nbproject/project.properties
+++ b/ide/editor.completion/nbproject/project.properties
@@ -19,4 +19,4 @@
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.62.0
+spec.version.base=1.63.0
diff --git a/ide/editor.deprecated.pre65formatting/nbproject/project.properties b/ide/editor.deprecated.pre65formatting/nbproject/project.properties
index 3c69a13..97f1326 100644
--- a/ide/editor.deprecated.pre65formatting/nbproject/project.properties
+++ b/ide/editor.deprecated.pre65formatting/nbproject/project.properties
@@ -17,4 +17,4 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.48.0
+spec.version.base=1.49.0
diff --git a/ide/editor.document/nbproject/project.properties b/ide/editor.document/nbproject/project.properties
index fb6107b..4c2dbcf 100644
--- a/ide/editor.document/nbproject/project.properties
+++ b/ide/editor.document/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.26.0
+spec.version.base=1.27.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
is.autoload=true
diff --git a/ide/editor.errorstripe.api/nbproject/project.properties b/ide/editor.errorstripe.api/nbproject/project.properties
index 99b513a..0f3b826 100644
--- a/ide/editor.errorstripe.api/nbproject/project.properties
+++ b/ide/editor.errorstripe.api/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=2.49.0
+spec.version.base=2.50.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/editor.errorstripe/nbproject/project.properties b/ide/editor.errorstripe/nbproject/project.properties
index c682470..e9e8339 100644
--- a/ide/editor.errorstripe/nbproject/project.properties
+++ b/ide/editor.errorstripe/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=2.51.0
+spec.version.base=2.52.0
nbm.needs.restart=true
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/editor.fold.nbui/nbproject/project.properties b/ide/editor.fold.nbui/nbproject/project.properties
index 6ef2f4a..47293e2 100644
--- a/ide/editor.fold.nbui/nbproject/project.properties
+++ b/ide/editor.fold.nbui/nbproject/project.properties
@@ -18,4 +18,4 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.29.0
+spec.version.base=1.30.0
diff --git a/ide/editor.fold/manifest.mf b/ide/editor.fold/manifest.mf
index ab7c1ab..a21a0c1 100644
--- a/ide/editor.fold/manifest.mf
+++ b/ide/editor.fold/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.editor.fold/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/fold/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
diff --git a/ide/editor.global.format/nbproject/project.properties b/ide/editor.global.format/nbproject/project.properties
index 44a061a..ab25566 100644
--- a/ide/editor.global.format/nbproject/project.properties
+++ b/ide/editor.global.format/nbproject/project.properties
@@ -17,4 +17,4 @@
is.eager=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.32.0
+spec.version.base=1.33.0
diff --git a/ide/editor.guards/manifest.mf b/ide/editor.guards/manifest.mf
index 4762f7e..0b51cfe 100644
--- a/ide/editor.guards/manifest.mf
+++ b/ide/editor.guards/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.guards/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/guards/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/ide/editor.indent.project/manifest.mf b/ide/editor.indent.project/manifest.mf
index 44c71fe..c6a0721 100644
--- a/ide/editor.indent.project/manifest.mf
+++ b/ide/editor.indent.project/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.editor.indent.project/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/indent/project/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.editor.indent.spi.CodeStylePreferences.Provider
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/ide/editor.indent.support/manifest.mf b/ide/editor.indent.support/manifest.mf
index 6f72d17..10b9995 100644
--- a/ide/editor.indent.support/manifest.mf
+++ b/ide/editor.indent.support/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.editor.indent.support
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/indent/support/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
diff --git a/ide/editor.indent/manifest.mf b/ide/editor.indent/manifest.mf
index 654fd04..f9e5e64 100644
--- a/ide/editor.indent/manifest.mf
+++ b/ide/editor.indent/manifest.mf
@@ -5,4 +5,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Recommends: org.netbeans.modules.editor.indent.spi.CodeStylePreferences.Provider
OpenIDE-Module-Provides: org.netbeans.templates.IndentEngine
-OpenIDE-Module-Specification-Version: 1.60
+OpenIDE-Module-Specification-Version: 1.61
diff --git a/ide/editor.kit/manifest.mf b/ide/editor.kit/manifest.mf
index 980712f..4c8c9e3 100644
--- a/ide/editor.kit/manifest.mf
+++ b/ide/editor.kit/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.editor.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/ide/editor.lib/nbproject/project.properties b/ide/editor.lib/nbproject/project.properties
index a86705c..722d21c 100644
--- a/ide/editor.lib/nbproject/project.properties
+++ b/ide/editor.lib/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=4.24.0
+spec.version.base=4.25.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/editor.lib2/nbproject/project.properties b/ide/editor.lib2/nbproject/project.properties
index d3b2ca2..b615874 100644
--- a/ide/editor.lib2/nbproject/project.properties
+++ b/ide/editor.lib2/nbproject/project.properties
@@ -18,7 +18,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint:unchecked
-spec.version.base=2.37.0
+spec.version.base=2.38.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/ide/editor.macros/nbproject/project.properties b/ide/editor.macros/nbproject/project.properties
index cc5bc20..bb476272 100644
--- a/ide/editor.macros/nbproject/project.properties
+++ b/ide/editor.macros/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.7
-spec.version.base=1.48.0
+spec.version.base=1.49.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/editor.plain.lib/manifest.mf b/ide/editor.plain.lib/manifest.mf
index b08661a..ee5c2c4 100644
--- a/ide/editor.plain.lib/manifest.mf
+++ b/ide/editor.plain.lib/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.plain.lib/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/editor/plain/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
AutoUpdate-Show-In-Client: false
diff --git a/ide/editor.plain/manifest.mf b/ide/editor.plain/manifest.mf
index 4d682a3..3b5f23b 100644
--- a/ide/editor.plain/manifest.mf
+++ b/ide/editor.plain/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.plain/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/plain/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
OpenIDE-Module-Layer: org/netbeans/modules/editor/plain/resources/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/ide/editor.search/nbproject/project.properties b/ide/editor.search/nbproject/project.properties
index ade3b2e..ab22934 100644
--- a/ide/editor.search/nbproject/project.properties
+++ b/ide/editor.search/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.42.0
+spec.version.base=1.43.0
diff --git a/ide/editor.settings.lib/nbproject/project.properties b/ide/editor.settings.lib/nbproject/project.properties
index af25aee..da77eea 100644
--- a/ide/editor.settings.lib/nbproject/project.properties
+++ b/ide/editor.settings.lib/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.68.0
+spec.version.base=1.69.0
diff --git a/ide/editor.settings.storage/nbproject/project.properties b/ide/editor.settings.storage/nbproject/project.properties
index cf7cd3f..7cf57a9 100644
--- a/ide/editor.settings.storage/nbproject/project.properties
+++ b/ide/editor.settings.storage/nbproject/project.properties
@@ -20,7 +20,7 @@
javac.source=1.8
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.69.0
+spec.version.base=1.70.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/editor.settings/manifest.mf b/ide/editor.settings/manifest.mf
index dfde155..00cb9cb 100644
--- a/ide/editor.settings/manifest.mf
+++ b/ide/editor.settings/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.settings/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/settings/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.74
+OpenIDE-Module-Specification-Version: 1.75
OpenIDE-Module-Needs: org.netbeans.api.editor.settings.implementation
diff --git a/ide/editor.structure/nbproject/project.properties b/ide/editor.structure/nbproject/project.properties
index effda52..f8d493b 100644
--- a/ide/editor.structure/nbproject/project.properties
+++ b/ide/editor.structure/nbproject/project.properties
@@ -21,7 +21,7 @@
javac.source=1.6
-spec.version.base=1.64.0
+spec.version.base=1.65.0
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/editor.tools.storage/manifest.mf b/ide/editor.tools.storage/manifest.mf
index a6f8917..9a613f9 100644
--- a/ide/editor.tools.storage/manifest.mf
+++ b/ide/editor.tools.storage/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.editor.tools.storage
OpenIDE-Module-Layer: org/netbeans/modules/editor/tools/storage/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/tools/storage/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
diff --git a/ide/editor.util/manifest.mf b/ide/editor.util/manifest.mf
index 53e321f..265175a 100644
--- a/ide/editor.util/manifest.mf
+++ b/ide/editor.util/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.editor.util/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/editor/util/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.82
+OpenIDE-Module-Specification-Version: 1.83
diff --git a/ide/editor/nbproject/project.properties b/ide/editor/nbproject/project.properties
index f2076ab..35ab465 100644
--- a/ide/editor/nbproject/project.properties
+++ b/ide/editor/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.104.0
+spec.version.base=1.105.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/extbrowser/manifest.mf b/ide/extbrowser/manifest.mf
index d530ff1..c25c63c 100644
--- a/ide/extbrowser/manifest.mf
+++ b/ide/extbrowser/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.extbrowser/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extbrowser/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/extbrowser/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.70
+OpenIDE-Module-Specification-Version: 1.71
AutoUpdate-Show-In-Client: false
diff --git a/ide/extexecution.base/manifest.mf b/ide/extexecution.base/manifest.mf
index d44349a..aee8861 100644
--- a/ide/extexecution.base/manifest.mf
+++ b/ide/extexecution.base/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.extexecution.base/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extexecution/base/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
OpenIDE-Module-Recommends: org.netbeans.spi.extexecution.base.ProcessesImplementation
diff --git a/ide/extexecution.impl/manifest.mf b/ide/extexecution.impl/manifest.mf
index 31d6e21..f59bf3c 100644
--- a/ide/extexecution.impl/manifest.mf
+++ b/ide/extexecution.impl/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.extexecution.impl
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extexecution/impl/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
OpenIDE-Module-Provides: org.netbeans.spi.extexecution.open.OptionOpenHandler, org.netbeans.spi.extexecution.open.FileOpenHandler, org.netbeans.spi.extexecution.open.HttpOpenHandler
diff --git a/ide/extexecution.process.jdk9/manifest.mf b/ide/extexecution.process.jdk9/manifest.mf
index 34c263a..c658b40 100644
--- a/ide/extexecution.process.jdk9/manifest.mf
+++ b/ide/extexecution.process.jdk9/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.extexecution.process.jdk9
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extexecution/process/jdk9/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Java-Dependencies: Java > 1.9.0
OpenIDE-Module-Provides: org.netbeans.spi.extexecution.base.ProcessesImplementation
diff --git a/ide/extexecution.process/manifest.mf b/ide/extexecution.process/manifest.mf
index 7d5577b..cdf6754 100644
--- a/ide/extexecution.process/manifest.mf
+++ b/ide/extexecution.process/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.extexecution.process
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extexecution/process/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
OpenIDE-Module-Provides: org.netbeans.spi.extexecution.base.ProcessesImplementation
diff --git a/ide/extexecution/manifest.mf b/ide/extexecution/manifest.mf
index dc5113f..0727b43 100644
--- a/ide/extexecution/manifest.mf
+++ b/ide/extexecution/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.extexecution/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extexecution/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.66
+OpenIDE-Module-Specification-Version: 1.67
OpenIDE-Module-Recommends: org.netbeans.spi.extexecution.open.OptionOpenHandler, org.netbeans.spi.extexecution.open.FileOpenHandler, org.netbeans.spi.extexecution.open.HttpOpenHandler
diff --git a/ide/git/nbproject/project.properties b/ide/git/nbproject/project.properties
index 985b226..42f87d8 100644
--- a/ide/git/nbproject/project.properties
+++ b/ide/git/nbproject/project.properties
@@ -22,7 +22,7 @@
# #178009
# disable.qa-functional.tests=false
-spec.version.base=1.39.0
+spec.version.base=1.40.0
test.config.stable.includes=**/*Test.class
diff --git a/ide/gototest/manifest.mf b/ide/gototest/manifest.mf
index 4cb4016..58ba5cd 100644
--- a/ide/gototest/manifest.mf
+++ b/ide/gototest/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.gototest/1
OpenIDE-Module-Layer: org/netbeans/modules/gototest/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gototest/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/ide/gsf.codecoverage/manifest.mf b/ide/gsf.codecoverage/manifest.mf
index d038552..6f7a45d 100644
--- a/ide/gsf.codecoverage/manifest.mf
+++ b/ide/gsf.codecoverage/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.gsf.codecoverage
OpenIDE-Module-Layer: org/netbeans/modules/gsf/codecoverage/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gsf/codecoverage/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
AutoUpdate-Show-In-Client: false
diff --git a/ide/gsf.testrunner.ui/nbproject/project.properties b/ide/gsf.testrunner.ui/nbproject/project.properties
index 86d2a08..1a6ad42 100644
--- a/ide/gsf.testrunner.ui/nbproject/project.properties
+++ b/ide/gsf.testrunner.ui/nbproject/project.properties
@@ -18,4 +18,4 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.32.0
+spec.version.base=1.33.0
diff --git a/ide/gsf.testrunner/manifest.mf b/ide/gsf.testrunner/manifest.mf
index 790a0ca..593b578 100644
--- a/ide/gsf.testrunner/manifest.mf
+++ b/ide/gsf.testrunner/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.gsf.testrunner/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gsf/testrunner/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/gsf/testrunner/layer.xml
-OpenIDE-Module-Specification-Version: 2.29
+OpenIDE-Module-Specification-Version: 2.30
diff --git a/ide/html.custom/manifest.mf b/ide/html.custom/manifest.mf
index c241bd2..9a3342f 100644
--- a/ide/html.custom/manifest.mf
+++ b/ide/html.custom/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.html.custom
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/custom/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
diff --git a/ide/html.editor.lib/manifest.mf b/ide/html.editor.lib/manifest.mf
index 15d8626..590d194 100644
--- a/ide/html.editor.lib/manifest.mf
+++ b/ide/html.editor.lib/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.html.editor.lib/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/lib/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.49
+OpenIDE-Module-Specification-Version: 3.50
AutoUpdate-Show-In-Client: false
diff --git a/ide/html.editor/manifest.mf b/ide/html.editor/manifest.mf
index b9f42eb..f7b0223 100644
--- a/ide/html.editor/manifest.mf
+++ b/ide/html.editor/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.html.editor/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/html/editor/resources/layer.xml
-OpenIDE-Module-Specification-Version: 2.73
+OpenIDE-Module-Specification-Version: 2.74
AutoUpdate-Show-In-Client: false
diff --git a/ide/html.indexing/manifest.mf b/ide/html.indexing/manifest.mf
index 6a500f7..f51e968 100644
--- a/ide/html.indexing/manifest.mf
+++ b/ide/html.indexing/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.html.indexing
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/indexing/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.7
+OpenIDE-Module-Specification-Version: 1.8
diff --git a/ide/html.lexer/manifest.mf b/ide/html.lexer/manifest.mf
index e8c08de..5f92069 100644
--- a/ide/html.lexer/manifest.mf
+++ b/ide/html.lexer/manifest.mf
@@ -1,5 +1,5 @@
OpenIDE-Module: org.netbeans.modules.html.lexer/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/html/lexer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.56
OpenIDE-Module-Layer: org/netbeans/lib/html/lexer/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/ide/html.parser/nbproject/project.properties b/ide/html.parser/nbproject/project.properties
index c85bdd2..4dea7f7 100644
--- a/ide/html.parser/nbproject/project.properties
+++ b/ide/html.parser/nbproject/project.properties
@@ -27,7 +27,7 @@
# Fatal error: class com.lowagie.text.DocumentException not found
# Warning: class com.lowagie.text.DocumentException not found. Please, add required jar or directory to the classpath.
sigtest.gen.fail.on.error=false
-spec.version.base=1.51.0
+spec.version.base=1.52.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/html.validation/manifest.mf b/ide/html.validation/manifest.mf
index 0a1e236..ed74d91 100644
--- a/ide/html.validation/manifest.mf
+++ b/ide/html.validation/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.html.validation/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/validation/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
diff --git a/ide/html/manifest.mf b/ide/html/manifest.mf
index 7956dc8..b9b79ee 100644
--- a/ide/html/manifest.mf
+++ b/ide/html/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.html/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/html/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.78
+OpenIDE-Module-Specification-Version: 1.79
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
AutoUpdate-Show-In-Client: false
diff --git a/ide/httpserver/nbproject/project.properties b/ide/httpserver/nbproject/project.properties
index e2d8a0d..cf19437 100644
--- a/ide/httpserver/nbproject/project.properties
+++ b/ide/httpserver/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=2.53.0
+spec.version.base=2.54.0
release.external/webserver-3.2.4.jar=modules/ext/webserver.jar
test-unit-sys-prop.xtest.data=${nb_all}/ide/httpserver/test/unit/testfs
test.unit.data.dir=${nb_all}/ide/httpserver/test/unit/testfs
diff --git a/ide/hudson.git/manifest.mf b/ide/hudson.git/manifest.mf
index d334b21..28b8a3d 100644
--- a/ide/hudson.git/manifest.mf
+++ b/ide/hudson.git/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson.git
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/git/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.35
+OpenIDE-Module-Specification-Version: 1.36
diff --git a/ide/hudson.mercurial/manifest.mf b/ide/hudson.mercurial/manifest.mf
index ef8cb85..bc0b379 100644
--- a/ide/hudson.mercurial/manifest.mf
+++ b/ide/hudson.mercurial/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson.mercurial
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/mercurial/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/ide/hudson.subversion/manifest.mf b/ide/hudson.subversion/manifest.mf
index 3635066..1d28c37 100644
--- a/ide/hudson.subversion/manifest.mf
+++ b/ide/hudson.subversion/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson.subversion
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/subversion/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/ide/hudson.tasklist/manifest.mf b/ide/hudson.tasklist/manifest.mf
index b0888cf..a7e5c92 100644
--- a/ide/hudson.tasklist/manifest.mf
+++ b/ide/hudson.tasklist/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson.tasklist
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/tasklist/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/ide/hudson.ui/manifest.mf b/ide/hudson.ui/manifest.mf
index 8e1356c..bc23c30 100644
--- a/ide/hudson.ui/manifest.mf
+++ b/ide/hudson.ui/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.hudson.ui
OpenIDE-Module-Layer: org/netbeans/modules/hudson/ui/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.29
diff --git a/ide/hudson/manifest.mf b/ide/hudson/manifest.mf
index 78ea16e..0d77db8 100644
--- a/ide/hudson/manifest.mf
+++ b/ide/hudson/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.30
+OpenIDE-Module-Specification-Version: 2.31
diff --git a/ide/ide.kit/manifest.mf b/ide/ide.kit/manifest.mf
index 9f1adee..5bf8fce 100644
--- a/ide/ide.kit/manifest.mf
+++ b/ide/ide.kit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ide.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ide/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
OpenIDE-Module-Needs: org.netbeans.Netbinox
diff --git a/ide/image/manifest.mf b/ide/image/manifest.mf
index 6eff56a..2aae818 100644
--- a/ide/image/manifest.mf
+++ b/ide/image/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.image/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/image/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.65
+OpenIDE-Module-Specification-Version: 1.66
AutoUpdate-Show-In-Client: false
diff --git a/ide/javascript2.debug.ui/manifest.mf b/ide/javascript2.debug.ui/manifest.mf
index ca3ebab..a1e76d3 100644
--- a/ide/javascript2.debug.ui/manifest.mf
+++ b/ide/javascript2.debug.ui/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript2.debug.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/debug/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
AutoUpdate-Show-In-Client: false
diff --git a/ide/javascript2.debug/manifest.mf b/ide/javascript2.debug/manifest.mf
index 2594879..cc43ba9 100644
--- a/ide/javascript2.debug/manifest.mf
+++ b/ide/javascript2.debug/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.javascript2.debug/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/debug/Bundle.properties
Comment: OpenIDE-Module-Layer: org/netbeans/modules/javascript2/debug/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.35
+OpenIDE-Module-Specification-Version: 1.36
AutoUpdate-Show-In-Client: false
diff --git a/ide/jellytools.ide/nbproject/project.properties b/ide/jellytools.ide/nbproject/project.properties
index 0d0c43d..81d6d4d 100644
--- a/ide/jellytools.ide/nbproject/project.properties
+++ b/ide/jellytools.ide/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=3.50.0
+spec.version.base=3.51.0
test.config.stable.includes=\
**/IDEBundleKeysTest.class,\
diff --git a/ide/jumpto/nbproject/project.properties b/ide/jumpto/nbproject/project.properties
index 4b1fa63..16d3149 100644
--- a/ide/jumpto/nbproject/project.properties
+++ b/ide/jumpto/nbproject/project.properties
@@ -20,7 +20,7 @@
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
nbm.module.author=Andrei Badea, Petr Hrebejk
-spec.version.base=1.72.0
+spec.version.base=1.73.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/languages.diff/manifest.mf b/ide/languages.diff/manifest.mf
index 046294f..053fa03 100644
--- a/ide/languages.diff/manifest.mf
+++ b/ide/languages.diff/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.languages.diff
OpenIDE-Module-Layer: org/netbeans/modules/languages/diff/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/diff/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
AutoUpdate-Show-In-Client: false
diff --git a/ide/languages.manifest/manifest.mf b/ide/languages.manifest/manifest.mf
index 3cd0fdc..2f927bf 100644
--- a/ide/languages.manifest/manifest.mf
+++ b/ide/languages.manifest/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.languages.manifest
OpenIDE-Module-Layer: org/netbeans/modules/languages/manifest/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/manifest/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
AutoUpdate-Show-In-Client: false
diff --git a/ide/languages.yaml/manifest.mf b/ide/languages.yaml/manifest.mf
index 36d3b8c..b2c6b82 100644
--- a/ide/languages.yaml/manifest.mf
+++ b/ide/languages.yaml/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.languages.yaml
OpenIDE-Module-Layer: org/netbeans/modules/languages/yaml/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/yaml/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.49
+OpenIDE-Module-Specification-Version: 2.50
AutoUpdate-Show-In-Client: false
diff --git a/ide/languages/nbproject/project.properties b/ide/languages/nbproject/project.properties
index 75d3140..3a3e753f 100644
--- a/ide/languages/nbproject/project.properties
+++ b/ide/languages/nbproject/project.properties
@@ -19,7 +19,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.138.0
+spec.version.base=1.139.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=org/netbeans/test/**/*
diff --git a/ide/lexer.nbbridge/nbproject/project.properties b/ide/lexer.nbbridge/nbproject/project.properties
index b20274a..b716f53 100644
--- a/ide/lexer.nbbridge/nbproject/project.properties
+++ b/ide/lexer.nbbridge/nbproject/project.properties
@@ -18,4 +18,4 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.49.0
+spec.version.base=1.50.0
diff --git a/ide/lexer/nbproject/project.properties b/ide/lexer/nbproject/project.properties
index 1119a3eb..c4b62fa 100644
--- a/ide/lexer/nbproject/project.properties
+++ b/ide/lexer/nbproject/project.properties
@@ -20,7 +20,7 @@
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.80.0
+spec.version.base=1.81.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/lib.terminalemulator/manifest.mf b/ide/lib.terminalemulator/manifest.mf
index fe6afd5..393ff48 100644
--- a/ide/lib.terminalemulator/manifest.mf
+++ b/ide/lib.terminalemulator/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.terminalemulator
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/terminalemulator/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
diff --git a/ide/libs.antlr3.runtime/nbproject/project.properties b/ide/libs.antlr3.runtime/nbproject/project.properties
index 2ecbf5b..d7695eb 100644
--- a/ide/libs.antlr3.runtime/nbproject/project.properties
+++ b/ide/libs.antlr3.runtime/nbproject/project.properties
@@ -23,4 +23,4 @@
license.file=../external/antlr-3.5.2-license.txt
nbm.homepage=http://www.antlr.org/
sigtest.gen.fail.on.error=false
-spec.version.base=1.38.0
+spec.version.base=1.39.0
diff --git a/ide/libs.antlr4.runtime/nbproject/project.properties b/ide/libs.antlr4.runtime/nbproject/project.properties
index 7d01169..0efbe25 100644
--- a/ide/libs.antlr4.runtime/nbproject/project.properties
+++ b/ide/libs.antlr4.runtime/nbproject/project.properties
@@ -24,4 +24,4 @@
license.file=../external/antlr4-runtime-4.7.2-license.txt
nbm.homepage=https://www.antlr.org/
sigtest.gen.fail.on.error=false
-spec.version.base=1.18.0
+spec.version.base=1.19.0
diff --git a/ide/libs.c.kohlschutter.junixsocket/manifest.mf b/ide/libs.c.kohlschutter.junixsocket/manifest.mf
index 5ffec04..8187eee 100644
--- a/ide/libs.c.kohlschutter.junixsocket/manifest.mf
+++ b/ide/libs.c.kohlschutter.junixsocket/manifest.mf
@@ -2,4 +2,3 @@
OpenIDE-Module: libs.c.kohlschutter.junixsocket/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/c/kohlschutter/junixsocket/Bundle.properties
OpenIDE-Module-Specification-Version: 3.0
-
diff --git a/ide/libs.commons_compress/nbproject/project.properties b/ide/libs.commons_compress/nbproject/project.properties
index 5704b78..5395136 100644
--- a/ide/libs.commons_compress/nbproject/project.properties
+++ b/ide/libs.commons_compress/nbproject/project.properties
@@ -19,4 +19,4 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
release.external/commons-compress-1.21.jar=modules/ext/commons-compress-1.21.jar
-spec.version.base=0.23.0
+spec.version.base=0.24.0
diff --git a/ide/libs.commons_net/nbproject/project.properties b/ide/libs.commons_net/nbproject/project.properties
index fafa062..026ae07 100644
--- a/ide/libs.commons_net/nbproject/project.properties
+++ b/ide/libs.commons_net/nbproject/project.properties
@@ -17,4 +17,4 @@
is.autoload=true
release.external/commons-net-3.8.0.jar=modules/ext/commons-net-3.8.0.jar
-spec.version.base=2.39.0
+spec.version.base=2.40.0
diff --git a/ide/libs.flexmark/manifest.mf b/ide/libs.flexmark/manifest.mf
index 7fd804a..d9eadff 100644
--- a/ide/libs.flexmark/manifest.mf
+++ b/ide/libs.flexmark/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.flexmark
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/flexmark/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/ide/libs.freemarker/nbproject/project.properties b/ide/libs.freemarker/nbproject/project.properties
index cd4558b..0d0bb96 100644
--- a/ide/libs.freemarker/nbproject/project.properties
+++ b/ide/libs.freemarker/nbproject/project.properties
@@ -21,7 +21,7 @@
javac.source=1.6
release.external/freemarker-2.3.30.jar=modules/ext/freemarker-2.3.30.jar
module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper))
-spec.version.base=2.51.0
+spec.version.base=2.52.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/libs.git/manifest.mf b/ide/libs.git/manifest.mf
index 2facd4e..9f1b0cf 100644
--- a/ide/libs.git/manifest.mf
+++ b/ide/libs.git/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.git/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/git/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/ide/libs.graalsdk/manifest.mf b/ide/libs.graalsdk/manifest.mf
index 5a4bfc3..086b35a 100644
--- a/ide/libs.graalsdk/manifest.mf
+++ b/ide/libs.graalsdk/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.graalsdk
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/graalsdk/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Provides: org.netbeans.spi.scripting.EngineProvider
OpenIDE-Module-Recommends: com.oracle.truffle.polyglot.PolyglotImpl
diff --git a/ide/libs.ini4j/manifest.mf b/ide/libs.ini4j/manifest.mf
index c721011..2e33315 100644
--- a/ide/libs.ini4j/manifest.mf
+++ b/ide/libs.ini4j/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.ini4j/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/ini4j/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/ide/libs.jaxb/manifest.mf b/ide/libs.jaxb/manifest.mf
index fc17947..58efa83 100644
--- a/ide/libs.jaxb/manifest.mf
+++ b/ide/libs.jaxb/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jaxb/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jaxb/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Layer: org/netbeans/libs/jaxb/layer.xml
OpenIDE-Module-Provides: com.sun.xml.bind
OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
diff --git a/ide/libs.jcodings/manifest.mf b/ide/libs.jcodings/manifest.mf
index 0ffe0d1..125544e 100644
--- a/ide/libs.jcodings/manifest.mf
+++ b/ide/libs.jcodings/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jcodings/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jcodings/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.6
+OpenIDE-Module-Specification-Version: 0.7
diff --git a/ide/libs.jsch.agentproxy/manifest.mf b/ide/libs.jsch.agentproxy/manifest.mf
index e7ba710..1955d15 100644
--- a/ide/libs.jsch.agentproxy/manifest.mf
+++ b/ide/libs.jsch.agentproxy/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsch.agentproxy/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsch/agentproxy/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
diff --git a/ide/libs.json_simple/manifest.mf b/ide/libs.json_simple/manifest.mf
index 59292a1..278fa9b 100644
--- a/ide/libs.json_simple/manifest.mf
+++ b/ide/libs.json_simple/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.json_simple/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/json_simple/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.29
+OpenIDE-Module-Specification-Version: 0.30
AutoUpdate-Show-In-Client: false
diff --git a/ide/libs.lucene/manifest.mf b/ide/libs.lucene/manifest.mf
index 030f564..7973ee5 100644
--- a/ide/libs.lucene/manifest.mf
+++ b/ide/libs.lucene/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.lucene/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/lucene/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.36
+OpenIDE-Module-Specification-Version: 3.37
diff --git a/ide/libs.snakeyaml_engine/manifest.mf b/ide/libs.snakeyaml_engine/manifest.mf
index ee11182..64fe99c 100644
--- a/ide/libs.snakeyaml_engine/manifest.mf
+++ b/ide/libs.snakeyaml_engine/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.snakeyaml_engine/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/snakeyaml_engine/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.6
+OpenIDE-Module-Specification-Version: 2.7
diff --git a/ide/libs.svnClientAdapter.javahl/manifest.mf b/ide/libs.svnClientAdapter.javahl/manifest.mf
index 63d045f..4de4ba2 100644
--- a/ide/libs.svnClientAdapter.javahl/manifest.mf
+++ b/ide/libs.svnClientAdapter.javahl/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.svnClientAdapter.javahl/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/svnclientadapter/javahl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
diff --git a/ide/libs.svnClientAdapter/manifest.mf b/ide/libs.svnClientAdapter/manifest.mf
index 28de6f7..e5c2d34 100644
--- a/ide/libs.svnClientAdapter/manifest.mf
+++ b/ide/libs.svnClientAdapter/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.svnClientAdapter/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/svnclientadapter/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
diff --git a/ide/libs.truffleapi/manifest.mf b/ide/libs.truffleapi/manifest.mf
index 6c8135c..38f1023 100644
--- a/ide/libs.truffleapi/manifest.mf
+++ b/ide/libs.truffleapi/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.truffleapi
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/truffle/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Provides: com.oracle.truffle.polyglot.PolyglotImpl
diff --git a/ide/libs.xerces/nbproject/project.properties b/ide/libs.xerces/nbproject/project.properties
index 84cc078..367d615 100644
--- a/ide/libs.xerces/nbproject/project.properties
+++ b/ide/libs.xerces/nbproject/project.properties
@@ -18,4 +18,4 @@
is.autoload=true
release.external/xercesImpl-2.8.0.jar=modules/ext/xerces-2.8.0.jar
module.jar.verifylinkageignores=org.apache.xerces.util.XMLCatalogResolver
-spec.version.base=1.55.0
+spec.version.base=1.56.0
diff --git a/ide/localhistory/manifest.mf b/ide/localhistory/manifest.mf
index 5c71808..ee5b0c7 100644
--- a/ide/localhistory/manifest.mf
+++ b/ide/localhistory/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.localhistory
OpenIDE-Module-Install: org/netbeans/modules/localhistory/ModuleLifecycleManager.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/localhistory/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/ide/localtasks/manifest.mf b/ide/localtasks/manifest.mf
index 61e8fc1..1a840c3 100644
--- a/ide/localtasks/manifest.mf
+++ b/ide/localtasks/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.localtasks
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/localtasks/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/ide/lsp.client/nbproject/project.properties b/ide/lsp.client/nbproject/project.properties
index 5e99b22..2325651 100644
--- a/ide/lsp.client/nbproject/project.properties
+++ b/ide/lsp.client/nbproject/project.properties
@@ -24,4 +24,4 @@
release.external/org.eclipse.xtend.lib-2.24.0.jar=modules/ext/org.eclipse.xtend.lib-2.24.0.jar
release.external/org.eclipse.xtend.lib.macro-2.24.0.jar=modules/ext/org.eclipse.xtend.lib.macro-2.24.0.jar
release.external/org.eclipse.xtext.xbase.lib-2.24.0.jar=modules/ext/org.eclipse.xtext.xbase.lib-2.24.0.jar
-spec.version.base=1.17.0
+spec.version.base=1.18.0
diff --git a/ide/markdown/manifest.mf b/ide/markdown/manifest.mf
index 5fa9b13..3b4d8df 100644
--- a/ide/markdown/manifest.mf
+++ b/ide/markdown/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.markdown
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/markdown/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
diff --git a/ide/mercurial/nbproject/project.properties b/ide/mercurial/nbproject/project.properties
index 50bec5a..c755e9f 100644
--- a/ide/mercurial/nbproject/project.properties
+++ b/ide/mercurial/nbproject/project.properties
@@ -19,7 +19,7 @@
nbm.homepage=http://wiki.netbeans.org/wiki/view/MercurialVersionControl
nbm.module.author=John Rice and Padraig O'Briain
nbm.needs.restart=true
-spec.version.base=1.59.0
+spec.version.base=1.60.0
#qa-functional
test.qa-functional.cp.extra=${openide.nodes.dir}/modules/org-openide-nodes.jar:\${openide.util.dir}/lib/org-openide-util.jar:${openide.util.ui.dir}/lib/org-openide-util-ui.jar
diff --git a/ide/mylyn.util/manifest.mf b/ide/mylyn.util/manifest.mf
index fd182ae..4b2eaec 100644
--- a/ide/mylyn.util/manifest.mf
+++ b/ide/mylyn.util/manifest.mf
@@ -3,6 +3,6 @@
OpenIDE-Module: org.netbeans.modules.mylyn.util
OpenIDE-Module-Layer: org/netbeans/modules/mylyn/util/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/mylyn/util/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.53
+OpenIDE-Module-Specification-Version: 1.54
OpenIDE-Module-Install: org/netbeans/modules/mylyn/util/internal/ModuleLifecycleManager.class
diff --git a/ide/nativeimage.api/manifest.mf b/ide/nativeimage.api/manifest.mf
index fa1cdfb..0295dec 100644
--- a/ide/nativeimage.api/manifest.mf
+++ b/ide/nativeimage.api/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.nativeimage.api/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nativeimage/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.9
+OpenIDE-Module-Specification-Version: 0.10
diff --git a/ide/notifications/manifest.mf b/ide/notifications/manifest.mf
index 155e8a3..bdf23ea 100644
--- a/ide/notifications/manifest.mf
+++ b/ide/notifications/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.notifications
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/notifications/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
diff --git a/ide/o.apache.commons.httpclient/manifest.mf b/ide/o.apache.commons.httpclient/manifest.mf
index 88cd127..889c5e6 100644
--- a/ide/o.apache.commons.httpclient/manifest.mf
+++ b/ide/o.apache.commons.httpclient/manifest.mf
@@ -1,2 +1,2 @@
OpenIDE-Module: org.apache.commons.httpclient
-OpenIDE-Module-Specification-Version: 3.22
+OpenIDE-Module-Specification-Version: 3.23
diff --git a/ide/o.apache.xml.resolver/nbproject/project.properties b/ide/o.apache.xml.resolver/nbproject/project.properties
index 073d674..f1dd9ad 100644
--- a/ide/o.apache.xml.resolver/nbproject/project.properties
+++ b/ide/o.apache.xml.resolver/nbproject/project.properties
@@ -17,4 +17,4 @@
is.autoload=true
release.external/resolver-1.2.jar=modules/ext/resolver-1.2.jar
-spec.version.base=1.48.0
+spec.version.base=1.49.0
diff --git a/ide/o.n.swing.dirchooser/manifest.mf b/ide/o.n.swing.dirchooser/manifest.mf
index f6b9dab..f048488 100644
--- a/ide/o.n.swing.dirchooser/manifest.mf
+++ b/ide/o.n.swing.dirchooser/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.swing.dirchooser
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/dirchooser/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
OpenIDE-Module-Install: org/netbeans/swing/dirchooser/Module.class
AutoUpdate-Show-In-Client: false
diff --git a/ide/o.openidex.util/manifest.mf b/ide/o.openidex.util/manifest.mf
index 236725b..cbf4432 100644
--- a/ide/o.openidex.util/manifest.mf
+++ b/ide/o.openidex.util/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openidex.util/3
OpenIDE-Module-Localizing-Bundle: org/openidex/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.64
+OpenIDE-Module-Specification-Version: 3.65
OpenIDE-Module-Deprecated: true
OpenIDE-Module-Deprecation-Message: Module o.openidex.util is deprecated, use module api.search instead.
AutoUpdate-Essential-Module: true
diff --git a/ide/options.editor/manifest.mf b/ide/options.editor/manifest.mf
index f16ad3f..352b5c7 100644
--- a/ide/options.editor/manifest.mf
+++ b/ide/options.editor/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.options.editor/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/editor/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/editor/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.77
+OpenIDE-Module-Specification-Version: 1.78
AutoUpdate-Show-In-Client: false
diff --git a/ide/parsing.api/nbproject/project.properties b/ide/parsing.api/nbproject/project.properties
index 5ceafbd..3f6be20 100644
--- a/ide/parsing.api/nbproject/project.properties
+++ b/ide/parsing.api/nbproject/project.properties
@@ -19,7 +19,7 @@
javac.source=1.8
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
-spec.version.base=9.24.0
+spec.version.base=9.25.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/parsing.indexing/nbproject/project.properties b/ide/parsing.indexing/nbproject/project.properties
index 351b080..e3d04a3 100644
--- a/ide/parsing.indexing/nbproject/project.properties
+++ b/ide/parsing.indexing/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=9.26.0
+spec.version.base=9.27.0
is.autoload=true
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/parsing.lucene/nbproject/project.properties b/ide/parsing.lucene/nbproject/project.properties
index 904fc57..0b58a60 100644
--- a/ide/parsing.lucene/nbproject/project.properties
+++ b/ide/parsing.lucene/nbproject/project.properties
@@ -19,7 +19,7 @@
javadoc.apichanges=${basedir}/apichanges.xml
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.53.0
+spec.version.base=2.54.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
**/LuceneIndexTest.class
diff --git a/ide/parsing.nb/nbproject/project.properties b/ide/parsing.nb/nbproject/project.properties
index 0f7e599..f1756e4 100644
--- a/ide/parsing.nb/nbproject/project.properties
+++ b/ide/parsing.nb/nbproject/project.properties
@@ -17,6 +17,6 @@
is.eager=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.21.0
+spec.version.base=1.22.0
#javadoc.apichanges=${basedir}/apichanges.xml
#javadoc.files=
diff --git a/ide/parsing.ui/nbproject/project.properties b/ide/parsing.ui/nbproject/project.properties
index f3b8281..cd6ce26 100644
--- a/ide/parsing.ui/nbproject/project.properties
+++ b/ide/parsing.ui/nbproject/project.properties
@@ -17,4 +17,4 @@
is.eager=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.31.0
+spec.version.base=1.32.0
diff --git a/ide/print.editor/manifest.mf b/ide/print.editor/manifest.mf
index 16ce11d..a251b94 100644
--- a/ide/print.editor/manifest.mf
+++ b/ide/print.editor/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 7.43
+OpenIDE-Module-Specification-Version: 7.44
OpenIDE-Module: org.netbeans.modules.print.editor
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/print/editor/resources/Bundle.properties
diff --git a/ide/project.ant.compat8/manifest.mf b/ide/project.ant.compat8/manifest.mf
index 6ace406..8fa4385 100644
--- a/ide/project.ant.compat8/manifest.mf
+++ b/ide/project.ant.compat8/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.ant.compat8/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.84
+OpenIDE-Module-Specification-Version: 1.85
OpenIDE-Module-Fragment-Host: org.netbeans.modules.project.ant
diff --git a/ide/project.ant.ui/manifest.mf b/ide/project.ant.ui/manifest.mf
index cb0af9b..66a1702 100644
--- a/ide/project.ant.ui/manifest.mf
+++ b/ide/project.ant.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.ant.ui/1
-OpenIDE-Module-Specification-Version: 1.82
+OpenIDE-Module-Specification-Version: 1.83
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/ui/Bundle.properties
OpenIDE-Module-Install: org/netbeans/modules/project/ant/ui/AntProjectModule.class
diff --git a/ide/project.ant/manifest.mf b/ide/project.ant/manifest.mf
index 40a46de..297455a 100644
--- a/ide/project.ant/manifest.mf
+++ b/ide/project.ant/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.ant/1
-OpenIDE-Module-Specification-Version: 1.84
+OpenIDE-Module-Specification-Version: 1.85
OpenIDE-Module-Layer: org/netbeans/modules/project/ant/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/ant/Bundle.properties
diff --git a/ide/project.dependency/nbproject/project.properties b/ide/project.dependency/nbproject/project.properties
index b33d05b..b480ed2 100644
--- a/ide/project.dependency/nbproject/project.properties
+++ b/ide/project.dependency/nbproject/project.properties
@@ -18,4 +18,4 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.0.0
+spec.version.base=1.1.0
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Dependency.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Dependency.java
index 7c726d6c..d08ea0d 100644
--- a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Dependency.java
+++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Dependency.java
@@ -19,31 +19,46 @@
package org.netbeans.modules.project.dependency;
import java.util.List;
+import org.netbeans.api.annotations.common.CheckForNull;
/**
* Represents a dependency of an artifact. The {@link #getChildren()} artifacts are
* needed in a certain {@link #getScope()}; should be ignored in unrelated scopes.
- * The artifact that is subject of this dependency is the {@link #getArtifact()}.
+ * The artifact that is subject of this dependency is the {@link #getArtifact()} or {@link #getProject()}.
* Children are expressed using other {@link Dependency} instances.
* <p>
+ * A project does not need to produce a publishable (identifiable) artifact; in such cases, the
+ * {@link #getArtifact} may return {@code null}.
+ * <p>
* Dependency does not have well-defined {@link #equals} and {@link #hashCode}, use
- * {@link #getArtifact()} as key in Maps.
+ * {@link #getArtifact()} or {@link #getProject()} as key in Maps.
*
* @author sdedic
*/
public final class Dependency {
private final ArtifactSpec artifact;
+ private final ProjectSpec project;
private final List<Dependency> children;
private final Scope scope;
+ private Dependency parent;
final Object data;
- Dependency(ArtifactSpec artifact, List<Dependency> children, Scope scope, Object data) {
+ Dependency(ProjectSpec project, ArtifactSpec artifact, List<Dependency> children, Scope scope, Object data) {
+ this.project = project;
this.artifact = artifact;
this.children = children;
this.scope = scope;
this.data = data;
}
+ /**
+ * Returns the artifact that represents this dependency. For project dependencies, the artifact returned may be
+ * {@code null}, if the project does not translate to an identifiable artifact. But even such dependencies can have
+ * further children.
+ *
+ * @return
+ */
+ @CheckForNull
public ArtifactSpec getArtifact() {
return artifact;
}
@@ -51,6 +66,17 @@
public List<Dependency> getChildren() {
return children;
}
+
+ /**
+ * Returns project description for project dependencies, otherwise {@code null}
+ * The Dependency may also return {@link #getArtifact()}, but some projects do not produce
+ * externalized artifacts or the artifact specification is not known.
+ * @return project description for this dependency.
+ */
+ @CheckForNull
+ public ProjectSpec getProject() {
+ return project;
+ }
public Scope getScope() {
return scope;
@@ -64,8 +90,46 @@
return getArtifact() + "[" + scope + "]";
}
+ /**
+ * Returns parent Dependency that injected this one in the project. Returns
+ * {@code null}, if this dependency is directly specified or configured for the
+ * project itself.
+ * @return parent dependency or {@code null}.
+ */
+ @CheckForNull
+ public Dependency getParent() {
+ return parent;
+ }
+
+ private static Dependency assignParent(Dependency d) {
+ d.getChildren().forEach(c -> c.parent = d);
+ return d;
+ }
+
+ /**
+ * Creates an artifact dependency. The artifact need not physically exist on the filesystem, but its coordinates
+ * must be known.
+ * @param artifact
+ * @param scope
+ * @param children
+ * @param data
+ * @return
+ */
public static Dependency create(ArtifactSpec artifact, Scope scope, List<Dependency> children, Object data) {
- return new Dependency(artifact, children, scope, data);
+ return assignParent(new Dependency(null, artifact, children, scope, data));
+ }
+
+ /**
+ * Creates a dependency on a project. The project identifies
+ * @param project
+ * @param artifact
+ * @param scope
+ * @param children
+ * @param data
+ * @return
+ */
+ public static Dependency create(ProjectSpec project, ArtifactSpec artifact, Scope scope, List<Dependency> children, Object data) {
+ return assignParent(new Dependency(project, artifact, children, scope, data));
}
/**
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
index 5e0fa8c..e59c573 100644
--- a/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
+++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/DependencyResult.java
@@ -21,7 +21,10 @@
import java.io.IOException;
import java.util.Collection;
import javax.swing.event.ChangeListener;
+import org.netbeans.api.annotations.common.CheckForNull;
+import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.project.Project;
+import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;
/**
@@ -29,7 +32,9 @@
* The result may become invalid, as a result of project changes or dependency changes.
* The state change will be reported by {@link ChangeListener}. If the client is interested
* in an updated result, it must perform another dependency scan. Once invalid instance
- * will never turn back to valid.
+ * will never turn back to valid. Source mapping can be also monitored, the result will inform
+ * a listener added by {@link #addSourceChangeListener} that the {@link SourceLocation}s returned
+ * from {@link #getDeclarationRange} may have changed, e.g. as a result of a editor operation.
* <p>
* The {@link #getLookup() lookup} can be used to search for project-specific services that
* can provide further info on the artifacts or dependencies.
@@ -40,6 +45,13 @@
* @return the inspected project
*/
public Project getProject();
+
+ /**
+ * Returns files that may declare dependencies contained in this report.
+ * @return project files that define dependencies.
+ */
+ public Collection<FileObject> getDependencyFiles();
+
/**
* The root of the dependency tree. Its artifact should represent the project itself.
* @return project dependency root.
@@ -59,7 +71,8 @@
public Collection<ArtifactSpec> getProblemArtifacts();
/**
- * Registers a Listener to be notified when validity changes.
+ * Registers a Listener to be notified when validity changes, e.g. as a result
+ * of project reload.
* @param l listener
*/
public void addChangeListener(ChangeListener l);
@@ -69,11 +82,53 @@
* @param l listener
*/
public void removeChangeListener(ChangeListener l);
+
+ /**
+ * Registers a listener that gets notified if the source locations could change, as
+ * a result of e.g. text edit.
+ * @param l the listener
+ */
+ public void addSourceChangeListener(ChangeListener l);
+
+ /**
+ * Removes a previously registered listener
+ * @param l the listener
+ */
+ public void removeSourceChangeListener(ChangeListener l);
+
+ /**
+ * Name part of the dependency declaration.
+ */
+ public static final String PART_NAME = "name"; // NOI18N
/**
- * Attempts to find location where this dependency is declared.
- * @param d
- * @return
+ * Group or publisher part of the dependency declaration.
*/
- public SourceLocation getDeclarationRange(Dependency d) throws IOException;
+ public static final String PART_GROUP = "group"; // NOI18N
+
+ /**
+ * The version part of the dependency declaration.
+ */
+ public static final String PART_VERSON = "version"; // NOI18N
+
+ /**
+ * The scope part of the dependency declaration.
+ */
+ public static final String PART_SCOPE = "scope"; // NOI18N
+
+ /**
+ * A special part that locates a location appropriate for the surrounding
+ * container. For example {@code dependencies} element in Maven or {@code dependencies}
+ * block in a gradle script. Use project root as the dependency
+ */
+ public static final String PART_CONTAINER = "container"; // NOI18N
+
+ /**
+ * Attempts to find location where this dependency is declared.
+ * @param d the dependency to query
+ * @param part a specific part that should be located in the text.
+ * @return the location for the dependency or its part; {@code null} if the
+ * source location can not be determined.
+ */
+ public @CheckForNull SourceLocation getDeclarationRange(@NonNull Dependency d, String part) throws IOException;
}
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectSpec.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectSpec.java
new file mode 100644
index 0000000..7cea43e
--- /dev/null
+++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/ProjectSpec.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.project.dependency;
+
+import java.util.Objects;
+import org.openide.filesystems.FileObject;
+
+/**
+ * Describes a project dependency. Each project is identified by an unique ID
+ * like path in Gradle or relative path from the outermost POM in a maven reactor. The ID
+ * is build-system dependent. And each project has a directory represented by a FileObject.
+ *
+ * @author sdedic
+ */
+public final class ProjectSpec {
+ private final String projectId;
+ private final FileObject location;
+
+ private ProjectSpec(String projectId, FileObject location) {
+ this.projectId = projectId;
+ this.location = location;
+ }
+
+ public String getProjectId() {
+ return projectId;
+ }
+
+ public FileObject getLocation() {
+ return location;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 7;
+ hash = 71 * hash + Objects.hashCode(this.location);
+ return hash;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final ProjectSpec other = (ProjectSpec) obj;
+ return Objects.equals(this.location, other.location);
+ }
+
+ /**
+ * Creates a project specification for a dependency.
+ * @param projectId the project's unique ID
+ * @param location the project's directory
+ * @return ProjectSpec instance
+ */
+ public static ProjectSpec create(String projectId, FileObject location) {
+ return new ProjectSpec(projectId, location);
+ }
+}
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scopes.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scopes.java
index 5d6e9c4..0ca6801 100644
--- a/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scopes.java
+++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/Scopes.java
@@ -29,12 +29,12 @@
*/
public final class Scopes {
/**
- * Build process dependencies. Annotation processors, buildtime tools, code generators.
+ * Build process dependencies. Annotation processors, buildtime tools, code generators
*/
public static final Scope PROCESS = new DefaultScope("compileProcessing", Collections.emptySet(), Collections.emptySet());
/**
- * External dependencies, not distributed with the application, but provided by the environment
+ * External dependencies, not distributed with the application, but provided by the environment (= provided dependencies in Maven)
*/
public static final Scope EXTERNAL = new DefaultScope("external", Collections.emptySet(), Collections.emptySet());
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/SourceLocation.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/SourceLocation.java
index 00a457f..07d34e2 100644
--- a/ide/project.dependency/src/org/netbeans/modules/project/dependency/SourceLocation.java
+++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/SourceLocation.java
@@ -18,6 +18,7 @@
*/
package org.netbeans.modules.project.dependency;
+import org.netbeans.api.annotations.common.CheckForNull;
import org.openide.filesystems.FileObject;
/**
@@ -28,30 +29,62 @@
* <p/>
* In the case the object itself is not present in the project file, but is implied
* by another project construction, the {@link #getImpliedBy()} is not null, and provides
- * the model for that construction. For example a dependency may be introduced by an intermediate
+ * the model for that construction, which may be project type-specific. For example a dependency may be introduced by intermediate
* libraries. In that case, when the API is queried for the dependency declaration source,
* it will return the direct dependence that introduced the dependency in question from {@link #getImpliedBy}
- * and its location range.
+ * and its location range. Other project-specific artifacts may be returned.
+ * <p/>
+ * The SourceLocation can identify another artifact that contains the actual declaration. For implied
+ * artifacts ({@link #getImpliedBy()}{@code != null}), the artifact identifies the artifact that declares
+ * the dependency. If the dependency specification is split, i.e. into a BOM project and the
+ * actual project where the dependency is used, for parts defined by the BOM the origin artifact identifies
+ * the BOM.
*
* @author sdedic
*/
public final class SourceLocation {
+ private final ArtifactSpec origin;
+
+ // PENDING: maybe URI would be more useful here - would not require to build LocalFileSystem for
+ // local repositories.
private final FileObject file;
private final int startOffset;
private final int endOffset;
private final Object impliedBy;
-
+
+ /**
+ * Creates SourceLocation for the specified file and offset range.
+ * @param file the source file
+ * @param startOffset start offset
+ * @param endOffset end offset
+ * @param impliedBy
+ */
public SourceLocation(FileObject file, int startOffset, int endOffset, Object impliedBy) {
+ this(file, startOffset, endOffset, null, impliedBy);
+ }
+
+ /**
+ * Creates SourceLocation that indicates the location is in other artifact.
+ * @param file
+ * @param startOffset
+ * @param endOffset
+ * @param impliedBy
+ */
+ public SourceLocation(FileObject file, int startOffset, int endOffset, ArtifactSpec origin, Object impliedBy) {
this.file = file;
this.startOffset = startOffset;
this.endOffset = endOffset;
this.impliedBy = impliedBy;
+ this.origin = origin;
}
/**
+ * Idnentifies the source file. The file can be {@code null], if the location is not located inside the project, such as
+ * version declared in a dpeendency management of a parent POM.
+ *
* @return Returns the file.
*/
- public FileObject getFile() {
+ public @CheckForNull FileObject getFile() {
return file;
}
@@ -102,4 +135,13 @@
public boolean isEmpty() {
return startOffset >= endOffset;
}
+
+ /**
+ * Artifact outside the project whose source contains the declaration. {@code null} for
+ * locations inside the project itself.
+ * @return artifact owning the source.
+ */
+ public ArtifactSpec getOrigin() {
+ return origin;
+ }
}
diff --git a/ide/project.dependency/src/org/netbeans/modules/project/dependency/spi/ProjectDependenciesImplementation.java b/ide/project.dependency/src/org/netbeans/modules/project/dependency/spi/ProjectDependenciesImplementation.java
index 122e027..42f6288 100644
--- a/ide/project.dependency/src/org/netbeans/modules/project/dependency/spi/ProjectDependenciesImplementation.java
+++ b/ide/project.dependency/src/org/netbeans/modules/project/dependency/spi/ProjectDependenciesImplementation.java
@@ -18,8 +18,11 @@
*/
package org.netbeans.modules.project.dependency.spi;
+import java.util.List;
+
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.project.dependency.ArtifactSpec;
+import org.netbeans.modules.project.dependency.Dependency;
import org.netbeans.modules.project.dependency.DependencyResult;
import org.netbeans.modules.project.dependency.ProjectDependencies;
import org.netbeans.modules.project.dependency.ProjectOperationException;
@@ -32,7 +35,13 @@
@NonNull
public ArtifactSpec getProjectArtifact();
+ // TODO: change to CompletionStage<>, as the implementation is likely to use some dedicated
+ // thread to evaluate the project.
@NonNull
public DependencyResult findDependencies(@NonNull ProjectDependencies.DependencyQuery query)
throws ProjectOperationException;
+
+ public interface DependencyChildren {
+ public List<Dependency> createChildren(Dependency parent);
+ }
}
diff --git a/ide/project.indexingbridge/manifest.mf b/ide/project.indexingbridge/manifest.mf
index c6d43f6..853eaa6 100644
--- a/ide/project.indexingbridge/manifest.mf
+++ b/ide/project.indexingbridge/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.indexingbridge
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/indexingbridge/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/ide/project.libraries.ui/manifest.mf b/ide/project.libraries.ui/manifest.mf
index 311c3d7..1926777 100644
--- a/ide/project.libraries.ui/manifest.mf
+++ b/ide/project.libraries.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.libraries.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/libraries/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.69
+OpenIDE-Module-Specification-Version: 1.70
diff --git a/ide/project.libraries/manifest.mf b/ide/project.libraries/manifest.mf
index bc482a9..ae295a6 100644
--- a/ide/project.libraries/manifest.mf
+++ b/ide/project.libraries/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.libraries/1
OpenIDE-Module-Layer: org/netbeans/modules/project/libraries/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.70
+OpenIDE-Module-Specification-Version: 1.71
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/libraries/resources/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/ide/project.spi.intern.impl/manifest.mf b/ide/project.spi.intern.impl/manifest.mf
index 2829e9c..bd676b2 100644
--- a/ide/project.spi.intern.impl/manifest.mf
+++ b/ide/project.spi.intern.impl/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.spi.intern.impl
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/spi/intern/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/ide/project.spi.intern/manifest.mf b/ide/project.spi.intern/manifest.mf
index acd8f49..1540eac 100644
--- a/ide/project.spi.intern/manifest.mf
+++ b/ide/project.spi.intern/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.project.spi.intern
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/spi/intern/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/ide/projectapi.nb/manifest.mf b/ide/projectapi.nb/manifest.mf
index 0b27778..1e99fd6 100644
--- a/ide/projectapi.nb/manifest.mf
+++ b/ide/projectapi.nb/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.projectapi.nb
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/projectapi/nb/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.spi.project.ProjectManagerImplementation
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
AutoUpdate-Show-In-Client: false
diff --git a/ide/projectapi/manifest.mf b/ide/projectapi/manifest.mf
index 30c9e46..051a39d 100644
--- a/ide/projectapi/manifest.mf
+++ b/ide/projectapi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.projectapi/1
-OpenIDE-Module-Specification-Version: 1.87
+OpenIDE-Module-Specification-Version: 1.88
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/projectapi/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/projectapi/layer.xml
OpenIDE-Module-Needs: org.netbeans.spi.project.ProjectManagerImplementation
diff --git a/ide/projectui.buildmenu/nbproject/project.properties b/ide/projectui.buildmenu/nbproject/project.properties
index c2721af..2b9b1e8 100644
--- a/ide/projectui.buildmenu/nbproject/project.properties
+++ b/ide/projectui.buildmenu/nbproject/project.properties
@@ -19,4 +19,4 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.43.0
+spec.version.base=1.44.0
diff --git a/ide/projectui/nbproject/project.properties b/ide/projectui/nbproject/project.properties
index d49b7fb..e9ac802 100644
--- a/ide/projectui/nbproject/project.properties
+++ b/ide/projectui/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.76.0
+spec.version.base=1.77.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/ide/projectuiapi.base/nbproject/project.properties b/ide/projectuiapi.base/nbproject/project.properties
index 47ff376..68b63bb 100644
--- a/ide/projectuiapi.base/nbproject/project.properties
+++ b/ide/projectuiapi.base/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.7
-spec.version.base=1.103.0
+spec.version.base=1.104.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/ide/projectuiapi/nbproject/project.properties b/ide/projectuiapi/nbproject/project.properties
index 5fa6ec1..7b995d5 100644
--- a/ide/projectuiapi/nbproject/project.properties
+++ b/ide/projectuiapi/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.106.0
+spec.version.base=1.107.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/ide/properties.syntax/manifest.mf b/ide/properties.syntax/manifest.mf
index 572d245..13f9491 100644
--- a/ide/properties.syntax/manifest.mf
+++ b/ide/properties.syntax/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.properties.syntax/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/properties/syntax/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.67
+OpenIDE-Module-Specification-Version: 1.68
OpenIDE-Module-Install: org/netbeans/modules/properties/syntax/RestoreColoring.class
OpenIDE-Module-Layer: org/netbeans/modules/properties/syntax/Layer.xml
diff --git a/ide/properties/manifest.mf b/ide/properties/manifest.mf
index 3f9b2ca..215a60f 100644
--- a/ide/properties/manifest.mf
+++ b/ide/properties/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.properties/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/properties/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.72
+OpenIDE-Module-Specification-Version: 1.73
OpenIDE-Module-Layer: org/netbeans/modules/properties/Layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/ide/refactoring.api/nbproject/project.properties b/ide/refactoring.api/nbproject/project.properties
index 568cfca..854eb7b 100644
--- a/ide/refactoring.api/nbproject/project.properties
+++ b/ide/refactoring.api/nbproject/project.properties
@@ -20,5 +20,5 @@
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.title=Refactoring API
-spec.version.base=1.64.0
+spec.version.base=1.65.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/schema2beans/manifest.mf b/ide/schema2beans/manifest.mf
index 5b4dc65..d9da859 100644
--- a/ide/schema2beans/manifest.mf
+++ b/ide/schema2beans/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/schema2beans/Bundle.properties
OpenIDE-Module: org.netbeans.modules.schema2beans/1
-OpenIDE-Module-Specification-Version: 1.64
+OpenIDE-Module-Specification-Version: 1.65
diff --git a/ide/selenium2.server/manifest.mf b/ide/selenium2.server/manifest.mf
index 5c4d66b..28ff784 100644
--- a/ide/selenium2.server/manifest.mf
+++ b/ide/selenium2.server/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.selenium2.server
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/server/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/ide/selenium2/manifest.mf b/ide/selenium2/manifest.mf
index 76744c2..0715f0d 100644
--- a/ide/selenium2/manifest.mf
+++ b/ide/selenium2/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.selenium2
OpenIDE-Module-Layer: org/netbeans/modules/selenium2/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
diff --git a/ide/server/manifest.mf b/ide/server/manifest.mf
index cd06881..6a4a4d0 100644
--- a/ide/server/manifest.mf
+++ b/ide/server/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.server/0
OpenIDE-Module-Layer: org/netbeans/modules/server/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/server/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Provides: org.netbeans.modules.server
diff --git a/ide/servletapi/manifest.mf b/ide/servletapi/manifest.mf
index cf40a46..3baf597 100644
--- a/ide/servletapi/manifest.mf
+++ b/ide/servletapi/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.servletapi/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/servletapi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.56
+OpenIDE-Module-Specification-Version: 1.57
diff --git a/ide/spellchecker.apimodule/manifest.mf b/ide/spellchecker.apimodule/manifest.mf
index 03516ea..d262773 100644
--- a/ide/spellchecker.apimodule/manifest.mf
+++ b/ide/spellchecker.apimodule/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.apimodule
XOpenIDE-Module-Layer: org/netbeans/modules/spellchecker/apimodule/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/apimodule/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
AutoUpdate-Show-In-Client: false
diff --git a/ide/spellchecker.bindings.htmlxml/manifest.mf b/ide/spellchecker.bindings.htmlxml/manifest.mf
index 5f12fd9..3a0c91f 100644
--- a/ide/spellchecker.bindings.htmlxml/manifest.mf
+++ b/ide/spellchecker.bindings.htmlxml/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.htmlxml
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
diff --git a/ide/spellchecker.bindings.properties/manifest.mf b/ide/spellchecker.bindings.properties/manifest.mf
index c8d4958..d6cc7d4 100644
--- a/ide/spellchecker.bindings.properties/manifest.mf
+++ b/ide/spellchecker.bindings.properties/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.properties
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/properties/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/properties/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/ide/spellchecker.dictionary_en/manifest.mf b/ide/spellchecker.dictionary_en/manifest.mf
index 9ebbcd8..fd335fc 100644
--- a/ide/spellchecker.dictionary_en/manifest.mf
+++ b/ide/spellchecker.dictionary_en/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.dictionary_en
XOpenIDE-Module-Layer: org/netbeans/modules/spellchecker/dictionary_en/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/dictionary_en/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/ide/spellchecker.kit/manifest.mf b/ide/spellchecker.kit/manifest.mf
index c0995a4..9a56410 100644
--- a/ide/spellchecker.kit/manifest.mf
+++ b/ide/spellchecker.kit/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.kit
XOpenIDE-Module-Layer: org/netbeans/modules/spellchecker/kit/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/ide/spellchecker/nbproject/project.properties b/ide/spellchecker/nbproject/project.properties
index 12add98..96afd49 100644
--- a/ide/spellchecker/nbproject/project.properties
+++ b/ide/spellchecker/nbproject/project.properties
@@ -20,7 +20,7 @@
javac.source=1.8
nbm.homepage=http://spellchecker.netbeans.org
nbm.module.author=Jan Lahoda
-spec.version.base=1.52.0
+spec.version.base=1.53.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/spi.debugger.ui/manifest.mf b/ide/spi.debugger.ui/manifest.mf
index b2c6647..b766e7d 100644
--- a/ide/spi.debugger.ui/manifest.mf
+++ b/ide/spi.debugger.ui/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.spi.debugger.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/ui/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 2.75
+OpenIDE-Module-Specification-Version: 2.76
OpenIDE-Module-Provides: org.netbeans.spi.debugger.ui
OpenIDE-Module-Install: org/netbeans/modules/debugger/ui/DebuggerModule.class
diff --git a/ide/spi.editor.hints.projects/nbproject/project.properties b/ide/spi.editor.hints.projects/nbproject/project.properties
index 21d40a6..4adc31f 100644
--- a/ide/spi.editor.hints.projects/nbproject/project.properties
+++ b/ide/spi.editor.hints.projects/nbproject/project.properties
@@ -18,5 +18,5 @@
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.28.0
+spec.version.base=1.29.0
spec.version.base.fatal.warning=false
diff --git a/ide/spi.editor.hints/nbproject/project.properties b/ide/spi.editor.hints/nbproject/project.properties
index 11257aa..5912aea 100644
--- a/ide/spi.editor.hints/nbproject/project.properties
+++ b/ide/spi.editor.hints/nbproject/project.properties
@@ -18,6 +18,6 @@
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.59.0
+spec.version.base=1.60.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/spi.navigator/manifest.mf b/ide/spi.navigator/manifest.mf
index 58d4575..4a7b355 100644
--- a/ide/spi.navigator/manifest.mf
+++ b/ide/spi.navigator/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.spi.navigator/1
OpenIDE-Module-Layer: org/netbeans/modules/navigator/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/navigator/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.56
diff --git a/ide/spi.palette/manifest.mf b/ide/spi.palette/manifest.mf
index eea5c98..a736c93 100644
--- a/ide/spi.palette/manifest.mf
+++ b/ide/spi.palette/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.spi.palette/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/palette/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.63
+OpenIDE-Module-Specification-Version: 1.64
OpenIDE-Module-Layer: org/netbeans/modules/palette/resources/layer.xml
diff --git a/ide/spi.tasklist/nbproject/project.properties b/ide/spi.tasklist/nbproject/project.properties
index 04dccd9..a57da17 100644
--- a/ide/spi.tasklist/nbproject/project.properties
+++ b/ide/spi.tasklist/nbproject/project.properties
@@ -19,6 +19,6 @@
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.52.0
+spec.version.base=1.53.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/spi.viewmodel/manifest.mf b/ide/spi.viewmodel/manifest.mf
index 1ed5277..335bc7f 100644
--- a/ide/spi.viewmodel/manifest.mf
+++ b/ide/spi.viewmodel/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.spi.viewmodel/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/viewmodel/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.68
+OpenIDE-Module-Specification-Version: 1.69
diff --git a/ide/subversion/nbproject/project.properties b/ide/subversion/nbproject/project.properties
index f2af409..35a80e0 100644
--- a/ide/subversion/nbproject/project.properties
+++ b/ide/subversion/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spec.version.base=1.58.0
+spec.version.base=1.59.0
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
diff --git a/ide/swing.validation/manifest.mf b/ide/swing.validation/manifest.mf
index bf4797e..5320c90 100644
--- a/ide/swing.validation/manifest.mf
+++ b/ide/swing.validation/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.swing.validation/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/swing/validation/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/ide/target.iterator/manifest.mf b/ide/target.iterator/manifest.mf
index 03fbbdd..0f968a2 100644
--- a/ide/target.iterator/manifest.mf
+++ b/ide/target.iterator/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.target.iterator/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/target/iterator/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
AutoUpdate-Show-In-Client: false
diff --git a/ide/tasklist.kit/manifest.mf b/ide/tasklist.kit/manifest.mf
index ab36c9d..68210ff 100644
--- a/ide/tasklist.kit/manifest.mf
+++ b/ide/tasklist.kit/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.tasklist.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/ide/tasklist.projectint/manifest.mf b/ide/tasklist.projectint/manifest.mf
index b0a0cab..b20de73 100644
--- a/ide/tasklist.projectint/manifest.mf
+++ b/ide/tasklist.projectint/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.tasklist.projectint/1
OpenIDE-Module-Layer: org/netbeans/modules/tasklist/projectint/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/tasklist/projectint/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
AutoUpdate-Show-In-Client: false
diff --git a/ide/tasklist.todo/nbproject/project.properties b/ide/tasklist.todo/nbproject/project.properties
index 6883eec..2cbbbfa 100644
--- a/ide/tasklist.todo/nbproject/project.properties
+++ b/ide/tasklist.todo/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.48.0
+spec.version.base=1.49.0
#hook for apisupport TestBase
test-unit-sys-prop.test.nbcvsroot=${nb_all}
test-unit-sys-prop.xtest.netbeans.dest.dir=${netbeans.dest.dir}
diff --git a/ide/tasklist.ui/nbproject/project.properties b/ide/tasklist.ui/nbproject/project.properties
index e16a99d..99445fe 100644
--- a/ide/tasklist.ui/nbproject/project.properties
+++ b/ide/tasklist.ui/nbproject/project.properties
@@ -16,6 +16,6 @@
# under the License.
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.48.0
+spec.version.base=1.49.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/team.commons/manifest.mf b/ide/team.commons/manifest.mf
index 59f7f8e..b194b9e 100644
--- a/ide/team.commons/manifest.mf
+++ b/ide/team.commons/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.team.commons
OpenIDE-Module-Layer: org/netbeans/modules/team/commons/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/team/commons/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.67
+OpenIDE-Module-Specification-Version: 1.68
diff --git a/ide/team.ide/manifest.mf b/ide/team.ide/manifest.mf
index 577d79e..832f039 100644
--- a/ide/team.ide/manifest.mf
+++ b/ide/team.ide/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.team.ide
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/team/ide/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.31
diff --git a/ide/terminal.nb/manifest.mf b/ide/terminal.nb/manifest.mf
index 30095c5..6e00a72 100644
--- a/ide/terminal.nb/manifest.mf
+++ b/ide/terminal.nb/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.terminal.nb
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/terminal/nb/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/terminal/nb/layer.xml
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/ide/terminal/manifest.mf b/ide/terminal/manifest.mf
index 58090eb..d6c4ca6 100644
--- a/ide/terminal/manifest.mf
+++ b/ide/terminal/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.terminal
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/terminal/Bundle.properties
OpenIDE-Module-Provides: org.openide.windows.IOProvider
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
diff --git a/ide/textmate.lexer/nbproject/project.properties b/ide/textmate.lexer/nbproject/project.properties
index 25704de..10ff0f3 100644
--- a/ide/textmate.lexer/nbproject/project.properties
+++ b/ide/textmate.lexer/nbproject/project.properties
@@ -21,4 +21,4 @@
javadoc.apichanges=${basedir}/apichanges.xml
release.external/joni-2.1.11.jar=modules/ext/joni-2.1.11.jar
release.external/org.eclipse.tm4e.core-0.4.1-pack1.jar=modules/ext/org.eclipse.tm4e.core-0.4.1-pack1.jar
-spec.version.base=1.17.0
+spec.version.base=1.18.0
diff --git a/ide/usersguide/manifest.mf b/ide/usersguide/manifest.mf
index f485471..b34b9dd 100644
--- a/ide/usersguide/manifest.mf
+++ b/ide/usersguide/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.usersguide/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/usersguide/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/usersguide/layer.xml
-OpenIDE-Module-Specification-Version: 1.65
+OpenIDE-Module-Specification-Version: 1.66
AutoUpdate-Show-In-Client: false
diff --git a/ide/utilities.project/manifest.mf b/ide/utilities.project/manifest.mf
index 92db3aa..2253176 100644
--- a/ide/utilities.project/manifest.mf
+++ b/ide/utilities.project/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.utilities.project/1
OpenIDE-Module-Layer: org/netbeans/modules/search/project/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/search/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.56
diff --git a/ide/utilities/manifest.mf b/ide/utilities/manifest.mf
index 949a37e..4258a06 100644
--- a/ide/utilities/manifest.mf
+++ b/ide/utilities/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.utilities/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/utilities/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.78
+OpenIDE-Module-Specification-Version: 1.79
OpenIDE-Module-Install: org/netbeans/modules/utilities/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/utilities/Layer.xml
OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator
diff --git a/ide/versioning.core/nbproject/project.properties b/ide/versioning.core/nbproject/project.properties
index c80a49e..813240b 100644
--- a/ide/versioning.core/nbproject/project.properties
+++ b/ide/versioning.core/nbproject/project.properties
@@ -19,7 +19,7 @@
javac.source=1.6
javadoc.name=Versioning
-spec.version.base=1.48.0
+spec.version.base=1.49.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/versioning.indexingbridge/manifest.mf b/ide/versioning.indexingbridge/manifest.mf
index 543a122..d41ced6 100644
--- a/ide/versioning.indexingbridge/manifest.mf
+++ b/ide/versioning.indexingbridge/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.versioning.indexingbridge/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/versioning/indexingbridge/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.versioning.indexingbridge
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/ide/versioning.masterfs/manifest.mf b/ide/versioning.masterfs/manifest.mf
index b7276a0..c02ae01 100644
--- a/ide/versioning.masterfs/manifest.mf
+++ b/ide/versioning.masterfs/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.versioning.masterfs
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/versioning/masterfs/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
diff --git a/ide/versioning.system.cvss.installer/manifest.mf b/ide/versioning.system.cvss.installer/manifest.mf
index 9c7c705..732467a 100644
--- a/ide/versioning.system.cvss.installer/manifest.mf
+++ b/ide/versioning.system.cvss.installer/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.versioning.system.cvss.installer
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/versioning/system/cvss/installer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
AutoUpdate-Essential-Module: false
diff --git a/ide/versioning.ui/nbproject/project.properties b/ide/versioning.ui/nbproject/project.properties
index 85b8acd..d920867 100644
--- a/ide/versioning.ui/nbproject/project.properties
+++ b/ide/versioning.ui/nbproject/project.properties
@@ -19,4 +19,4 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.39.0
+spec.version.base=1.40.0
diff --git a/ide/versioning.util/nbproject/project.properties b/ide/versioning.util/nbproject/project.properties
index ab3e46f..784f724 100644
--- a/ide/versioning.util/nbproject/project.properties
+++ b/ide/versioning.util/nbproject/project.properties
@@ -19,7 +19,7 @@
javac.source=1.8
javadoc.name=Versioning Support Utilities
-spec.version.base=1.87.0
+spec.version.base=1.88.0
is.autoload=true
# Fatal error: Fatal error: class javax.net.SocketFactory not found
diff --git a/ide/versioning/nbproject/project.properties b/ide/versioning/nbproject/project.properties
index d7f82d9..feafc02 100644
--- a/ide/versioning/nbproject/project.properties
+++ b/ide/versioning/nbproject/project.properties
@@ -19,7 +19,7 @@
javac.source=1.6
javadoc.name=Versioning
-spec.version.base=1.64.0
+spec.version.base=1.65.0
is.autoload=true
javadoc.arch=${basedir}/arch.xml
diff --git a/ide/web.browser.api/manifest.mf b/ide/web.browser.api/manifest.mf
index d59cc4f..803b7fa 100644
--- a/ide/web.browser.api/manifest.mf
+++ b/ide/web.browser.api/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module-Layer: org/netbeans/modules/web/browser/ui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/browser/api/Bundle.properties
OpenIDE-Module-Recommends: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
diff --git a/ide/web.common.ui/manifest.mf b/ide/web.common.ui/manifest.mf
index d9070b8..7578b46 100644
--- a/ide/web.common.ui/manifest.mf
+++ b/ide/web.common.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.common.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/common/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.18
+OpenIDE-Module-Specification-Version: 1.19
diff --git a/ide/web.common/manifest.mf b/ide/web.common/manifest.mf
index fbfa0c0..86c1d14 100644
--- a/ide/web.common/manifest.mf
+++ b/ide/web.common/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.common
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.116
+OpenIDE-Module-Specification-Version: 1.117
diff --git a/ide/web.indent/manifest.mf b/ide/web.indent/manifest.mf
index 674761f..ff0605c 100644
--- a/ide/web.indent/manifest.mf
+++ b/ide/web.indent/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.web.indent
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/indent/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
diff --git a/ide/web.webkit.debugging/manifest.mf b/ide/web.webkit.debugging/manifest.mf
index d054acb..9c05dd0 100644
--- a/ide/web.webkit.debugging/manifest.mf
+++ b/ide/web.webkit.debugging/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.web.webkit.debugging
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/webkit/debugging/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.70
+OpenIDE-Module-Specification-Version: 1.71
diff --git a/ide/xml.axi/manifest.mf b/ide/xml.axi/manifest.mf
index 6c99cff..4ebed0c 100644
--- a/ide/xml.axi/manifest.mf
+++ b/ide/xml.axi/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.xml.axi
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/axi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/ide/xml.catalog.ui/nbproject/project.properties b/ide/xml.catalog.ui/nbproject/project.properties
index 08814b7..ea37f6f 100644
--- a/ide/xml.catalog.ui/nbproject/project.properties
+++ b/ide/xml.catalog.ui/nbproject/project.properties
@@ -16,4 +16,4 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.20.0
+spec.version.base=2.21.0
diff --git a/ide/xml.catalog/nbproject/project.properties b/ide/xml.catalog/nbproject/project.properties
index aa78411..ac79ac1 100644
--- a/ide/xml.catalog/nbproject/project.properties
+++ b/ide/xml.catalog/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.source=1.6
-spec.version.base=3.21.0
+spec.version.base=3.22.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/xml.core/nbproject/project.properties b/ide/xml.core/nbproject/project.properties
index 3d5797f..4461b5e 100644
--- a/ide/xml.core/nbproject/project.properties
+++ b/ide/xml.core/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.60.0
+spec.version.base=1.61.0
is.autoload=true
javadoc.packages=\
diff --git a/ide/xml.jaxb.api/manifest.mf b/ide/xml.jaxb.api/manifest.mf
index 0c76a85..057c07a 100644
--- a/ide/xml.jaxb.api/manifest.mf
+++ b/ide/xml.jaxb.api/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.xml.jaxb.api/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/jaxb/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
OpenIDE-Module-Needs: com.sun.xml.bind
OpenIDE-Module-Hide-Classpath-Packages: javax.xml.bind.**
diff --git a/ide/xml.lexer/manifest.mf b/ide/xml.lexer/manifest.mf
index 3581ea2..ee873b6 100644
--- a/ide/xml.lexer/manifest.mf
+++ b/ide/xml.lexer/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.xml.lexer
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/xml/lexer/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/lib/xml/lexer/layer.xml
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
AutoUpdate-Show-In-Client: false
diff --git a/ide/xml.multiview/nbproject/project.properties b/ide/xml.multiview/nbproject/project.properties
index c866fc9..7485c6d 100644
--- a/ide/xml.multiview/nbproject/project.properties
+++ b/ide/xml.multiview/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.55.0
+spec.version.base=1.56.0
is.autoload=true
test.unit.cp.extra=
diff --git a/ide/xml.retriever/manifest.mf b/ide/xml.retriever/manifest.mf
index 84b9204..d8a3055 100644
--- a/ide/xml.retriever/manifest.mf
+++ b/ide/xml.retriever/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module: org.netbeans.modules.xml.retriever/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/retriever/Bundle.properties
diff --git a/ide/xml.schema.completion/manifest.mf b/ide/xml.schema.completion/manifest.mf
index 1d3a11c..deb20dc 100644
--- a/ide/xml.schema.completion/manifest.mf
+++ b/ide/xml.schema.completion/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.xml.schema.completion
OpenIDE-Module-Layer: org/netbeans/modules/xml/schema/completion/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/schema/completion/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: false
diff --git a/ide/xml.schema.model/nbproject/project.properties b/ide/xml.schema.model/nbproject/project.properties
index 24388f3..478017b 100644
--- a/ide/xml.schema.model/nbproject/project.properties
+++ b/ide/xml.schema.model/nbproject/project.properties
@@ -21,7 +21,7 @@
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.49.0
+spec.version.base=1.50.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/ide/xml.tax/nbproject/project.properties b/ide/xml.tax/nbproject/project.properties
index b7c2c17..cbd5975 100644
--- a/ide/xml.tax/nbproject/project.properties
+++ b/ide/xml.tax/nbproject/project.properties
@@ -19,6 +19,6 @@
is.autoload=true
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.61.0
+spec.version.base=1.62.0
# Apache's XNI API - parser implementation used internally by module
xni-impl.jar=${libs.xerces.dir}/modules/ext/xerces-2.8.0.jar
diff --git a/ide/xml.text.obsolete90/nbproject/project.properties b/ide/xml.text.obsolete90/nbproject/project.properties
index 4e880d9..6c4ee44 100644
--- a/ide/xml.text.obsolete90/nbproject/project.properties
+++ b/ide/xml.text.obsolete90/nbproject/project.properties
@@ -18,4 +18,4 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.17.0
+spec.version.base=1.18.0
diff --git a/ide/xml.text/nbproject/project.properties b/ide/xml.text/nbproject/project.properties
index c43205b..184a139 100644
--- a/ide/xml.text/nbproject/project.properties
+++ b/ide/xml.text/nbproject/project.properties
@@ -27,5 +27,5 @@
test.config.stableBTD.excludes=\
org/netbeans/modules/xml/text/completion/CompletionJTest.class,\
org/netbeans/modules/xml/text/syntax/ColoringTest.class
-spec.version.base=1.76.0
+spec.version.base=1.77.0
diff --git a/ide/xml.tools/manifest.mf b/ide/xml.tools/manifest.mf
index 4575650..7b233dd 100644
--- a/ide/xml.tools/manifest.mf
+++ b/ide/xml.tools/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tools/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/xml/tools/resources/mf-layer.xml
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.60
+OpenIDE-Module-Specification-Version: 1.61
diff --git a/ide/xml.wsdl.model/nbproject/project.properties b/ide/xml.wsdl.model/nbproject/project.properties
index 45733a2..a9516c4 100644
--- a/ide/xml.wsdl.model/nbproject/project.properties
+++ b/ide/xml.wsdl.model/nbproject/project.properties
@@ -20,7 +20,7 @@
is.autoload=true
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.50.0
+spec.version.base=1.51.0
release.external/generated-wsdl-xsd-2004.08.24.jar=modules/ext/generated-wsdl-xsd-2004.08.24.jar
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/xml.xam/nbproject/project.properties b/ide/xml.xam/nbproject/project.properties
index 3670d2d..f2220e9 100644
--- a/ide/xml.xam/nbproject/project.properties
+++ b/ide/xml.xam/nbproject/project.properties
@@ -21,6 +21,6 @@
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.49.0
+spec.version.base=1.50.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/ide/xml.xdm/nbproject/project.properties b/ide/xml.xdm/nbproject/project.properties
index a247080..b6a5367 100644
--- a/ide/xml.xdm/nbproject/project.properties
+++ b/ide/xml.xdm/nbproject/project.properties
@@ -20,7 +20,7 @@
is.autoload=true
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.51.0
+spec.version.base=1.52.0
test.unit.jvmargs=-Xmx128m
xtest.jvm.args=-Xmx128m
diff --git a/ide/xml/manifest.mf b/ide/xml/manifest.mf
index 27c176e..3e051b6 100644
--- a/ide/xml/manifest.mf
+++ b/ide/xml/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Install: org/netbeans/modules/xml/CoreModuleInstall.class
OpenIDE-Module-Layer: org/netbeans/modules/xml/resources/mf-layer.xml
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/ide/xsl/manifest.mf b/ide/xsl/manifest.mf
index 25b48cd..d584c7c 100644
--- a/ide/xsl/manifest.mf
+++ b/ide/xsl/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Layer: org/netbeans/modules/xsl/resources/mf-layer.xml
OpenIDE-Module-Requires: org.openide.util.HttpServer$Impl
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
diff --git a/java/ant.browsetask/manifest.mf b/java/ant.browsetask/manifest.mf
index 2990ffe..586681c 100644
--- a/java/ant.browsetask/manifest.mf
+++ b/java/ant.browsetask/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ant.browsetask
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/browsetask/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/java/ant.debugger/nbproject/project.properties b/java/ant.debugger/nbproject/project.properties
index e6bbcb2..af00462 100644
--- a/java/ant.debugger/nbproject/project.properties
+++ b/java/ant.debugger/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.54.0
+spec.version.base=1.55.0
test.unit.run.cp.extra=${tools.jar}
# Make the debugger find it, even if it is not on the startup debug classpath:
# (note: first entry is for accuracy in case you customize it; second for convenience)
diff --git a/java/ant.freeform/manifest.mf b/java/ant.freeform/manifest.mf
index fdfa0f3..5be227b 100644
--- a/java/ant.freeform/manifest.mf
+++ b/java/ant.freeform/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ant.freeform/1
-OpenIDE-Module-Specification-Version: 1.63
+OpenIDE-Module-Specification-Version: 1.64
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/freeform/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/ant/freeform/resources/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/ant.grammar/manifest.mf b/java/ant.grammar/manifest.mf
index 3d6c55a..be44684 100644
--- a/java/ant.grammar/manifest.mf
+++ b/java/ant.grammar/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ant.grammar/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/grammar/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
diff --git a/java/ant.hints/manifest.mf b/java/ant.hints/manifest.mf
index 5bb57bb..d8a12e6 100644
--- a/java/ant.hints/manifest.mf
+++ b/java/ant.hints/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ant.hints/1
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.12
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/hints/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/ant/hints/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/ant.kit/manifest.mf b/java/ant.kit/manifest.mf
index f5a867c..675192f 100644
--- a/java/ant.kit/manifest.mf
+++ b/java/ant.kit/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ant/kit/Bundle.properties
OpenIDE-Module-Requires: BuildActions
OpenIDE-Module-Recommends: org.netbeans.modules.testng.ant.AntTestNGSupport,org.netbeans.modules.junit.ant.JUnitAntLogger,org.netbeans.modules.junit.ant.ui.AntJUnitManagerProvider
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/java/api.debugger.jpda/manifest.mf b/java/api.debugger.jpda/manifest.mf
index 1590bf5..f32b011 100644
--- a/java/api.debugger.jpda/manifest.mf
+++ b/java/api.debugger.jpda/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.debugger.jpda/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/debugger/jpda/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.27
+OpenIDE-Module-Specification-Version: 3.28
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
diff --git a/java/api.java/manifest.mf b/java/api.java/manifest.mf
index 55f5ab2..9d0b6dd 100644
--- a/java/api.java/manifest.mf
+++ b/java/api.java/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.java/1
-OpenIDE-Module-Specification-Version: 1.83
+OpenIDE-Module-Specification-Version: 1.84
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/java/queries/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/java/api.maven/manifest.mf b/java/api.maven/manifest.mf
index 3da8f7b..690b350 100644
--- a/java/api.maven/manifest.mf
+++ b/java/api.maven/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.maven
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/maven/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/java/beans/nbproject/project.properties b/java/beans/nbproject/project.properties
index b84a974..1b08f40 100644
--- a/java/beans/nbproject/project.properties
+++ b/java/beans/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.68.0
+spec.version.base=1.69.0
test.config.stable.includes=\
diff --git a/java/classfile/manifest.mf b/java/classfile/manifest.mf
index 3d91200..2cb0aee 100644
--- a/java/classfile/manifest.mf
+++ b/java/classfile/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.classfile/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/classfile/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.69
+OpenIDE-Module-Specification-Version: 1.70
diff --git a/java/dbschema/nbproject/project.properties b/java/dbschema/nbproject/project.properties
index b01665c..4288602 100644
--- a/java/dbschema/nbproject/project.properties
+++ b/java/dbschema/nbproject/project.properties
@@ -17,6 +17,6 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.58.0
+spec.version.base=1.59.0
test.config.stable.includes=**/XMLGraphSerializerTest.class
diff --git a/java/debugger.jpda.ant/manifest.mf b/java/debugger.jpda.ant/manifest.mf
index d4d4dbb..90dcea4d1 100644
--- a/java/debugger.jpda.ant/manifest.mf
+++ b/java/debugger.jpda.ant/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.debugger.jpda.ant
-OpenIDE-Module-Specification-Version: 1.55
+OpenIDE-Module-Specification-Version: 1.56
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ant/Bundle.properties
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
diff --git a/java/debugger.jpda.js/manifest.mf b/java/debugger.jpda.js/manifest.mf
index b52c02c..24de813 100644
--- a/java/debugger.jpda.js/manifest.mf
+++ b/java/debugger.jpda.js/manifest.mf
@@ -2,7 +2,7 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.debugger.jpda.js/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/js/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
org.netbeans.spi.debugger.ui
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
diff --git a/java/debugger.jpda.jsui/manifest.mf b/java/debugger.jpda.jsui/manifest.mf
index 9237459..5310c29 100644
--- a/java/debugger.jpda.jsui/manifest.mf
+++ b/java/debugger.jpda.jsui/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.modules.debugger.jpda.jsui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/jsui/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/jsui/layer.xml
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Requires: org.netbeans.spi.debugger.ui
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
diff --git a/java/debugger.jpda.kit/manifest.mf b/java/debugger.jpda.kit/manifest.mf
index 9a8ae00..2986665 100644
--- a/java/debugger.jpda.kit/manifest.mf
+++ b/java/debugger.jpda.kit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.debugger.jpda.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.kit
diff --git a/java/debugger.jpda.projects/manifest.mf b/java/debugger.jpda.projects/manifest.mf
index 52abee2a..d6fbb27 100644
--- a/java/debugger.jpda.projects/manifest.mf
+++ b/java/debugger.jpda.projects/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/projects/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.spi.debugger.jpda.SourcePathProvider
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
diff --git a/java/debugger.jpda.projectsui/manifest.mf b/java/debugger.jpda.projectsui/manifest.mf
index c94ff3d..b7dc3e9 100644
--- a/java/debugger.jpda.projectsui/manifest.mf
+++ b/java/debugger.jpda.projectsui/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/projectsui/resources/mf-layer.xml
OpenIDE-Module-Provides: org.netbeans.spi.debugger.jpda.EditorContext
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/java/debugger.jpda.truffle/manifest.mf b/java/debugger.jpda.truffle/manifest.mf
index 2df2427..6820dd8 100644
--- a/java/debugger.jpda.truffle/manifest.mf
+++ b/java/debugger.jpda.truffle/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.modules.debugger.jpda.truffle/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/truffle/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/truffle/layer.xml
-OpenIDE-Module-Specification-Version: 1.14
+OpenIDE-Module-Specification-Version: 1.15
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.truffle
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
org.netbeans.spi.debugger.ui
diff --git a/java/debugger.jpda.trufflenode/manifest.mf b/java/debugger.jpda.trufflenode/manifest.mf
index 3740f3c..c769982 100644
--- a/java/debugger.jpda.trufflenode/manifest.mf
+++ b/java/debugger.jpda.trufflenode/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.debugger.jpda.trufflenode/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/truffle/node/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.14
+OpenIDE-Module-Specification-Version: 1.15
OpenIDE-Module-Recommends: org.netbeans.modules.debugger.jpda.truffle
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
diff --git a/java/debugger.jpda.ui/manifest.mf b/java/debugger.jpda.ui/manifest.mf
index 47b826e..a5bbdb4 100644
--- a/java/debugger.jpda.ui/manifest.mf
+++ b/java/debugger.jpda.ui/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.modules.debugger.jpda.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ui/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.71
+OpenIDE-Module-Specification-Version: 1.72
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
org.netbeans.spi.debugger.ui
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.ui
diff --git a/java/debugger.jpda.visual/manifest.mf b/java/debugger.jpda.visual/manifest.mf
index 273b78d..24a4122 100644
--- a/java/debugger.jpda.visual/manifest.mf
+++ b/java/debugger.jpda.visual/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.modules.debugger.jpda.visual/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/visual/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/visual/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
OpenIDE-Module-Requires: org.netbeans.modules.debugger.jpda.ui
OpenIDE-Module-Package-Dependencies: com.sun.jdi[VirtualMachineManager]
diff --git a/java/debugger.jpda/nbproject/project.properties b/java/debugger.jpda/nbproject/project.properties
index 07ff0c2..d72f135 100644
--- a/java/debugger.jpda/nbproject/project.properties
+++ b/java/debugger.jpda/nbproject/project.properties
@@ -23,7 +23,7 @@
javadoc.arch=${basedir}/arch.xml
jpda.classes.dir=${build.dir}/jpda/classes/
requires.nb.javac=true
-spec.version.base=1.125.0
+spec.version.base=1.126.0
test-unit-sys-prop.test.dir.src=${basedir}/test/unit/src/
test-unit-sys-prop.netbeans.user=${basedir}/work/nb_user_dir
test.unit.cp.extra=../java.source.nbjavac/build/test-nb-javac/cluster/modules/org-netbeans-modules-java-source-nbjavac-test.jar
diff --git a/java/editor.htmlui/manifest.mf b/java/editor.htmlui/manifest.mf
index 080d85e..243061d 100644
--- a/java/editor.htmlui/manifest.mf
+++ b/java/editor.htmlui/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.editor.htmlui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/htmlui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.16
+OpenIDE-Module-Specification-Version: 1.17
diff --git a/java/form.kit/manifest.mf b/java/form.kit/manifest.mf
index 1d8b4f9..c380b31 100644
--- a/java/form.kit/manifest.mf
+++ b/java/form.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.form.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/form/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/java/form.nb/nbproject/project.properties b/java/form.nb/nbproject/project.properties
index a84a25e..ae7627b 100644
--- a/java/form.nb/nbproject/project.properties
+++ b/java/form.nb/nbproject/project.properties
@@ -17,5 +17,5 @@
is.eager=true
javac.source=1.8
-spec.version.base=0.35.0
+spec.version.base=0.36.0
requires.nb.javac=true
diff --git a/java/form.refactoring/nbproject/project.properties b/java/form.refactoring/nbproject/project.properties
index 81e49eb..a84a25e 100644
--- a/java/form.refactoring/nbproject/project.properties
+++ b/java/form.refactoring/nbproject/project.properties
@@ -17,5 +17,5 @@
is.eager=true
javac.source=1.8
-spec.version.base=0.34.0
+spec.version.base=0.35.0
requires.nb.javac=true
diff --git a/java/form/nbproject/project.properties b/java/form/nbproject/project.properties
index aa63604..adb96c6 100644
--- a/java/form/nbproject/project.properties
+++ b/java/form/nbproject/project.properties
@@ -18,7 +18,7 @@
extra.module.files=modules/ext/AbsoluteLayout.jar
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.74.0
+spec.version.base=1.75.0
test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0
jnlp.verify.excludes=sources/org/netbeans/lib/awtextra/AbsoluteLayout.java,sources/org/netbeans/lib/awtextra/AbsoluteConstraints.java,sources/readme.txt
diff --git a/java/gradle.htmlui/manifest.mf b/java/gradle.htmlui/manifest.mf
index 2d5398e..acdbcfb 100644
--- a/java/gradle.htmlui/manifest.mf
+++ b/java/gradle.htmlui/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/gradle/htmlui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/htmlui/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.modules.debugger.jpda.ui
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
diff --git a/java/gradle.java.coverage/manifest.mf b/java/gradle.java.coverage/manifest.mf
index 19a97e1..4b7645c 100644
--- a/java/gradle.java.coverage/manifest.mf
+++ b/java/gradle.java.coverage/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle.java.coverage
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/java/coverage/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/java/gradle.java/manifest.mf b/java/gradle.java/manifest.mf
index e378d4e..2b2d6e8 100644
--- a/java/gradle.java/manifest.mf
+++ b/java/gradle.java/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.gradle.java
OpenIDE-Module-Layer: org/netbeans/modules/gradle/java/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/java/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
diff --git a/java/gradle.kit/manifest.mf b/java/gradle.kit/manifest.mf
index e5b8c65..06735a2 100644
--- a/java/gradle.kit/manifest.mf
+++ b/java/gradle.kit/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.gradle.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/feature/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13
+OpenIDE-Module-Specification-Version: 1.14
diff --git a/java/gradle.persistence/manifest.mf b/java/gradle.persistence/manifest.mf
index 0e99bc0..79fb15b 100644
--- a/java/gradle.persistence/manifest.mf
+++ b/java/gradle.persistence/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle.persistence
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/persistence/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13
+OpenIDE-Module-Specification-Version: 1.14
diff --git a/java/gradle.spring/manifest.mf b/java/gradle.spring/manifest.mf
index d859432..44a0782 100644
--- a/java/gradle.spring/manifest.mf
+++ b/java/gradle.spring/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.gradle.spring
OpenIDE-Module-Layer: org/netbeans/modules/gradle/spring/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/spring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13
+OpenIDE-Module-Specification-Version: 1.14
diff --git a/java/gradle.test/manifest.mf b/java/gradle.test/manifest.mf
index 2d11a61..751c26a 100644
--- a/java/gradle.test/manifest.mf
+++ b/java/gradle.test/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.gradle.test
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gradle/test/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.13
+OpenIDE-Module-Specification-Version: 1.14
diff --git a/java/hudson.ant/manifest.mf b/java/hudson.ant/manifest.mf
index 6136087..9e72c0e 100644
--- a/java/hudson.ant/manifest.mf
+++ b/java/hudson.ant/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/ant/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
diff --git a/java/hudson.maven/manifest.mf b/java/hudson.maven/manifest.mf
index fe93de9..34c2367 100644
--- a/java/hudson.maven/manifest.mf
+++ b/java/hudson.maven/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.hudson.maven
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/maven/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/java/i18n.form/nbproject/project.properties b/java/i18n.form/nbproject/project.properties
index 05bd444..bde8dba 100644
--- a/java/i18n.form/nbproject/project.properties
+++ b/java/i18n.form/nbproject/project.properties
@@ -17,6 +17,6 @@
is.eager=true
javac.source=1.8
-spec.version.base=1.67.0
+spec.version.base=1.68.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/java/i18n/manifest.mf b/java/i18n/manifest.mf
index 7be63d2..41992aa 100644
--- a/java/i18n/manifest.mf
+++ b/java/i18n/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.i18n/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/i18n/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.70
+OpenIDE-Module-Specification-Version: 1.71
OpenIDE-Module-Layer: org/netbeans/modules/i18n/Layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/j2ee.core.utilities/manifest.mf b/java/j2ee.core.utilities/manifest.mf
index 4982e6b..71cb89f 100644
--- a/java/j2ee.core.utilities/manifest.mf
+++ b/java/j2ee.core.utilities/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.core.utilities/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/core/utilities/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/java/j2ee.eclipselink/manifest.mf b/java/j2ee.eclipselink/manifest.mf
index d7cd313..e1c0d92 100644
--- a/java/j2ee.eclipselink/manifest.mf
+++ b/java/j2ee.eclipselink/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/eclipselink/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/eclipselink/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/java/j2ee.eclipselinkmodelgen/manifest.mf b/java/j2ee.eclipselinkmodelgen/manifest.mf
index d3f4780..fa48ad2 100644
--- a/java/j2ee.eclipselinkmodelgen/manifest.mf
+++ b/java/j2ee.eclipselinkmodelgen/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/eclipselinkmodelgen/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/eclipselinkmodelgen/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/java/j2ee.jpa.refactoring/manifest.mf b/java/j2ee.jpa.refactoring/manifest.mf
index ce3e301..e464574 100644
--- a/java/j2ee.jpa.refactoring/manifest.mf
+++ b/java/j2ee.jpa.refactoring/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.jpa.refactoring
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/jpa/refactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: false
diff --git a/java/j2ee.jpa.verification/manifest.mf b/java/j2ee.jpa.verification/manifest.mf
index c38531c..c390020 100644
--- a/java/j2ee.jpa.verification/manifest.mf
+++ b/java/j2ee.jpa.verification/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.jpa.verification
OpenIDE-Module-Layer: org/netbeans/modules/j2ee/jpa/verification/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/jpa/verification/Bundle.properties
AutoUpdate-Show-In-Client: false
diff --git a/java/j2ee.metadata.model.support/manifest.mf b/java/j2ee.metadata.model.support/manifest.mf
index 7332111..306bcc8 100644
--- a/java/j2ee.metadata.model.support/manifest.mf
+++ b/java/j2ee.metadata.model.support/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.metadata.model.support/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/metadata/model/support/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: false
diff --git a/java/j2ee.metadata/manifest.mf b/java/j2ee.metadata/manifest.mf
index 72b0897..336b041 100644
--- a/java/j2ee.metadata/manifest.mf
+++ b/java/j2ee.metadata/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.metadata/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/metadata/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
AutoUpdate-Show-In-Client: false
diff --git a/java/j2ee.persistence.kit/manifest.mf b/java/j2ee.persistence.kit/manifest.mf
index 270ffad..f08ee75 100644
--- a/java/j2ee.persistence.kit/manifest.mf
+++ b/java/j2ee.persistence.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.j2ee.persistence.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/j2ee/persistence/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/java/j2ee.persistence/nbproject/project.properties b/java/j2ee.persistence/nbproject/project.properties
index 0076069..2e73676 100644
--- a/java/j2ee.persistence/nbproject/project.properties
+++ b/java/j2ee.persistence/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.72.0
+spec.version.base=1.73.0
test.unit.run.cp.extra=\
${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.10.jar:\
diff --git a/java/j2ee.persistenceapi/nbproject/project.properties b/java/j2ee.persistenceapi/nbproject/project.properties
index cba9d0b..ec8347f 100644
--- a/java/j2ee.persistenceapi/nbproject/project.properties
+++ b/java/j2ee.persistenceapi/nbproject/project.properties
@@ -22,7 +22,7 @@
javadoc.apichanges=${basedir}/apichanges.xml
requires.nb.javac=true
-spec.version.base=1.53.0
+spec.version.base=1.54.0
test.unit.cp.extra=\
${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.core-2.7.10.jar:\
${j2ee.persistence.dir}/modules/ext/eclipselink/org.eclipse.persistence.asm-9.2.0.jar:\
diff --git a/java/java.api.common/manifest.mf b/java/java.api.common/manifest.mf
index 6090c5d..acba1aa 100644
--- a/java/java.api.common/manifest.mf
+++ b/java/java.api.common/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.api.common/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/api/common/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.140
+OpenIDE-Module-Specification-Version: 1.141
diff --git a/java/java.completion/nbproject/project.properties b/java/java.completion/nbproject/project.properties
index fe06807..5b51152 100644
--- a/java/java.completion/nbproject/project.properties
+++ b/java/java.completion/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.2.0
+spec.version.base=2.3.0
#test configs
test.config.jet-main.includes=\
diff --git a/java/java.debug/nbproject/project.properties b/java/java.debug/nbproject/project.properties
index 20a83de..a94746e 100644
--- a/java/java.debug/nbproject/project.properties
+++ b/java/java.debug/nbproject/project.properties
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
javac.source=1.7
-spec.version.base=1.55.0
+spec.version.base=1.56.0
requires.nb.javac=true
diff --git a/java/java.disco/manifest.mf b/java/java.disco/manifest.mf
index 6b17d32..e190861 100644
--- a/java/java.disco/manifest.mf
+++ b/java/java.disco/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/java/disco/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/disco/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.java.platform.ui
-OpenIDE-Module-Specification-Version: 2.1
+OpenIDE-Module-Specification-Version: 2.2
OpenIDE-Module-Java-Dependencies: Java > 11
diff --git a/java/java.editor.base/nbproject/project.properties b/java/java.editor.base/nbproject/project.properties
index 81c568d..a4533d2 100644
--- a/java/java.editor.base/nbproject/project.properties
+++ b/java/java.editor.base/nbproject/project.properties
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-spec.version.base=2.82.0
+spec.version.base=2.83.0
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
diff --git a/java/java.editor/nbproject/project.properties b/java/java.editor/nbproject/project.properties
index b236eae..fbe3998 100644
--- a/java/java.editor/nbproject/project.properties
+++ b/java/java.editor/nbproject/project.properties
@@ -17,7 +17,7 @@
javadoc.title=Java Editor
-spec.version.base=2.85.0
+spec.version.base=2.86.0
test.qa-functional.cp.extra=${editor.dir}/modules/org-netbeans-modules-editor-fold.jar
javac.source=1.8
#test.unit.cp.extra=
diff --git a/java/java.examples/manifest.mf b/java/java.examples/manifest.mf
index 193adc3..4d4bf6d 100644
--- a/java/java.examples/manifest.mf
+++ b/java/java.examples/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.examples/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/examples/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.53
+OpenIDE-Module-Specification-Version: 1.54
OpenIDE-Module-Layer: org/netbeans/modules/java/examples/resources/mf-layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/java.freeform/manifest.mf b/java/java.freeform/manifest.mf
index 72f6d0d..89aaa42 100644
--- a/java/java.freeform/manifest.mf
+++ b/java/java.freeform/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.freeform/1
-OpenIDE-Module-Specification-Version: 1.60
+OpenIDE-Module-Specification-Version: 1.61
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/java.graph/manifest.mf b/java/java.graph/manifest.mf
index db74179..1d22158 100644
--- a/java/java.graph/manifest.mf
+++ b/java/java.graph/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.java.graph/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/graph/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/java/java.guards/manifest.mf b/java/java.guards/manifest.mf
index 49484dd..97609da 100644
--- a/java/java.guards/manifest.mf
+++ b/java/java.guards/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/java/guards/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/guards/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.api.editor.guards.Java
-OpenIDE-Module-Specification-Version: 0.48
+OpenIDE-Module-Specification-Version: 0.49
diff --git a/java/java.hints.declarative.test/nbproject/project.properties b/java/java.hints.declarative.test/nbproject/project.properties
index 4f54ce8..674d5bd 100644
--- a/java/java.hints.declarative.test/nbproject/project.properties
+++ b/java/java.hints.declarative.test/nbproject/project.properties
@@ -17,5 +17,5 @@
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.33.0
+spec.version.base=1.34.0
javadoc.arch=${basedir}/arch.xml
diff --git a/java/java.hints.declarative/nbproject/project.properties b/java/java.hints.declarative/nbproject/project.properties
index bd70989..5e80fa7 100644
--- a/java/java.hints.declarative/nbproject/project.properties
+++ b/java/java.hints.declarative/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.37.0
+spec.version.base=1.38.0
requires.nb.javac=true
test.config.stableBTD.includes=**/*Test.class
diff --git a/java/java.hints.legacy.spi/nbproject/project.properties b/java/java.hints.legacy.spi/nbproject/project.properties
index 463509b..a1c0b6d 100644
--- a/java/java.hints.legacy.spi/nbproject/project.properties
+++ b/java/java.hints.legacy.spi/nbproject/project.properties
@@ -17,6 +17,6 @@
is.autoload=true
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.33.0
+spec.version.base=1.34.0
javadoc.arch=${basedir}/arch.xml
requires.nb.javac=true
diff --git a/java/java.hints.test/nbproject/project.properties b/java/java.hints.test/nbproject/project.properties
index 895bd72..cacc59a 100644
--- a/java/java.hints.test/nbproject/project.properties
+++ b/java/java.hints.test/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.36.0
+spec.version.base=1.37.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
requires.nb.javac=true
diff --git a/java/java.hints.ui/nbproject/project.properties b/java/java.hints.ui/nbproject/project.properties
index 0a12f5b..b93ba74 100644
--- a/java/java.hints.ui/nbproject/project.properties
+++ b/java/java.hints.ui/nbproject/project.properties
@@ -16,5 +16,5 @@
# under the License.
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.35.0
+spec.version.base=1.36.0
requires.nb.javac=true
diff --git a/java/java.hints/nbproject/project.properties b/java/java.hints/nbproject/project.properties
index 308b92b..e87aebd 100644
--- a/java/java.hints/nbproject/project.properties
+++ b/java/java.hints/nbproject/project.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-spec.version.base=1.100.0
+spec.version.base=1.101.0
javac.source=1.8
diff --git a/java/java.j2sedeploy/manifest.mf b/java/java.j2sedeploy/manifest.mf
index d68e977..4e2229c 100644
--- a/java/java.j2sedeploy/manifest.mf
+++ b/java/java.j2sedeploy/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.j2sedeploy
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/j2sedeploy/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.29
+OpenIDE-Module-Specification-Version: 1.30
AutoUpdate-Show-In-Client: false
diff --git a/java/java.j2seembedded/manifest.mf b/java/java.j2seembedded/manifest.mf
index 8c77817..f18eb37 100644
--- a/java/java.j2seembedded/manifest.mf
+++ b/java/java.j2seembedded/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.java.j2seembedded
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/j2seembedded/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/java/j2seembedded/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.26
+OpenIDE-Module-Specification-Version: 1.27
diff --git a/java/java.j2semodule/manifest.mf b/java/java.j2semodule/manifest.mf
index d720092..e9482a5 100644
--- a/java/java.j2semodule/manifest.mf
+++ b/java/java.j2semodule/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.java.j2semodule
OpenIDE-Module-Layer: org/netbeans/modules/java/j2semodule/ui/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/j2semodule/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
diff --git a/java/java.j2seplatform/manifest.mf b/java/java.j2seplatform/manifest.mf
index f3d5006..3477bd7 100644
--- a/java/java.j2seplatform/manifest.mf
+++ b/java/java.j2seplatform/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/java/j2seplatform/resources/layer.xml
OpenIDE-Module-Install: org/netbeans/modules/java/j2seplatform/J2SEPlatformModule.class
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.60
+OpenIDE-Module-Specification-Version: 1.61
OpenIDE-Module-Provides: j2seplatform
diff --git a/java/java.j2seprofiles/manifest.mf b/java/java.j2seprofiles/manifest.mf
index c550c9d..1202657 100644
--- a/java/java.j2seprofiles/manifest.mf
+++ b/java/java.j2seprofiles/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.java.j2seprofiles
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/j2seprofiles/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
diff --git a/java/java.j2seproject/nbproject/project.properties b/java/java.j2seproject/nbproject/project.properties
index 20abc5d..91c9787 100644
--- a/java/java.j2seproject/nbproject/project.properties
+++ b/java/java.j2seproject/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
-spec.version.base=1.104.0
+spec.version.base=1.105.0
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/java/java.kit/manifest.mf b/java/java.kit/manifest.mf
index aad5a35..ac292a0 100644
--- a/java/java.kit/manifest.mf
+++ b/java/java.kit/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
OpenIDE-Module-Recommends: org.netbeans.modules.profiler,
org.netbeans.modules.debugger.jpda.kit,org.netbeans.modules.selenium2.java
OpenIDE-Module-Layer: org/netbeans/modules/java/kit/layer.xml
diff --git a/java/java.lexer/manifest.mf b/java/java.lexer/manifest.mf
index 898b714..de1f280 100644
--- a/java/java.lexer/manifest.mf
+++ b/java/java.lexer/manifest.mf
@@ -1,5 +1,5 @@
OpenIDE-Module: org.netbeans.modules.java.lexer/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/java/lexer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
OpenIDE-Module-Layer: org/netbeans/lib/java/lexer/layer.xml
diff --git a/java/java.lsp.server/nbcode/integration/nbproject/project.xml b/java/java.lsp.server/nbcode/integration/nbproject/project.xml
index b88fd78..557d411 100644
--- a/java/java.lsp.server/nbcode/integration/nbproject/project.xml
+++ b/java/java.lsp.server/nbcode/integration/nbproject/project.xml
@@ -27,6 +27,14 @@
<suite-component/>
<module-dependencies>
<dependency>
+ <code-name-base>com.google.gson</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>2.8.9</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.api.debugger</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -52,6 +60,15 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.api.lsp</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.11</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.api.progress</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -77,12 +94,38 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.modules.cloud.oracle</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <implementation-version/>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.java.lsp.server</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
- <specification-version>2.0</specification-version>
+ <implementation-version/>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.parsing.api</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>9.24.0.8</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
+ <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.87</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -102,6 +145,12 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.swing.laf.flatlaf</code-name-base>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.openide.awt</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -118,6 +167,14 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.openide.filesystems</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>9.29</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.openide.loaders</code-name-base>
<build-prerequisite/>
<compile-dependency/>
@@ -157,21 +214,6 @@
<specification-version>9.24</specification-version>
</run-dependency>
</dependency>
- <dependency>
- <code-name-base>org.netbeans.swing.laf.flatlaf</code-name-base>
- <run-dependency>
- <specification-version>1.0</specification-version>
- </run-dependency>
- </dependency>
- <dependency>
- <code-name-base>org.netbeans.api.lsp</code-name-base>
- <build-prerequisite/>
- <compile-dependency/>
- <run-dependency>
- <release-version>1</release-version>
- <specification-version>1.11</specification-version>
- </run-dependency>
- </dependency>
</module-dependencies>
<test-dependencies>
<test-type>
diff --git a/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectAuditCommand.java b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectAuditCommand.java
new file mode 100644
index 0000000..df21d4d
--- /dev/null
+++ b/java/java.lsp.server/nbcode/integration/src/org/netbeans/modules/nbcode/integration/commands/ProjectAuditCommand.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.nbcode.integration.commands;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import org.eclipse.lsp4j.CodeAction;
+import org.eclipse.lsp4j.CodeActionParams;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectInformation;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.modules.cloud.oracle.adm.ProjectVulnerability;
+import org.netbeans.modules.java.lsp.server.protocol.CodeActionsProvider;
+import org.netbeans.modules.java.lsp.server.protocol.NbCodeLanguageClient;
+import org.netbeans.modules.parsing.api.ResultIterator;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.filesystems.URLMapper;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ *
+ * @author sdedic
+ */
+@ServiceProvider(service = CodeActionsProvider.class)
+public class ProjectAuditCommand extends CodeActionsProvider {
+ /**
+ * Force executes the project audit using the supplied compartment and knowledgebase IDs.
+ */
+ private static final String COMMAND_EXECUTE_AUDIT = "nbls.gcn.projectAudit.execute"; // NOI18N
+
+ /**
+ * Displays the audit from the Knowledgebase and compartment.
+ */
+ private static final String COMMAND_LOAD_AUDIT = "nbls.gcn.projectAudit.display"; // NOI18N
+
+ public static final Set<String> COMMANDS = new HashSet<>(Arrays.asList(
+ COMMAND_EXECUTE_AUDIT,
+ COMMAND_LOAD_AUDIT
+ ));
+
+ @Override
+ public List<CodeAction> getCodeActions(ResultIterator resultIterator, CodeActionParams params) throws Exception {
+ return Collections.emptyList();
+ }
+
+ private final Gson gson = new Gson();
+
+ @Override
+ public CompletableFuture<Object> processCommand(NbCodeLanguageClient client, String command, List<Object> arguments) {
+ if (arguments.size() < 3) {
+ throw new IllegalArgumentException("Expected 3 parameters: resource, compartment, knowledgebase");
+ }
+
+ FileObject f = null;
+ String s = "";
+ if (arguments.get(0) instanceof JsonPrimitive) {
+ s = ((JsonPrimitive)arguments.get(0)).getAsString();
+ try {
+ URI uri = new URI(s);
+ f = URLMapper.findFileObject(uri.toURL());
+ } catch (URISyntaxException | MalformedURLException ex) {
+ f = FileUtil.toFileObject(new File(s));
+ }
+ } else {
+ // accept something that looks like vscode.Uri structure
+ JsonObject executeOn = gson.fromJson(gson.toJson(arguments.get(0)), JsonObject.class);
+ if (executeOn.has("fsPath")) {
+ s = executeOn.get("fsPath").getAsString();
+ f = FileUtil.toFileObject(new File(s));
+ }
+ }
+ if (f == null) {
+ throw new IllegalArgumentException("Invalid path specified: " + s);
+ }
+ Project p = FileOwnerQuery.getOwner(f);
+ if (p == null) {
+ throw new IllegalArgumentException("Not part of a project " + s);
+ }
+ ProjectVulnerability v = p.getLookup().lookup(ProjectVulnerability.class);
+ ProjectInformation pi = ProjectUtils.getInformation(p);
+ String n = pi.getDisplayName();
+ if (n == null) {
+ n = pi.getName();
+ }
+ if (n == null) {
+ n = p.getProjectDirectory().getName();
+ }
+ if (v == null) {
+ throw new IllegalArgumentException("Project " + n + " does not support vulnerability audits");
+ }
+ if (arguments.size() < 3) {
+ throw new IllegalArgumentException("Expected 3 parameters: resource, compartment, knowledgebase");
+ }
+ String compartment = ((JsonPrimitive) arguments.get(2)).getAsString();
+ String knowledgeBase = ((JsonPrimitive) arguments.get(1)).getAsString();
+
+ return v.findKnowledgeBase(compartment, knowledgeBase).thenCompose((kb) -> {
+ if (kb == null) {
+ throw new IllegalArgumentException("Unknown Knowledgebase " + knowledgeBase);
+ }
+
+ switch (command) {
+ case COMMAND_EXECUTE_AUDIT:
+ v.runProjectAudit(kb, true);
+ break;
+ case COMMAND_LOAD_AUDIT:
+ v.runProjectAudit(kb, false);
+ break;
+ default:
+
+ }
+ return CompletableFuture.completedFuture(null);
+ });
+ }
+
+ @Override
+ public Set<String> getCommands() {
+ return COMMANDS;
+ }
+}
diff --git a/java/java.lsp.server/nbproject/project.properties b/java/java.lsp.server/nbproject/project.properties
index ab68de8..31f566f 100644
--- a/java/java.lsp.server/nbproject/project.properties
+++ b/java/java.lsp.server/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.0.0
+spec.version.base=2.1.0
javadoc.arch=${basedir}/arch.xml
requires.nb.javac=true
lsp.build.dir=vscode/nbcode
diff --git a/java/java.lsp.server/vscode/package.json b/java/java.lsp.server/vscode/package.json
index 6eb4935..7658d06 100644
--- a/java/java.lsp.server/vscode/package.json
+++ b/java/java.lsp.server/vscode/package.json
@@ -75,7 +75,7 @@
{
"id": "cloud.resources",
"name": "Cloud",
- "when": "nbJavaLSReady"
+ "when": "nbJavaLSReady && config.netbeans.javaSupport.enabled"
},
{
"id": "run-config",
diff --git a/java/java.lsp.server/vscode/src/extension.ts b/java/java.lsp.server/vscode/src/extension.ts
index 37a7079..0bbe6da 100644
--- a/java/java.lsp.server/vscode/src/extension.ts
+++ b/java/java.lsp.server/vscode/src/extension.ts
@@ -307,7 +307,7 @@
if (DISABLE_EXTENSION === selected) {
vscode.commands.executeCommand('workbench.extensions.action.showInstalledExtensions');
} else if (DISABLE_JAVA === selected) {
- conf.update("netbeans.javaSupport.enabled", true, false);
+ conf.update("netbeans.javaSupport.enabled", false, true);
}
});
}
@@ -963,7 +963,9 @@
}
createDatabaseView(c);
- c.findTreeViewService().createView('cloud.resources', undefined, { canSelectMany : false });
+ if (enableJava) {
+ c.findTreeViewService().createView('cloud.resources', undefined, { canSelectMany : false });
+ }
}).catch(setClient[1]);
}).catch((reason) => {
activationPending = false;
diff --git a/java/java.metrics/manifest.mf b/java/java.metrics/manifest.mf
index 335837c..baaec9b 100644
--- a/java/java.metrics/manifest.mf
+++ b/java/java.metrics/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.java.metrics
OpenIDE-Module-Layer: org/netbeans/modules/java/metrics/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/metrics/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
AutoUpdate-Show-In-Client: false
diff --git a/java/java.module.graph/manifest.mf b/java/java.module.graph/manifest.mf
index 8644d9a..40e24e2 100644
--- a/java/java.module.graph/manifest.mf
+++ b/java/java.module.graph/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.java.module.graph
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/module/graph/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/java/java.mx.project/manifest.mf b/java/java.mx.project/manifest.mf
index be8b4fa..5f56232 100644
--- a/java/java.mx.project/manifest.mf
+++ b/java/java.mx.project/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.java.mx.project
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/mx/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.6
+OpenIDE-Module-Specification-Version: 1.7
diff --git a/java/java.nativeimage.debugger/manifest.mf b/java/java.nativeimage.debugger/manifest.mf
index fcf2b51..9ab54b7 100644
--- a/java/java.nativeimage.debugger/manifest.mf
+++ b/java/java.nativeimage.debugger/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.java.nativeimage.debugger/0
OpenIDE-Module-Layer: org/netbeans/modules/java/nativeimage/debugger/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/nativeimage/debugger/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.7
+OpenIDE-Module-Specification-Version: 0.8
diff --git a/java/java.navigation/manifest.mf b/java/java.navigation/manifest.mf
index b315fed..7b9c1be 100644
--- a/java/java.navigation/manifest.mf
+++ b/java/java.navigation/manifest.mf
@@ -3,6 +3,6 @@
OpenIDE-Module-Layer: org/netbeans/modules/java/navigation/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/navigation/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
AutoUpdate-Show-In-Client: false
diff --git a/java/java.openjdk.project/manifest.mf b/java/java.openjdk.project/manifest.mf
index c8a4943..503aead 100644
--- a/java/java.openjdk.project/manifest.mf
+++ b/java/java.openjdk.project/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.java.openjdk.project/1
OpenIDE-Module-Layer: org/netbeans/modules/java/openjdk/project/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/openjdk/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.14
+OpenIDE-Module-Specification-Version: 1.15
diff --git a/java/java.platform.ui/manifest.mf b/java/java.platform.ui/manifest.mf
index 612f622..6d9113d 100644
--- a/java/java.platform.ui/manifest.mf
+++ b/java/java.platform.ui/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.platform.ui/1
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/platform/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/java/platform/resources/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/java.platform/manifest.mf b/java/java.platform/manifest.mf
index f61465c..5222992 100644
--- a/java/java.platform/manifest.mf
+++ b/java/java.platform/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.platform/1
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/platform/Bundle.properties
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Recommends: org.netbeans.modules.java.platform.ui
diff --git a/java/java.preprocessorbridge/nbproject/project.properties b/java/java.preprocessorbridge/nbproject/project.properties
index 8718517..c0cbbb4 100644
--- a/java/java.preprocessorbridge/nbproject/project.properties
+++ b/java/java.preprocessorbridge/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.compilerargs=-Xlint:unchecked
javac.source=1.8
-spec.version.base=1.66.0
+spec.version.base=1.67.0
javadoc.apichanges=${basedir}/apichanges.xml
requires.nb.javac=true
diff --git a/java/java.project.ui/manifest.mf b/java/java.project.ui/manifest.mf
index d639342..83ecb40 100644
--- a/java/java.project.ui/manifest.mf
+++ b/java/java.project.ui/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module-Layer: org/netbeans/modules/java/project/ui/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/project/ui/Bundle.properties
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.92
+OpenIDE-Module-Specification-Version: 1.93
OpenIDE-Module-Recommends: org.netbeans.spi.java.project.runner.JavaRunnerImplementation
AutoUpdate-Show-In-Client: false
diff --git a/java/java.project/manifest.mf b/java/java.project/manifest.mf
index fb82f11..4d949e0 100644
--- a/java/java.project/manifest.mf
+++ b/java/java.project/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.java.project/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/project/Bundle.properties
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.89
+OpenIDE-Module-Specification-Version: 1.90
AutoUpdate-Show-In-Client: false
diff --git a/java/java.source.ant/nbproject/project.properties b/java/java.source.ant/nbproject/project.properties
index 4014f46..389ae43 100644
--- a/java/java.source.ant/nbproject/project.properties
+++ b/java/java.source.ant/nbproject/project.properties
@@ -17,7 +17,7 @@
ant.jar=${ant.core.lib}
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.48.0
+spec.version.base=1.49.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/java/java.source.base/nbproject/project.properties b/java/java.source.base/nbproject/project.properties
index b135f22..bb2801c 100644
--- a/java/java.source.base/nbproject/project.properties
+++ b/java/java.source.base/nbproject/project.properties
@@ -23,7 +23,7 @@
javadoc.title=Java Source Base
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=2.57.0
+spec.version.base=2.58.0
test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/nb-javac-api.jar
test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
${o.n.core.dir}/lib/boot.jar:\
diff --git a/java/java.source.compat8/manifest.mf b/java/java.source.compat8/manifest.mf
index afe3198..cd29403 100644
--- a/java/java.source.compat8/manifest.mf
+++ b/java/java.source.compat8/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.java.source.compat8
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/source/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.20
+OpenIDE-Module-Specification-Version: 9.21
OpenIDE-Module-Fragment-Host: org.netbeans.modules.java.source.base
diff --git a/java/java.source.queries/manifest.mf b/java/java.source.queries/manifest.mf
index 497d942..10dc902 100644
--- a/java/java.source.queries/manifest.mf
+++ b/java/java.source.queries/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.source.queries
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/source/queries/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.35
+OpenIDE-Module-Specification-Version: 1.36
OpenIDE-Module-Needs: org.netbeans.modules.java.source.queries.spi.QueriesController
Netigso-Export-Package: org.netbeans.modules.java.source.queries.api,org.netbeans.modules.java.source.queries.spi
diff --git a/java/java.source.queriesimpl/manifest.mf b/java/java.source.queriesimpl/manifest.mf
index 76ab11f..8f399c7 100644
--- a/java/java.source.queriesimpl/manifest.mf
+++ b/java/java.source.queriesimpl/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.source.queriesimpl
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/source/queriesimpl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
OpenIDE-Module-Provides: org.netbeans.modules.java.source.queries.spi.QueriesController
diff --git a/java/java.source/nbproject/project.properties b/java/java.source/nbproject/project.properties
index 7226d13..627e2cd 100644
--- a/java/java.source/nbproject/project.properties
+++ b/java/java.source/nbproject/project.properties
@@ -22,7 +22,7 @@
javadoc.title=Java Source
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=0.181.0
+spec.version.base=0.182.0
test.qa-functional.cp.extra=${refactoring.java.dir}/modules/ext/nb-javac-api.jar
test.unit.run.cp.extra=${o.n.core.dir}/core/core.jar:\
${o.n.core.dir}/lib/boot.jar:\
diff --git a/java/java.sourceui/nbproject/project.properties b/java/java.sourceui/nbproject/project.properties
index 205498d..9d2c29d 100644
--- a/java/java.sourceui/nbproject/project.properties
+++ b/java/java.sourceui/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.65.0
+spec.version.base=1.66.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/java/java.testrunner.ant/manifest.mf b/java/java.testrunner.ant/manifest.mf
index b1150f8..5cdf3ea 100644
--- a/java/java.testrunner.ant/manifest.mf
+++ b/java/java.testrunner.ant/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.testrunner.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/testrunner/ant/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
diff --git a/java/java.testrunner.ui/manifest.mf b/java/java.testrunner.ui/manifest.mf
index 1d6404b..6220e85 100644
--- a/java/java.testrunner.ui/manifest.mf
+++ b/java/java.testrunner.ui/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.java.testrunner.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/testrunner/ui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.java.testrunner.ui.api.JavaManager
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
diff --git a/java/java.testrunner/manifest.mf b/java/java.testrunner/manifest.mf
index 1b34ad1..95c388b 100644
--- a/java/java.testrunner/manifest.mf
+++ b/java/java.testrunner/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.java.testrunner
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/testrunner/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
diff --git a/java/javadoc/nbproject/project.properties b/java/javadoc/nbproject/project.properties
index afb1d32..7cd6dcb 100644
--- a/java/javadoc/nbproject/project.properties
+++ b/java/javadoc/nbproject/project.properties
@@ -21,7 +21,7 @@
# requires nb.javac for compiling of tests on Mac
requires.nb.javac=true
-spec.version.base=1.72.0
+spec.version.base=1.73.0
test.config.stableBTD.includes=\
**/hints/AnalyzerTest.class,\
**/search/*Test.class
diff --git a/java/javaee.injection/manifest.mf b/java/javaee.injection/manifest.mf
index da95390..21cc830 100644
--- a/java/javaee.injection/manifest.mf
+++ b/java/javaee.injection/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javaee.injection
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javaee/injection/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
AutoUpdate-Show-In-Client: false
diff --git a/java/javawebstart/manifest.mf b/java/javawebstart/manifest.mf
index 975711e..ee49a75 100644
--- a/java/javawebstart/manifest.mf
+++ b/java/javawebstart/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javawebstart
OpenIDE-Module-Layer: org/netbeans/modules/javawebstart/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javawebstart/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
AutoUpdate-Show-In-Client: false
diff --git a/java/jellytools.java/manifest.mf b/java/jellytools.java/manifest.mf
index 114293a..e9fe984 100644
--- a/java/jellytools.java/manifest.mf
+++ b/java/jellytools.java/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.jellytools.java/3
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jellytools/java/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.47
+OpenIDE-Module-Specification-Version: 3.48
diff --git a/java/jshell.support/nbproject/project.properties b/java/jshell.support/nbproject/project.properties
index bfe0648..74049b8 100644
--- a/java/jshell.support/nbproject/project.properties
+++ b/java/jshell.support/nbproject/project.properties
@@ -17,7 +17,7 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.17.0
+spec.version.base=1.18.0
cp.extra=${tools.jar}
is.eager=true
requires.nb.javac=true
diff --git a/java/junit.ant.ui/manifest.mf b/java/junit.ant.ui/manifest.mf
index aaeccd4..46323c3 100644
--- a/java/junit.ant.ui/manifest.mf
+++ b/java/junit.ant.ui/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.junit.ant.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junit/ant/ui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.junit.ant.ui.AntJUnitManagerProvider
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
diff --git a/java/junit.ant/manifest.mf b/java/junit.ant/manifest.mf
index 7f1de93..73c2095 100644
--- a/java/junit.ant/manifest.mf
+++ b/java/junit.ant/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.junit.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junit/ant/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.junit.ant.JUnitAntLogger
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/java/junit.ui/manifest.mf b/java/junit.ui/manifest.mf
index 6d8b605..74da055 100644
--- a/java/junit.ui/manifest.mf
+++ b/java/junit.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.junit.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junit/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
diff --git a/java/junit/manifest.mf b/java/junit/manifest.mf
index e80debf..600f23e 100644
--- a/java/junit/manifest.mf
+++ b/java/junit/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.junit/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junit/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/junit/resources/layer.xml
-OpenIDE-Module-Specification-Version: 2.91
+OpenIDE-Module-Specification-Version: 2.92
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
AutoUpdate-Show-In-Client: false
diff --git a/java/ko4j.debugging/manifest.mf b/java/ko4j.debugging/manifest.mf
index d0cdfea..a434a92 100644
--- a/java/ko4j.debugging/manifest.mf
+++ b/java/ko4j.debugging/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ko4j.debugging
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ko4j/debugging/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
OpenIDE-Module-Needs: org.netbeans.modules.web.browser.api.PageInspector
OpenIDE-Module-Provides: org.netbeans.modules.ko4j.debugging
diff --git a/java/kotlin.editor/manifest.mf b/java/kotlin.editor/manifest.mf
index eb37d2c..8bd8282 100644
--- a/java/kotlin.editor/manifest.mf
+++ b/java/kotlin.editor/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.kotlin.editor
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/kotlin/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
diff --git a/java/lib.jshell.agent/manifest.mf b/java/lib.jshell.agent/manifest.mf
index 0e85518..686944a 100644
--- a/java/lib.jshell.agent/manifest.mf
+++ b/java/lib.jshell.agent/manifest.mf
@@ -2,7 +2,7 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.lib.jshell.agent
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/jshell/agent/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.16
+OpenIDE-Module-Specification-Version: 1.17
Premain-class: org.netbeans.lib.jshell.agent.NbJShellAgent
Can-Redefine-Classes: true
Can-Retransform-Classes: true
diff --git a/java/lib.nbjavac/nbproject/project.properties b/java/lib.nbjavac/nbproject/project.properties
index 77ef720..80541e5 100644
--- a/java/lib.nbjavac/nbproject/project.properties
+++ b/java/lib.nbjavac/nbproject/project.properties
@@ -17,5 +17,5 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.33.0
+spec.version.base=1.34.0
requires.nb.javac=true
diff --git a/java/lib.nbjshell/manifest.mf b/java/lib.nbjshell/manifest.mf
index a742846..c822f8c 100644
--- a/java/lib.nbjshell/manifest.mf
+++ b/java/lib.nbjshell/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.lib.nbjshell
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/nbjshell/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
OpenIDE-Module-Needs: jshell.implementation
OpenIDE-Module-Needs-Message: NetBeans do not ship implementation of Java Shell. You may run NetBeans with JDK9, which provides one.
diff --git a/java/lib.nbjshell9/manifest.mf b/java/lib.nbjshell9/manifest.mf
index 0f99425..7f800a7 100644
--- a/java/lib.nbjshell9/manifest.mf
+++ b/java/lib.nbjshell9/manifest.mf
@@ -2,7 +2,7 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.lib.nbjshell9
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/nbjshell9/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.16
+OpenIDE-Module-Specification-Version: 1.17
OpenIDE-Module-Provides: jshell.implementation
OpenIDE-Module-Package-Dependencies: [jdk.jshell.JShell]
OpenIDE-Module-Java-Dependencies: Java > 9
diff --git a/java/libs.cglib/manifest.mf b/java/libs.cglib/manifest.mf
index a9f6da0..54262fb 100644
--- a/java/libs.cglib/manifest.mf
+++ b/java/libs.cglib/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.cglib/1
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/cglib/Bundle.properties
diff --git a/java/libs.corba.omgapi/manifest.mf b/java/libs.corba.omgapi/manifest.mf
index 200c37e..04a2b60 100644
--- a/java/libs.corba.omgapi/manifest.mf
+++ b/java/libs.corba.omgapi/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.libs.corba.omgapi
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/corba/omgapi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
diff --git a/java/libs.javacapi/nbproject/project.properties b/java/libs.javacapi/nbproject/project.properties
index 330e09f..a988ae1 100644
--- a/java/libs.javacapi/nbproject/project.properties
+++ b/java/libs.javacapi/nbproject/project.properties
@@ -20,6 +20,6 @@
javadoc.title=Javac API
nbm.homepage=http://jackpot.netbeans.org/
nbm.module.author=Petr Hrebejk
-spec.version.base=8.39.0
+spec.version.base=8.40.0
javadoc.arch=${basedir}/arch.xml
module.javadoc.packages=com.sun.source.tree,com.sun.source.util
diff --git a/java/libs.jshell.compile/nbproject/project.properties b/java/libs.jshell.compile/nbproject/project.properties
index d6de90f..81afd10 100644
--- a/java/libs.jshell.compile/nbproject/project.properties
+++ b/java/libs.jshell.compile/nbproject/project.properties
@@ -21,7 +21,7 @@
javadoc.title=JShell
nbm.homepage=http://www.netbeans.org/
nbm.module.author=Svatopluk Dedic
-spec.version.base=1.23.0
+spec.version.base=1.24.0
javadoc.arch=${basedir}/arch.xml
module.javadoc.packages=
sigtest.skip.check=true
diff --git a/java/libs.nbjavacapi/manifest.mf b/java/libs.nbjavacapi/manifest.mf
index 6adb106..5debd3f 100644
--- a/java/libs.nbjavacapi/manifest.mf
+++ b/java/libs.nbjavacapi/manifest.mf
@@ -2,7 +2,7 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.nbjavacapi
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nbjavac/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 18.1
+OpenIDE-Module-Specification-Version: 18.2
OpenIDE-Module-Hide-Classpath-Packages: com.sun.javadoc.**, com.sun.source.**, javax.annotation.processing.**, javax.lang.model.**, javax.tools.**, com.sun.tools.javac.** com.sun.tools.javac.**, com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**, com.sun.tools.doclint.**
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javacapi
OpenIDE-Module-Provides: org.netbeans.libs.nbjavac
diff --git a/java/libs.springframework/manifest.mf b/java/libs.springframework/manifest.mf
index 9575b8a..c8003a9 100644
--- a/java/libs.springframework/manifest.mf
+++ b/java/libs.springframework/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Layer: org/netbeans/libs/springframework/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/springframework/Bundle.properties
OpenIDE-Module-Provides: org.springframework.Library
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
diff --git a/java/maven.checkstyle/manifest.mf b/java/maven.checkstyle/manifest.mf
index af0cde1..5d937bf 100644
--- a/java/maven.checkstyle/manifest.mf
+++ b/java/maven.checkstyle/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.maven.checkstyle
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/checkstyle/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/java/maven.coverage/manifest.mf b/java/maven.coverage/manifest.mf
index cb64471..90b50dc 100644
--- a/java/maven.coverage/manifest.mf
+++ b/java/maven.coverage/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.maven.coverage
OpenIDE-Module-Layer: org/netbeans/modules/maven/coverage/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/coverage/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.40
+OpenIDE-Module-Specification-Version: 1.41
AutoUpdate-Show-In-Client: false
diff --git a/java/maven.embedder/manifest.mf b/java/maven.embedder/manifest.mf
index c89b838..38b0764 100644
--- a/java/maven.embedder/manifest.mf
+++ b/java/maven.embedder/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.maven.embedder/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/embedder/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.71
+OpenIDE-Module-Specification-Version: 2.72
diff --git a/java/maven.grammar/nbproject/project.properties b/java/maven.grammar/nbproject/project.properties
index ab9881d..13f68cd 100644
--- a/java/maven.grammar/nbproject/project.properties
+++ b/java/maven.grammar/nbproject/project.properties
@@ -17,4 +17,4 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.64.0
+spec.version.base=1.65.0
diff --git a/java/maven.graph/manifest.mf b/java/maven.graph/manifest.mf
index 2450c93..1512115 100644
--- a/java/maven.graph/manifest.mf
+++ b/java/maven.graph/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.maven.graph/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/graph/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/java/maven.hints/manifest.mf b/java/maven.hints/manifest.mf
index 12674c5..4aaa37e 100644
--- a/java/maven.hints/manifest.mf
+++ b/java/maven.hints/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.hints/1
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/hints/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/hints/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/java/maven.indexer.ui/manifest.mf b/java/maven.indexer.ui/manifest.mf
index d6bd370..b594ab0 100644
--- a/java/maven.indexer.ui/manifest.mf
+++ b/java/maven.indexer.ui/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/indexer/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.51
+OpenIDE-Module-Specification-Version: 2.52
OpenIDE-Module: org.netbeans.modules.maven.indexer.ui/2
diff --git a/java/maven.indexer/manifest.mf b/java/maven.indexer/manifest.mf
index 1b3ce21..0006d07 100644
--- a/java/maven.indexer/manifest.mf
+++ b/java/maven.indexer/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/indexer/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.57
+OpenIDE-Module-Specification-Version: 2.58
OpenIDE-Module: org.netbeans.modules.maven.indexer/2
diff --git a/java/maven.junit.ui/manifest.mf b/java/maven.junit.ui/manifest.mf
index aa96fff..61105e4 100644
--- a/java/maven.junit.ui/manifest.mf
+++ b/java/maven.junit.ui/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.maven.junit.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/junit/ui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.maven.junit.ui.MavenJUnitManagerProvider
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
diff --git a/java/maven.junit/manifest.mf b/java/maven.junit/manifest.mf
index 00e6ac3..f2093fd 100644
--- a/java/maven.junit/manifest.mf
+++ b/java/maven.junit/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.maven.junit/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/junit/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/java/maven.kit/manifest.mf b/java/maven.kit/manifest.mf
index a687333..5653557 100644
--- a/java/maven.kit/manifest.mf
+++ b/java/maven.kit/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.maven.kit/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/feature/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.modules.testng.maven.MavenTestNGSupport,org.netbeans.modules.maven.junit.ui.MavenJUnitManagerProvider,org.netbeans.modules.selenium2.maven.Selenium2MavenSupportImpl
-OpenIDE-Module-Specification-Version: 4.48
+OpenIDE-Module-Specification-Version: 4.49
diff --git a/java/maven.model/manifest.mf b/java/maven.model/manifest.mf
index c0d6e45..e900c47 100644
--- a/java/maven.model/manifest.mf
+++ b/java/maven.model/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.model/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/model/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
diff --git a/java/maven.osgi/manifest.mf b/java/maven.osgi/manifest.mf
index 6e37dc8..0628814 100644
--- a/java/maven.osgi/manifest.mf
+++ b/java/maven.osgi/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.maven.osgi/1
OpenIDE-Module-Layer: org/netbeans/modules/maven/osgi/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/osgi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
diff --git a/java/maven.persistence/manifest.mf b/java/maven.persistence/manifest.mf
index 0c928c6..1c26b57 100644
--- a/java/maven.persistence/manifest.mf
+++ b/java/maven.persistence/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.maven.persistence/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/persistence/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/java/maven.refactoring/manifest.mf b/java/maven.refactoring/manifest.mf
index 16fb2ec..9aad797 100644
--- a/java/maven.refactoring/manifest.mf
+++ b/java/maven.refactoring/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.maven.refactoring
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/refactoring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
diff --git a/java/maven.repository/manifest.mf b/java/maven.repository/manifest.mf
index 701e158..1553682 100644
--- a/java/maven.repository/manifest.mf
+++ b/java/maven.repository/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.maven.repository/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/repository/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
diff --git a/java/maven.search/manifest.mf b/java/maven.search/manifest.mf
index f2776cf..0668704 100644
--- a/java/maven.search/manifest.mf
+++ b/java/maven.search/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.maven.search
OpenIDE-Module-Layer: org/netbeans/modules/maven/search/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/search/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/java/maven.spring/manifest.mf b/java/maven.spring/manifest.mf
index 4e6545d..fa3238d 100644
--- a/java/maven.spring/manifest.mf
+++ b/java/maven.spring/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.maven.spring/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/spring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/java/maven/build.xml b/java/maven/build.xml
index 7053dba..96e8916 100644
--- a/java/maven/build.xml
+++ b/java/maven/build.xml
@@ -90,6 +90,7 @@
<package-artifact-from-dir jarbasename="annotation-12.6" relpath="projects/dependencies/repo/grp/annotation/12.6"/>
<package-artifact-from-dir jarbasename="test-lib-12.6" relpath="projects/dependencies/repo/grp/test-lib/12.6"/>
+ <package-artifact-from-dir jarbasename="test-lib-13" relpath="projects/dependencies/repo/grp/test-lib/13"/>
<package-artifact-from-dir jarbasename="test-lib3-12.6" relpath="projects/dependencies/repo/grp/test-lib3/12.6"/>
<package-artifact-from-dir jarbasename="test-lib4-12.6" relpath="projects/dependencies/repo/grp/test-lib4/12.6"/>
<package-artifact-from-dir jarbasename="test-processor-12.6" relpath="projects/dependencies/repo/grp/test-processor/12.6"/>
diff --git a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
index e7fc7f3..100fd4e 100644
--- a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
+++ b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementation.java
@@ -18,17 +18,11 @@
*/
package org.netbeans.modules.maven.queries;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-import java.io.IOException;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -36,22 +30,10 @@
import java.util.Set;
import java.util.logging.Logger;
import java.util.stream.Collectors;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.StyledDocument;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.InputSource;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.building.ModelBuildingException;
-import org.apache.maven.model.building.ModelBuildingResult;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.codehaus.plexus.PlexusContainerException;
-import org.netbeans.api.editor.document.LineDocument;
-import org.netbeans.api.editor.document.LineDocumentUtils;
import org.netbeans.api.project.Project;
import org.netbeans.modules.maven.api.NbMavenProject;
import org.netbeans.modules.maven.embedder.DependencyTreeFactory;
@@ -64,16 +46,11 @@
import org.netbeans.modules.project.dependency.ProjectOperationException;
import org.netbeans.modules.project.dependency.Scope;
import org.netbeans.modules.project.dependency.Scopes;
-import org.netbeans.modules.project.dependency.SourceLocation;
import org.netbeans.modules.project.dependency.spi.ProjectDependenciesImplementation;
import org.netbeans.spi.project.ProjectServiceProvider;
-import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
-import org.openide.loaders.DataObject;
-import org.openide.util.Lookup;
import org.openide.util.NbBundle;
-import org.openide.util.WeakListeners;
/**
*
@@ -227,8 +204,9 @@
}
};
- return new Result(nbMavenProject.getMavenProject(),
- convert2(n, compositeFiter, broken), new ArrayList<>(scopes), broken);
+ return new MavenDependencyResult(nbMavenProject.getMavenProject(),
+ convert2(n, compositeFiter, broken), new ArrayList<>(scopes), broken,
+ project, nbMavenProject);
}
static Scope scope(Artifact a) {
@@ -283,209 +261,6 @@
return Dependency.create(aspec, s, ch, n);
}
- class Result implements DependencyResult, PropertyChangeListener {
- final MavenProject project;
- final Dependency rootNode;
- final Collection<Scope> scopes;
- final Collection<ArtifactSpec> problems;
-
- PropertyChangeListener wL;
- Model effectiveModel;
- Map<FileObject, StyledDocument> openedPoms = new HashMap<>();
- private List<ChangeListener> listeners;
-
- public Result(MavenProject proj, Dependency rootNode, Collection<Scope> scopes, Collection<ArtifactSpec> problems) {
- this.project = proj;
- this.rootNode = rootNode;
- this.scopes = scopes;
- this.problems = problems;
- }
-
- @Override
- public Project getProject() {
- return MavenDependenciesImplementation.this.project;
- }
-
- @Override
- public Collection<ArtifactSpec> getProblemArtifacts() {
- return Collections.unmodifiableCollection(problems);
- }
-
- @Override
- public Dependency getRoot() {
- return rootNode;
- }
-
- @Override
- public boolean isValid() {
- return true;
- }
-
- @Override
- public void addChangeListener(ChangeListener l) {
- boolean attach = false;
- synchronized (this) {
- if (listeners == null) {
- attach = true;
- listeners = new ArrayList<>();
- }
- listeners.add(l);
- }
- if (!attach) {
- return;
- }
- wL = WeakListeners.propertyChange(this, nbMavenProject);
- nbMavenProject.addPropertyChangeListener(wL);
- }
-
- @Override
- public void removeChangeListener(ChangeListener l) {
- boolean detach = false;
- synchronized (this) {
- if (listeners == null) {
- return;
- }
- listeners.remove(l);
- if (listeners.isEmpty()) {
- nbMavenProject.removePropertyChangeListener(wL);
- }
- }
- }
-
- @Override
- public void propertyChange(PropertyChangeEvent evt) {
- if (!NbMavenProject.PROP_PROJECT.equals(evt.getPropertyName())) {
- return;
- }
-
- List<ChangeListener> ll;
- synchronized (this) {
- if (listeners == null || listeners.isEmpty()) {
- return;
- }
- ll = new ArrayList<>(listeners);
- }
- ChangeEvent e = new ChangeEvent(this);
- for (ChangeListener l : ll ) {
- l.stateChanged(e);
- }
- }
-
- public String toString() {
- return "Depdenencies for " + getRoot().getArtifact() + " "
- + scopes.toString();
- }
-
- public Lookup getLookup() {
- return Lookup.EMPTY;
- }
-
- @NbBundle.Messages("ERR_ModelBuildFailed=Model building failed")
- @Override
- public SourceLocation getDeclarationRange(Dependency dep) throws IOException {
- Model m;
- if (effectiveModel == null) {
- ModelBuildingResult res;
- try {
- res = EmbedderFactory.getProjectEmbedder().executeModelBuilder(
- project.getFile());
- } catch (ModelBuildingException ex) {
- throw new IOException(Bundle.ERR_ModelBuildFailed(), ex);
- }
- synchronized (this) {
- if (effectiveModel == null) {
- effectiveModel = res.getEffectiveModel();
- }
- }
- }
-
- Dependency topLevel = null;
- Dependency search = dep;
- org.apache.maven.model.Dependency selected = null;
- if (dep.getProjectData() instanceof DependencyNode) {
- DependencyNode pd = (DependencyNode)dep.getProjectData();
- if (!(pd == rootNode.getProjectData() || pd.getParent() == rootNode.getProjectData())) {
- do {
- pd = pd.getParent();
- } while (pd.getParent() != rootNode.getProjectData());
-
- List<Dependency> rootDeps = rootNode.getChildren();
- for (Dependency cd : rootDeps) {
- if (artifactEquals(cd.getArtifact(), pd.getArtifact())) {
- search = cd;
- topLevel = cd;
- break;
- }
- }
- }
- }
-
- for (org.apache.maven.model.Dependency d : effectiveModel.getDependencies()) {
- if (dependencyEquals(dep, d)) {
- selected = d;
- break;
- }
- }
- if (selected == null) {
- return null;
- }
- InputLocation l = selected.getLocation("");
- InputSource s = l.getSource();
- String path = s.getLocation();
- FileObject fo = FileUtil.toFileObject(new File(path));
- if (fo == null) {
- return null;
- }
- StyledDocument d;
-
- synchronized (this) {
- d = openedPoms.get(fo);
- }
- if (d == null) {
- DataObject dobj = DataObject.find(fo);
- EditorCookie cake = dobj.getLookup().lookup(EditorCookie.class);
- if (cake == null) {
- return null;
- }
- d = cake.openDocument();
- synchronized (this) {
- openedPoms.put(fo, d);
- }
- }
- LineDocument ld = LineDocumentUtils.as(d, LineDocument.class);
- if (ld == null) {
- return new SourceLocation(fo, -1, -1, topLevel);
- } else {
- int so = LineDocumentUtils.getLineStartFromIndex(ld, l.getLineNumber() - 1)
- + l.getColumnNumber() - 1;
- int[] depStart = new int[] { so };
- int[] depEnd = new int[] { so };
- d.render(() -> {
- try {
- int from = Math.max(0, so - 15);
- String text = ld.getText(from, ld.getLength() - from);
- int start = text.lastIndexOf("<dependency", so - from);
- if (start > -1) {
- depStart[0] = start + from;
- }
- int end = text.indexOf("</dependency", so - from);
- if (end != -1) {
- // find the closing ">"
- end += 10;
- int end2 = text.indexOf(">", end);
- if (end2 > 0) {
- end = end2 + 1;
- }
- depEnd[0] = end + from;
- }
- } catch (BadLocationException ex) {
- }
- });
-
- return new SourceLocation(fo, depStart[0], depEnd[0], topLevel);
- }
- }
- }
static boolean dependencyEquals(Dependency dspec, org.apache.maven.model.Dependency mavenD) {
ArtifactSpec spec = dspec.getArtifact();
@@ -496,8 +271,8 @@
if (!(
Objects.equals(spec.getGroupId(), mavenD.getGroupId()) &&
Objects.equals(spec.getArtifactId(), mavenD.getArtifactId()) &&
- Objects.equals(spec.getClassifier(), mavenClass)) &&
- Objects.equals(spec.getVersionSpec(), mavenD.getVersion())) {
+ Objects.equals(spec.getClassifier(), mavenClass) &&
+ Objects.equals(spec.getVersionSpec(), mavenD.getVersion()))) {
return false;
}
if (spec.getType() != null && !Objects.equals(spec.getType(), mavenD.getType())) {
@@ -519,8 +294,8 @@
if (!(
Objects.equals(spec.getGroupId(), mavenA.getGroupId()) &&
Objects.equals(spec.getArtifactId(), mavenA.getArtifactId()) &&
- Objects.equals(spec.getClassifier(), mavenClass)) &&
- Objects.equals(spec.getVersionSpec(), mavenA.getVersion())) {
+ Objects.equals(spec.getClassifier(), mavenClass) &&
+ Objects.equals(spec.getVersionSpec(), mavenA.getVersion()))) {
return false;
}
if (spec.getType() != null && !Objects.equals(spec.getType(), mavenA.getType())) {
diff --git a/java/maven/src/org/netbeans/modules/maven/queries/MavenDependencyResult.java b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependencyResult.java
new file mode 100644
index 0000000..07237e9
--- /dev/null
+++ b/java/maven/src/org/netbeans/modules/maven/queries/MavenDependencyResult.java
@@ -0,0 +1,421 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.maven.queries;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.StyledDocument;
+import org.apache.maven.model.InputLocation;
+import org.apache.maven.model.InputSource;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.building.ModelBuildingException;
+import org.apache.maven.model.building.ModelBuildingResult;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.shared.dependency.tree.DependencyNode;
+import org.netbeans.api.editor.document.LineDocument;
+import org.netbeans.api.editor.document.LineDocumentUtils;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.maven.api.NbMavenProject;
+import org.netbeans.modules.maven.embedder.EmbedderFactory;
+import org.netbeans.modules.maven.model.Utilities;
+import org.netbeans.modules.maven.model.pom.ModelList;
+import org.netbeans.modules.maven.model.pom.POMComponent;
+import org.netbeans.modules.maven.model.pom.POMModel;
+import org.netbeans.modules.maven.model.pom.POMModelFactory;
+import org.netbeans.modules.project.dependency.ArtifactSpec;
+import org.netbeans.modules.project.dependency.Dependency;
+import org.netbeans.modules.project.dependency.DependencyResult;
+import org.netbeans.modules.project.dependency.Scope;
+import org.netbeans.modules.project.dependency.SourceLocation;
+import org.netbeans.modules.xml.xam.ModelSource;
+import org.openide.cookies.EditorCookie;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.loaders.DataObject;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle;
+import org.openide.util.WeakListeners;
+
+/**
+ *
+ * @author sdedic
+ */
+class MavenDependencyResult implements org.netbeans.modules.project.dependency.DependencyResult, PropertyChangeListener {
+ final Project ideProject;
+ final NbMavenProject mavenProject;
+ final Dependency rootNode;
+ final Collection<Scope> scopes;
+ final Collection<ArtifactSpec> problems;
+ PropertyChangeListener wL;
+ volatile Model effectiveModel;
+ Map<FileObject, StyledDocument> openedPoms = new HashMap<>();
+ private List<ChangeListener> listeners;
+ private List<ChangeListener> sourceListeners;
+ // DWs are kept by document
+ private Map<FileObject, DW> documentWatchers = new HashMap<>();
+ private volatile boolean valid;
+
+ public MavenDependencyResult(MavenProject proj, Dependency rootNode, Collection<Scope> scopes, Collection<ArtifactSpec> problems,
+ Project project, NbMavenProject mavenProject) {
+ this.ideProject = project;
+ this.mavenProject = mavenProject;
+ this.rootNode = rootNode;
+ this.scopes = scopes;
+ this.problems = problems;
+ }
+
+ @Override
+ public Collection<FileObject> getDependencyFiles() {
+ File file = mavenProject.getMavenProject().getFile();
+ if (file == null) {
+ return Collections.emptyList();
+ }
+ return Collections.singleton(FileUtil.toFileObject(file));
+ }
+
+ @Override
+ public Project getProject() {
+ return ideProject;
+ }
+
+ @Override
+ public Collection<ArtifactSpec> getProblemArtifacts() {
+ return Collections.unmodifiableCollection(problems);
+ }
+
+ @Override
+ public Dependency getRoot() {
+ return rootNode;
+ }
+
+ @Override
+ public boolean isValid() {
+ return valid;
+ }
+
+ @Override
+ public void addChangeListener(ChangeListener l) {
+ boolean attach = false;
+ synchronized (this) {
+ if (listeners == null) {
+ attach = true;
+ listeners = new ArrayList<>();
+ }
+ listeners.add(l);
+ }
+ if (!attach) {
+ return;
+ }
+ wL = WeakListeners.propertyChange(this, mavenProject);
+ mavenProject.addPropertyChangeListener(wL);
+ }
+
+ @Override
+ public void removeChangeListener(ChangeListener l) {
+ boolean detach = false;
+ synchronized (this) {
+ if (listeners == null) {
+ return;
+ }
+ listeners.remove(l);
+ if (listeners.isEmpty()) {
+ mavenProject.removePropertyChangeListener(wL);
+ }
+ }
+ }
+
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (!NbMavenProject.PROP_PROJECT.equals(evt.getPropertyName())) {
+ return;
+ }
+ List<ChangeListener> ll;
+ synchronized (this) {
+ valid = false;
+ if (listeners == null || listeners.isEmpty()) {
+ return;
+ }
+ ll = new ArrayList<>(listeners);
+ }
+ ChangeEvent e = new ChangeEvent(this);
+ for (ChangeListener l : ll) {
+ l.stateChanged(e);
+ }
+ }
+
+ @Override
+ public void addSourceChangeListener(ChangeListener l) {
+ boolean attach = false;
+ synchronized (this) {
+ if (sourceListeners == null) {
+ sourceListeners = new ArrayList<>();
+ attach = true;
+ }
+ sourceListeners.add(l);
+ }
+ if (attach) {
+ FileObject fo = FileUtil.toFileObject(mavenProject.getMavenProject().getFile());
+ if (fo != null) {
+ addDocumentWatcher(fo);
+ }
+ }
+ }
+
+ @Override
+ public void removeSourceChangeListener(ChangeListener l) {
+ synchronized (this) {
+ if (sourceListeners == null || sourceListeners.isEmpty()) {
+ return;
+ }
+ }
+ }
+
+ public String toString() {
+ return "Depdenencies for " + getRoot().getArtifact() + " " + scopes.toString();
+ }
+
+ public Lookup getLookup() {
+ return Lookup.EMPTY;
+ }
+
+ class DW implements DocumentListener {
+ final Document doc;
+ final FileObject file;
+
+ public DW(FileObject file, Document doc) {
+ this.file = file;
+ this.doc = doc;
+ }
+
+ @Override
+ public void insertUpdate(DocumentEvent e) {
+ documentChanged(file);
+ }
+
+ @Override
+ public void removeUpdate(DocumentEvent e) {
+ documentChanged(file);
+ }
+
+ @Override
+ public void changedUpdate(DocumentEvent e) {
+ }
+ }
+
+ private void addDocumentWatcher(FileObject f) {
+ synchronized (this) {
+ if (f == null || documentWatchers.containsKey(f)) {
+ return;
+ }
+ }
+ EditorCookie cake = f.getLookup().lookup(EditorCookie.class);
+ Document doc = null;
+ if (cake != null) {
+ doc = cake.getDocument();
+ }
+ DW dw;
+ synchronized (this) {
+ if (documentWatchers.containsKey(f)) {
+ return;
+ }
+ dw = new DW(f, doc);
+ documentWatchers.put(f, dw);
+ }
+ if (doc != null) {
+ doc.addDocumentListener(WeakListeners.create(DocumentListener.class, dw, doc));
+ }
+ }
+
+ void documentChanged(FileObject f) {
+ ChangeListener[] ll;
+ synchronized (this) {
+ effectiveModel = null;
+ if (sourceListeners == null || sourceListeners.isEmpty()) {
+ return;
+ }
+ ll = sourceListeners.toArray(new ChangeListener[sourceListeners.size()]);
+ }
+ ChangeEvent e = new ChangeEvent(this);
+ for (ChangeListener l : ll) {
+ l.stateChanged(e);
+ }
+ }
+
+ @NbBundle.Messages(value = "ERR_ModelBuildFailed=Model building failed")
+ @Override
+ public SourceLocation getDeclarationRange(Dependency dep, String part) throws IOException {
+ Model m;
+ if (effectiveModel == null) {
+ FileObject fo = FileUtil.toFileObject(mavenProject.getMavenProject().getFile());
+ addDocumentWatcher(fo);
+ ModelBuildingResult res;
+ try {
+ res = EmbedderFactory.getProjectEmbedder().executeModelBuilder(mavenProject.getMavenProject().getFile());
+ } catch (ModelBuildingException ex) {
+ throw new IOException(Bundle.ERR_ModelBuildFailed(), ex);
+ }
+ synchronized (this) {
+ if (effectiveModel == null) {
+ effectiveModel = res.getEffectiveModel();
+ }
+ }
+ }
+ Dependency topLevel = null;
+ Dependency search = dep;
+ org.apache.maven.model.Dependency selected = null;
+
+ if (part != null && !DependencyResult.PART_CONTAINER.equals(part)) {
+ // not supported yet
+ return null;
+ }
+
+ if (dep.getProjectData() instanceof DependencyNode) {
+ DependencyNode pd = (DependencyNode) dep.getProjectData();
+ if (!(pd == rootNode.getProjectData() || pd.getParent() == rootNode.getProjectData())) {
+ do {
+ pd = pd.getParent();
+ } while (pd.getParent() != rootNode.getProjectData());
+ List<Dependency> rootDeps = rootNode.getChildren();
+ for (Dependency cd : rootDeps) {
+ if (MavenDependenciesImplementation.artifactEquals(cd.getArtifact(), pd.getArtifact())) {
+ search = cd;
+ topLevel = cd;
+ break;
+ }
+ }
+ }
+ }
+ if (DependencyResult.PART_CONTAINER.equals(part)) {
+ InputLocation location = effectiveModel.getLocation("dependencies");
+ if (location != null) {
+ return fromInputLocation(location, topLevel);
+ }
+ // make a fallback: locate POM component that corresponds to the dependencies element
+ FileObject pomFileObject = FileUtil.toFileObject(mavenProject.getMavenProject().getFile());
+ ModelSource source = Utilities.createModelSource(pomFileObject);
+ POMModel model = POMModelFactory.getDefault().getModel(source);
+ if (model == null) {
+ return null;
+ }
+ org.netbeans.modules.maven.model.pom.Project project = model.getProject();
+ for (ModelList ml : project.getChildren(ModelList.class)) {
+ if (ml.getListClass() == org.netbeans.modules.maven.model.pom.Dependency.class) {
+ if ("dependencies".equals(ml.getPeer().getNodeName())) { // NOI18N
+ int from = ml.findPosition();
+ int to = ml.findEndPosition();
+
+ if (from == 0 && to == 0) {
+ from = -1;
+ to = -1;
+ }
+ return new SourceLocation(pomFileObject, from, to, null);
+ }
+ }
+ }
+ return fromInputLocation(effectiveModel.getLocation("dependencies"), topLevel);
+ }
+ for (org.apache.maven.model.Dependency d : effectiveModel.getDependencies()) {
+ if (MavenDependenciesImplementation.dependencyEquals(search, d)) {
+ selected = d;
+ break;
+ }
+ }
+ if (selected == null) {
+ return null;
+ }
+ return fromInputLocation(selected.getLocation(""), topLevel);
+ }
+
+ private StyledDocument openDocument(FileObject fo) throws IOException {
+ if (fo == null) {
+ return null;
+ }
+ StyledDocument d;
+ synchronized (this) {
+ d = openedPoms.get(fo);
+ }
+ if (d == null) {
+ DataObject dobj = DataObject.find(fo);
+ EditorCookie cake = dobj.getLookup().lookup(EditorCookie.class);
+ if (cake == null) {
+ return null;
+ }
+ d = cake.openDocument();
+ synchronized (this) {
+ openedPoms.putIfAbsent(fo, d);
+ }
+ }
+ return d;
+ }
+
+ private SourceLocation fromInputLocation(InputLocation l, Object topLevel) throws IOException {
+ if (l == null) {
+ return null;
+ }
+ InputSource s = l.getSource();
+ String path = s.getLocation();
+ FileObject fo = FileUtil.toFileObject(new File(path));
+ StyledDocument d = openDocument(fo);
+ LineDocument ld = LineDocumentUtils.as(d, LineDocument.class);
+ if (ld == null) {
+ return new SourceLocation(fo, -1, -1, topLevel);
+ } else {
+ int so = LineDocumentUtils.getLineStartFromIndex(ld, l.getLineNumber() - 1) + l.getColumnNumber() - 1;
+ int[] depStart = new int[]{so};
+ int[] depEnd = new int[]{so};
+ d.render(() -> {
+ try {
+ int from = Math.max(0, so - 15);
+ String text = ld.getText(from, ld.getLength() - from);
+ int start = text.lastIndexOf("<dependency", so - from);
+ if (start > -1) {
+ depStart[0] = start + from;
+ }
+ int end = text.indexOf("</dependency", so - from);
+ if (end != -1) {
+ // find the closing ">"
+ end += 10;
+ int end2 = text.indexOf(">", end);
+ if (end2 > 0) {
+ end = end2 + 1;
+ }
+ depEnd[0] = end + from;
+ }
+ } catch (BadLocationException ex) {
+ }
+ });
+ return new SourceLocation(fo, depStart[0], depEnd[0], topLevel);
+ }
+ }
+
+}
diff --git a/java/maven/test/unit/data/projects/dependencies/golden/testCompileDependencies b/java/maven/test/unit/data/projects/dependencies/golden/testCompileDependencies
index 01472f0..9bdfe88 100644
--- a/java/maven/test/unit/data/projects/dependencies/golden/testCompileDependencies
+++ b/java/maven/test/unit/data/projects/dependencies/golden/testCompileDependencies
@@ -1,6 +1,6 @@
[ ] nbtest.grp:test-app:12.6[jar] / compilation
+-- [ ] nbtest.grp:annotation:12.6[jar] / compilation
- +-- [ ] nbtest.grp:test-lib:12.6[jar] / compilation
+ +-- [ ] nbtest.grp:test-lib:13[jar] / compilation
| +-- [ ] nbtest.grp:annotation:12.6[jar] / compilation
| +-- [ ] javax.annotation:javax.annotation-api:1.3.2[jar] / compilation
| +-- [ ] org.slf4j:slf4j-api:1.7.36[jar] / compilation
diff --git a/java/maven/test/unit/data/projects/dependencies/golden/testRuntimeDependencies b/java/maven/test/unit/data/projects/dependencies/golden/testRuntimeDependencies
index 1673f45..4b8eb97 100644
--- a/java/maven/test/unit/data/projects/dependencies/golden/testRuntimeDependencies
+++ b/java/maven/test/unit/data/projects/dependencies/golden/testRuntimeDependencies
@@ -1,6 +1,6 @@
[ ] nbtest.grp:test-app:12.6[jar] / compilation
+-- [ ] nbtest.grp:annotation:12.6[jar] / compilation
- +-- [ ] nbtest.grp:test-lib:12.6[jar] / compilation
+ +-- [ ] nbtest.grp:test-lib:13[jar] / compilation
| +-- [ ] nbtest.grp:annotation:12.6[jar] / compilation
| +-- [ ] javax.annotation:javax.annotation-api:1.3.2[jar] / compilation
| +-- [ ] org.slf4j:slf4j-api:1.7.36[jar] / compilation
diff --git a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/_remote.repositories b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/_remote.repositories
new file mode 100644
index 0000000..1798fb2
--- /dev/null
+++ b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/_remote.repositories
@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Mon Jun 06 13:51:54 CEST 2022
+test-lib-13.pom>=
+test-lib-13.jar>=
diff --git a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/MANIFEST.MF b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9c4f735
--- /dev/null
+++ b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven 3.6.0
+Built-By: sdedic
+Build-Jdk: 11.0.5
+
diff --git a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/maven/nbtest.grp/test-lib/pom.properties b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/maven/nbtest.grp/test-lib/pom.properties
new file mode 100644
index 0000000..fc5d91c
--- /dev/null
+++ b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/maven/nbtest.grp/test-lib/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Jun 06 13:51:54 CEST 2022
+groupId=nbtest.grp
+artifactId=test-lib
+version=13
diff --git a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/maven/nbtest.grp/test-lib/pom.xml b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/maven/nbtest.grp/test-lib/pom.xml
new file mode 100644
index 0000000..8ee9707
--- /dev/null
+++ b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.jardir/META-INF/maven/nbtest.grp/test-lib/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>nbtest.grp</groupId>
+ <artifactId>test-lib</artifactId>
+ <version>13</version>
+
+ <name>Test Library</name>
+ <description>Application Library stub</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>nbtest.grp</groupId>
+ <artifactId>annotation</artifactId>
+ <version>12.6</version>
+ </dependency>
+ <dependency>
+ <groupId>nbtest.grp</groupId>
+ <artifactId>test-lib3</artifactId>
+ <version>12.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+ </dependencies>
+</project>
+
diff --git a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.pom b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.pom
new file mode 100644
index 0000000..8ee9707
--- /dev/null
+++ b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/13/test-lib-13.pom
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>nbtest.grp</groupId>
+ <artifactId>test-lib</artifactId>
+ <version>13</version>
+
+ <name>Test Library</name>
+ <description>Application Library stub</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>nbtest.grp</groupId>
+ <artifactId>annotation</artifactId>
+ <version>12.6</version>
+ </dependency>
+ <dependency>
+ <groupId>nbtest.grp</groupId>
+ <artifactId>test-lib3</artifactId>
+ <version>12.6</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+ </dependencies>
+</project>
+
diff --git a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/maven-metadata-local.xml b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/maven-metadata-local.xml
index 2d04039..cc153f4 100644
--- a/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/maven-metadata-local.xml
+++ b/java/maven/test/unit/data/projects/dependencies/repo/grp/test-lib/maven-metadata-local.xml
@@ -3,10 +3,11 @@
<groupId>nbtest.grp</groupId>
<artifactId>test-lib</artifactId>
<versioning>
- <release>12.6</release>
+ <release>13</release>
<versions>
<version>12.6</version>
+ <version>13</version>
</versions>
- <lastUpdated>20220524141016</lastUpdated>
+ <lastUpdated>20220606115154</lastUpdated>
</versioning>
</metadata>
diff --git a/java/maven/test/unit/data/projects/dependencies/src/simpleProject/pom.xml b/java/maven/test/unit/data/projects/dependencies/src/simpleProject/pom.xml
index 85e4336..ff1b919 100644
--- a/java/maven/test/unit/data/projects/dependencies/src/simpleProject/pom.xml
+++ b/java/maven/test/unit/data/projects/dependencies/src/simpleProject/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>nbtest.grp</groupId>
<artifactId>test-lib</artifactId>
- <version>12.6</version>
+ <version>13</version>
</dependency>
<dependency>
<groupId>nbtest.grp</groupId>
diff --git a/java/maven/test/unit/data/projects/dependencies/src/test-lib/pom.xml b/java/maven/test/unit/data/projects/dependencies/src/test-lib/pom.xml
index 269d9fe..8ee9707 100644
--- a/java/maven/test/unit/data/projects/dependencies/src/test-lib/pom.xml
+++ b/java/maven/test/unit/data/projects/dependencies/src/test-lib/pom.xml
@@ -24,7 +24,7 @@
<groupId>nbtest.grp</groupId>
<artifactId>test-lib</artifactId>
- <version>12.6</version>
+ <version>13</version>
<name>Test Library</name>
<description>Application Library stub</description>
diff --git a/java/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementationTest.java b/java/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementationTest.java
index fcbd980..a2d4948 100644
--- a/java/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementationTest.java
+++ b/java/maven/test/unit/src/org/netbeans/modules/maven/queries/MavenDependenciesImplementationTest.java
@@ -24,6 +24,7 @@
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -33,6 +34,7 @@
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.maven.api.NbMavenProject;
import org.netbeans.modules.maven.embedder.EmbedderFactory;
+import org.netbeans.modules.project.dependency.ArtifactSpec;
import org.netbeans.modules.project.dependency.Dependency;
import org.netbeans.modules.project.dependency.DependencyResult;
import org.netbeans.modules.project.dependency.ProjectDependencies;
@@ -177,7 +179,7 @@
DependencyResult dr = ProjectDependencies.findDependencies(p, ProjectDependencies.newQuery(Scopes.RUNTIME));
Dependency dep = dr.getRoot().getChildren().stream().filter(d -> d.getArtifact().getArtifactId().equals("test-lib")).findAny().get();
- SourceLocation srcLoc = dr.getDeclarationRange(dep);
+ SourceLocation srcLoc = dr.getDeclarationRange(dep, null);
assertNotNull(srcLoc);
assertFalse(srcLoc.isEmpty());
assertTrue(srcLoc.hasPosition());
@@ -187,7 +189,32 @@
String s = String.join("\n", Files.readAllLines(pomPath));
assertEquals("<dependency", s.substring(srcLoc.getStartOffset(), srcLoc.getStartOffset() + 11));
- assertEquals("</dependency>", s.substring(srcLoc.getEndOffset() - 13, srcLoc.getEndOffset()));
+ assertEquals("</dependency>", s.substring(srcLoc.getEndOffset() - 13, srcLoc.getEndOffset()));
+
+ String text = s.substring(srcLoc.getStartOffset(), srcLoc.getEndOffset());
+ assertTrue(text.contains("<artifactId>test-lib</artifactId>"));
+ }
+
+ public void testUnknownDependencySource() throws Exception {
+ FileUtil.toFileObject(getWorkDir()).refresh();
+ installCompileResources();
+
+ FileObject testApp = dataFO.getFileObject("projects/dependencies/src/simpleProject");
+ FileObject prjCopy = FileUtil.copyFile(testApp, FileUtil.toFileObject(getWorkDir()), "simpleProject");
+
+ Project p = ProjectManager.getDefault().findProject(prjCopy);
+ assertNotNull(p);
+
+ primeProject(p);
+
+ DependencyResult dr = ProjectDependencies.findDependencies(p, ProjectDependencies.newQuery(Scopes.RUNTIME));
+
+ Dependency dep = dr.getRoot().getChildren().stream().filter(d -> d.getArtifact().getArtifactId().equals("test-lib")).findAny().get();
+ ArtifactSpec unknown = ArtifactSpec.createVersionSpec("nbtest", "unknown", "jar", null, "13", false, null, null);
+ Dependency unknownDep = Dependency.create(unknown, Scopes.COMPILE, Collections.emptyList(), dep);
+
+ SourceLocation srcLoc = dr.getDeclarationRange(unknownDep, null);
+ assertNull(srcLoc);
}
public void testNestedDependencySource() throws Exception {
@@ -207,7 +234,8 @@
Dependency libDep = dr.getRoot().getChildren().stream().filter(d -> d.getArtifact().getArtifactId().equals("test-lib")).findAny().get();
Dependency annoDep = libDep.getChildren().stream().filter(d -> d.getArtifact().getArtifactId().equals("javax.annotation-api")).findAny().get();
- SourceLocation srcLoc = dr.getDeclarationRange(annoDep);
+ SourceLocation srcLoc = dr.getDeclarationRange(annoDep, null);
+ assertNotNull(srcLoc);
Path pomPath = p.getLookup().lookup(NbMavenProject.class).getMavenProject().getFile().toPath();
assertEquals(pomPath.toFile(), FileUtil.toFile(srcLoc.getFile()));
@@ -215,6 +243,9 @@
String s = String.join("\n", Files.readAllLines(pomPath));
assertEquals("<dependency", s.substring(srcLoc.getStartOffset(), srcLoc.getStartOffset() + 11));
assertEquals("</dependency>", s.substring(srcLoc.getEndOffset() - 13, srcLoc.getEndOffset()));
+
+ String text = s.substring(srcLoc.getStartOffset(), srcLoc.getEndOffset());
+ assertTrue(text.contains("<artifactId>test-lib</artifactId>"));
}
void assertContents(String contents, String golden) throws IOException {
diff --git a/java/nashorn.execution/manifest.mf b/java/nashorn.execution/manifest.mf
index 718d5ac..29cc1be 100644
--- a/java/nashorn.execution/manifest.mf
+++ b/java/nashorn.execution/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.nashorn.execution/1
Comment: OpenIDE-Module-Layer: org/netbeans/modules/nashorn/execution/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/nashorn/execution/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Recommends: org.netbeans.libs.graaljs
diff --git a/java/projectimport.eclipse.core/manifest.mf b/java/projectimport.eclipse.core/manifest.mf
index 6b44305..e885cd7 100644
--- a/java/projectimport.eclipse.core/manifest.mf
+++ b/java/projectimport.eclipse.core/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.projectimport.eclipse.core/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/projectimport/eclipse/core/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/projectimport/eclipse/core/resources/layer.xml
-OpenIDE-Module-Specification-Version: 2.47
+OpenIDE-Module-Specification-Version: 2.48
diff --git a/java/projectimport.eclipse.j2se/nbproject/project.properties b/java/projectimport.eclipse.j2se/nbproject/project.properties
index a91ef45..f5db046 100644
--- a/java/projectimport.eclipse.j2se/nbproject/project.properties
+++ b/java/projectimport.eclipse.j2se/nbproject/project.properties
@@ -17,4 +17,4 @@
is.eager=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.45.0
+spec.version.base=1.46.0
diff --git a/java/refactoring.java/nbproject/project.properties b/java/refactoring.java/nbproject/project.properties
index 2e51c3e..bc377cf 100644
--- a/java/refactoring.java/nbproject/project.properties
+++ b/java/refactoring.java/nbproject/project.properties
@@ -18,7 +18,7 @@
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
-spec.version.base=1.78.0
+spec.version.base=1.79.0
#test configs
test.config.find.includes=\
**/FindUsagesSuite.class
diff --git a/java/selenium2.java/manifest.mf b/java/selenium2.java/manifest.mf
index 818a2d8..5b30244 100644
--- a/java/selenium2.java/manifest.mf
+++ b/java/selenium2.java/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.selenium2.java
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/java/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.selenium2.java
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
diff --git a/java/selenium2.maven/manifest.mf b/java/selenium2.maven/manifest.mf
index 5752132..b6281ab 100644
--- a/java/selenium2.maven/manifest.mf
+++ b/java/selenium2.maven/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.selenium2.maven
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/maven/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.selenium2.maven.Selenium2MavenSupportImpl
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
diff --git a/java/spellchecker.bindings.java/manifest.mf b/java/spellchecker.bindings.java/manifest.mf
index af1a37a..598f395 100644
--- a/java/spellchecker.bindings.java/manifest.mf
+++ b/java/spellchecker.bindings.java/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.java/1
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
diff --git a/java/spi.debugger.jpda.ui/manifest.mf b/java/spi.debugger.jpda.ui/manifest.mf
index ef3529a..14d5f99 100644
--- a/java/spi.debugger.jpda.ui/manifest.mf
+++ b/java/spi.debugger.jpda.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.spi.debugger.jpda.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ui/spi/Bundle.properties
-OpenIDE-Module-Specification-Version: 3.20
+OpenIDE-Module-Specification-Version: 3.21
diff --git a/java/spi.java.hints/nbproject/project.properties b/java/spi.java.hints/nbproject/project.properties
index 0608a26..6cb7088 100644
--- a/java/spi.java.hints/nbproject/project.properties
+++ b/java/spi.java.hints/nbproject/project.properties
@@ -17,7 +17,7 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.49.0
+spec.version.base=1.50.0
requires.nb.javac=true
javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/java/spring.beans/nbproject/project.properties b/java/spring.beans/nbproject/project.properties
index c8b719a..2b72d7b 100644
--- a/java/spring.beans/nbproject/project.properties
+++ b/java/spring.beans/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.57.0
+spec.version.base=1.58.0
requires.nb.javac=true
test.config.stableBTD.includes=**/*Test.class
diff --git a/java/testng.ant/manifest.mf b/java/testng.ant/manifest.mf
index 1e6c525..0e19af2 100644
--- a/java/testng.ant/manifest.mf
+++ b/java/testng.ant/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.testng.ant
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/testng/ant/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.testng.ant.AntTestNGSupport
-OpenIDE-Module-Specification-Version: 2.32
+OpenIDE-Module-Specification-Version: 2.33
diff --git a/java/testng.maven/manifest.mf b/java/testng.maven/manifest.mf
index 514a1e1..071f18d 100644
--- a/java/testng.maven/manifest.mf
+++ b/java/testng.maven/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.testng.maven
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/testng/maven/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.testng.maven.MavenTestNGSupport
-OpenIDE-Module-Specification-Version: 2.33
+OpenIDE-Module-Specification-Version: 2.34
diff --git a/java/testng.ui/manifest.mf b/java/testng.ui/manifest.mf
index f47dc32..e75d76e 100644
--- a/java/testng.ui/manifest.mf
+++ b/java/testng.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.testng.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/testng/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.26
+OpenIDE-Module-Specification-Version: 1.27
diff --git a/java/testng/manifest.mf b/java/testng/manifest.mf
index 806a312..71ea91e 100644
--- a/java/testng/manifest.mf
+++ b/java/testng/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.testng
OpenIDE-Module-Layer: org/netbeans/modules/testng/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/testng/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.37
+OpenIDE-Module-Specification-Version: 2.38
diff --git a/java/websvc.jaxws21/manifest.mf b/java/websvc.jaxws21/manifest.mf
index 9e2776f..763323d 100644
--- a/java/websvc.jaxws21/manifest.mf
+++ b/java/websvc.jaxws21/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.jaxws21/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxws21/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
OpenIDE-Module-Layer: org/netbeans/modules/websvc/jaxws21/layer.xml
OpenIDE-Module-Provides: com.sun.xml.ws.spi.ProviderImpl
diff --git a/java/websvc.jaxws21api/manifest.mf b/java/websvc.jaxws21api/manifest.mf
index b87a057..da8d762 100644
--- a/java/websvc.jaxws21api/manifest.mf
+++ b/java/websvc.jaxws21api/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.jaxws21api/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxws21api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
OpenIDE-Module-Requires: org.openide.modules.ModuleFormat2
OpenIDE-Module-Needs: com.sun.xml.ws.spi.ProviderImpl, com.sun.xml.bind
OpenIDE-Module-Hide-Classpath-Packages: javax.jws.**, javax.xml.ws.**, javax.xml.soap.**, javax.annotation.**
diff --git a/java/websvc.saas.codegen.java/manifest.mf b/java/websvc.saas.codegen.java/manifest.mf
index 7e8723c..60d8218 100644
--- a/java/websvc.saas.codegen.java/manifest.mf
+++ b/java/websvc.saas.codegen.java/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.saas.codegen.java
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/codegen/java/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
OpenIDE-Module-Layer: org/netbeans/modules/websvc/saas/codegen/java/layer.xml
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Provides: org.netbeans.modules.websvc.saas.codegen.java
diff --git a/java/whitelist/manifest.mf b/java/whitelist/manifest.mf
index f0677b5..8a89310 100644
--- a/java/whitelist/manifest.mf
+++ b/java/whitelist/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.whitelist
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/whitelist/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/whitelist/resources/layer.xml
-OpenIDE-Module-Specification-Version: 1.40
+OpenIDE-Module-Specification-Version: 1.41
diff --git a/java/xml.jaxb/manifest.mf b/java/xml.jaxb/manifest.mf
index 09c050b..bdb3136 100644
--- a/java/xml.jaxb/manifest.mf
+++ b/java/xml.jaxb/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
OpenIDE-Module: org.netbeans.modules.xml.jaxb/1
OpenIDE-Module-Layer: org/netbeans/modules/xml/jaxb/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/jaxb/Bundle.properties
diff --git a/java/xml.tools.java/manifest.mf b/java/xml.tools.java/manifest.mf
index e123323..26a6e0f 100644
--- a/java/xml.tools.java/manifest.mf
+++ b/java/xml.tools.java/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.modules.xml.tools.java
OpenIDE-Module-Layer: org/netbeans/modules/xml/tools/java/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/xml/tools/java/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
diff --git a/javafx/javafx2.editor/nbproject/project.properties b/javafx/javafx2.editor/nbproject/project.properties
index 1a196d7..1c61b2d 100644
--- a/javafx/javafx2.editor/nbproject/project.properties
+++ b/javafx/javafx2.editor/nbproject/project.properties
@@ -18,7 +18,7 @@
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.38.0
+spec.version.base=1.39.0
requires.nb.javac=true
test.config.stable.includes=**/JavaFXCSSModuleTest.class
diff --git a/javafx/javafx2.kit/manifest.mf b/javafx/javafx2.kit/manifest.mf
index cf1a4e6..b5cfda6 100644
--- a/javafx/javafx2.kit/manifest.mf
+++ b/javafx/javafx2.kit/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javafx2.kit
OpenIDE-Module-Layer: org/netbeans/modules/javafx2/kit/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/javafx/javafx2.platform/manifest.mf b/javafx/javafx2.platform/manifest.mf
index a5bfadf..068aa57 100644
--- a/javafx/javafx2.platform/manifest.mf
+++ b/javafx/javafx2.platform/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javafx2.platform
OpenIDE-Module-Layer: org/netbeans/modules/javafx2/platform/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/platform/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
diff --git a/javafx/javafx2.project/manifest.mf b/javafx/javafx2.project/manifest.mf
index 8199d21..c307269 100644
--- a/javafx/javafx2.project/manifest.mf
+++ b/javafx/javafx2.project/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.javafx2.project
OpenIDE-Module-Layer: org/netbeans/modules/javafx2/project/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/project/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
diff --git a/javafx/javafx2.samples/manifest.mf b/javafx/javafx2.samples/manifest.mf
index a0b0603..14f51c8 100644
--- a/javafx/javafx2.samples/manifest.mf
+++ b/javafx/javafx2.samples/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javafx2.samples
OpenIDE-Module-Layer: org/netbeans/modules/javafx2/samples/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/samples/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/javafx/javafx2.scenebuilder/manifest.mf b/javafx/javafx2.scenebuilder/manifest.mf
index 3aec804..91a221a 100644
--- a/javafx/javafx2.scenebuilder/manifest.mf
+++ b/javafx/javafx2.scenebuilder/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.javafx2.scenebuilder
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/scenebuilder/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
diff --git a/javafx/maven.htmlui/manifest.mf b/javafx/maven.htmlui/manifest.mf
index 4bd1e31..4ef5f38 100644
--- a/javafx/maven.htmlui/manifest.mf
+++ b/javafx/maven.htmlui/manifest.mf
@@ -6,4 +6,4 @@
OpenIDE-Module-Recommends: org.netbeans.modules.ko4j.debugging,org.netbeans.modules.ko4j.editing
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/htmlui/Bundle.properties
OpenIDE-Module-Needs: org.netbeans.api.templates.wizard, javax.script.ScriptEngine.freemarker
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/nb/autoupdate.pluginimporter/manifest.mf b/nb/autoupdate.pluginimporter/manifest.mf
index 35c5e52..8726960 100644
--- a/nb/autoupdate.pluginimporter/manifest.mf
+++ b/nb/autoupdate.pluginimporter/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.autoupdate.pluginimporter
OpenIDE-Module-Install: org/netbeans/modules/autoupdate/pluginimporter/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/pluginimporter/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.37
+OpenIDE-Module-Specification-Version: 1.38
diff --git a/nb/bugzilla.exceptionreporter/manifest.mf b/nb/bugzilla.exceptionreporter/manifest.mf
index 5155154..1835817 100644
--- a/nb/bugzilla.exceptionreporter/manifest.mf
+++ b/nb/bugzilla.exceptionreporter/manifest.mf
@@ -3,5 +3,5 @@
AutoUpdate-Essential-Module: true
OpenIDE-Module: org.netbeans.modules.bugzilla.exceptionreporter
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugzilla/exceptionreporter/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
diff --git a/nb/deadlock.detector/manifest.mf b/nb/deadlock.detector/manifest.mf
index e91289f..6474e9e 100644
--- a/nb/deadlock.detector/manifest.mf
+++ b/nb/deadlock.detector/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.deadlock.detector
OpenIDE-Module-Install: org/netbeans/modules/deadlock/detector/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/deadlock/detector/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
Main-Class: org.netbeans.modules.deadlock.detector.DeadlockReporter
diff --git a/nb/ide.branding.kit/manifest.mf b/nb/ide.branding.kit/manifest.mf
index 7dc83e7..6d64f4d 100644
--- a/nb/ide.branding.kit/manifest.mf
+++ b/nb/ide.branding.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.ide.branding.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ide/branding/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/nb/ide.branding/manifest.mf b/nb/ide.branding/manifest.mf
index 7a55acc..92b6ab0 100644
--- a/nb/ide.branding/manifest.mf
+++ b/nb/ide.branding/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.ide.branding/1
OpenIDE-Module-Layer: org/netbeans/modules/ide/branding/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ide/branding/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
AutoUpdate-Show-In-Client: false
diff --git a/nb/o.n.upgrader/manifest.mf b/nb/o.n.upgrader/manifest.mf
index c813bbd..8e9dad4 100644
--- a/nb/o.n.upgrader/manifest.mf
+++ b/nb/o.n.upgrader/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.upgrader
-OpenIDE-Module-Specification-Version: 4.52
+OpenIDE-Module-Specification-Version: 4.53
OpenIDE-Module-Localizing-Bundle: org/netbeans/upgrade/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/nb/uihandler.exceptionreporter/manifest.mf b/nb/uihandler.exceptionreporter/manifest.mf
index a44cc67..20688eb 100644
--- a/nb/uihandler.exceptionreporter/manifest.mf
+++ b/nb/uihandler.exceptionreporter/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.uihandler.exceptionreporter
OpenIDE-Module-Install: org/netbeans/modules/uihandler/exceptionreporter/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/uihandler/exceptionreporter/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.46
+OpenIDE-Module-Specification-Version: 1.47
AutoUpdate-Show-In-Client: false
diff --git a/nb/updatecenters/manifest.mf b/nb/updatecenters/manifest.mf
index aac159e..cd0f2a6 100644
--- a/nb/updatecenters/manifest.mf
+++ b/nb/updatecenters/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/updatecenters/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
OpenIDE-Module: org.netbeans.modules.updatecenters/1
OpenIDE-Module-Layer: org/netbeans/modules/updatecenters/resources/mf-layer.xml
diff --git a/nb/welcome/manifest.mf b/nb/welcome/manifest.mf
index 826024a..b85a064 100644
--- a/nb/welcome/manifest.mf
+++ b/nb/welcome/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Install: org/netbeans/modules/welcome/Installer.class
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
OpenIDE-Module: org.netbeans.modules.welcome/1
OpenIDE-Module-Layer: org/netbeans/modules/welcome/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/welcome/Bundle.properties
diff --git a/php/hudson.php/manifest.mf b/php/hudson.php/manifest.mf
index ea54bd3..feee6f3 100644
--- a/php/hudson.php/manifest.mf
+++ b/php/hudson.php/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.hudson.php
OpenIDE-Module-Layer: org/netbeans/modules/hudson/php/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/php/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.35
+OpenIDE-Module-Specification-Version: 1.36
diff --git a/php/languages.neon/manifest.mf b/php/languages.neon/manifest.mf
index d9f60c4..658c762 100644
--- a/php/languages.neon/manifest.mf
+++ b/php/languages.neon/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.languages.neon
OpenIDE-Module-Layer: org/netbeans/modules/languages/neon/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/neon/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/php/libs.javacup/nbproject/project.properties b/php/libs.javacup/nbproject/project.properties
index 96209f4..28ecab2 100644
--- a/php/libs.javacup/nbproject/project.properties
+++ b/php/libs.javacup/nbproject/project.properties
@@ -17,4 +17,4 @@
is.autoload=true
release.external/java-cup-11a.jar=modules/ext/java-cup-11a.jar
-spec.version.base=1.41.0
+spec.version.base=1.42.0
diff --git a/php/php.api.annotation/manifest.mf b/php/php.api.annotation/manifest.mf
index 7546664..97cd4f5 100644
--- a/php/php.api.annotation/manifest.mf
+++ b/php/php.api.annotation/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.api.annotation/0
OpenIDE-Module-Layer: org/netbeans/modules/php/api/annotation/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/annotation/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.35
+OpenIDE-Module-Specification-Version: 0.36
diff --git a/php/php.api.documentation/manifest.mf b/php/php.api.documentation/manifest.mf
index 8b4bd18..1984cac 100644
--- a/php/php.api.documentation/manifest.mf
+++ b/php/php.api.documentation/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.api.documentation/0
OpenIDE-Module-Layer: org/netbeans/modules/php/api/documentation/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/documentation/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.30
+OpenIDE-Module-Specification-Version: 0.31
diff --git a/php/php.api.editor/manifest.mf b/php/php.api.editor/manifest.mf
index 6199471..24b215e 100644
--- a/php/php.api.editor/manifest.mf
+++ b/php/php.api.editor/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.php.api.editor/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/editor/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.44
+OpenIDE-Module-Specification-Version: 0.45
diff --git a/php/php.api.executable/manifest.mf b/php/php.api.executable/manifest.mf
index 146cd35..65f16cf 100644
--- a/php/php.api.executable/manifest.mf
+++ b/php/php.api.executable/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.php.api.executable/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/executable/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.47
+OpenIDE-Module-Specification-Version: 0.48
diff --git a/php/php.api.framework/manifest.mf b/php/php.api.framework/manifest.mf
index 91e1f2d..055cd92 100644
--- a/php/php.api.framework/manifest.mf
+++ b/php/php.api.framework/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.api.framework/0
OpenIDE-Module-Layer: org/netbeans/modules/php/api/framework/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/framework/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.42
+OpenIDE-Module-Specification-Version: 0.43
diff --git a/php/php.api.phpmodule/manifest.mf b/php/php.api.phpmodule/manifest.mf
index 0ce727f..0adfca9 100644
--- a/php/php.api.phpmodule/manifest.mf
+++ b/php/php.api.phpmodule/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.php.api.phpmodule
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/phpmodule/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.84
+OpenIDE-Module-Specification-Version: 2.85
diff --git a/php/php.api.templates/manifest.mf b/php/php.api.templates/manifest.mf
index 772a1e0..f3917c8 100644
--- a/php/php.api.templates/manifest.mf
+++ b/php/php.api.templates/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.php.api.templates/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/templates/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.26
+OpenIDE-Module-Specification-Version: 0.27
diff --git a/php/php.api.testing/manifest.mf b/php/php.api.testing/manifest.mf
index b5967f0..7b149a0 100644
--- a/php/php.api.testing/manifest.mf
+++ b/php/php.api.testing/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.api.testing/0
OpenIDE-Module-Layer: org/netbeans/modules/php/api/testing/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/api/testing/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.36
+OpenIDE-Module-Specification-Version: 0.37
diff --git a/php/php.apigen/manifest.mf b/php/php.apigen/manifest.mf
index 6c5f2bb..3ce7eab 100644
--- a/php/php.apigen/manifest.mf
+++ b/php/php.apigen/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.php.apigen
OpenIDE-Module-Layer: org/netbeans/modules/php/apigen/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/apigen/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
diff --git a/php/php.atoum/manifest.mf b/php/php.atoum/manifest.mf
index 09b501c..e32a017 100644
--- a/php/php.atoum/manifest.mf
+++ b/php/php.atoum/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.atoum
OpenIDE-Module-Layer: org/netbeans/modules/php/atoum/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/atoum/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.33
+OpenIDE-Module-Specification-Version: 0.34
diff --git a/php/php.code.analysis/manifest.mf b/php/php.code.analysis/manifest.mf
index 325a9de..21e1e35 100644
--- a/php/php.code.analysis/manifest.mf
+++ b/php/php.code.analysis/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.code.analysis
OpenIDE-Module-Layer: org/netbeans/modules/php/analysis/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/analysis/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.31
+OpenIDE-Module-Specification-Version: 0.32
diff --git a/php/php.codeception/manifest.mf b/php/php.codeception/manifest.mf
index 4590e5d..7098f64 100644
--- a/php/php.codeception/manifest.mf
+++ b/php/php.codeception/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.codeception
OpenIDE-Module-Layer: org/netbeans/modules/php/codeception/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/codeception/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.21
+OpenIDE-Module-Specification-Version: 0.22
diff --git a/php/php.composer/manifest.mf b/php/php.composer/manifest.mf
index 5edc4ab..9bd3fa0 100644
--- a/php/php.composer/manifest.mf
+++ b/php/php.composer/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.composer/0
OpenIDE-Module-Layer: org/netbeans/modules/php/composer/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/composer/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.47
+OpenIDE-Module-Specification-Version: 0.48
diff --git a/php/php.dbgp/manifest.mf b/php/php.dbgp/manifest.mf
index 108fd8a..a27d75c 100644
--- a/php/php.dbgp/manifest.mf
+++ b/php/php.dbgp/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.dbgp
OpenIDE-Module-Layer: org/netbeans/modules/php/dbgp/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/dbgp/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
diff --git a/php/php.doctrine2/manifest.mf b/php/php.doctrine2/manifest.mf
index f16d4df..70e9baa 100644
--- a/php/php.doctrine2/manifest.mf
+++ b/php/php.doctrine2/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.doctrine2
OpenIDE-Module-Layer: org/netbeans/modules/php/doctrine2/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/doctrine2/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
diff --git a/php/php.editor/nbproject/project.properties b/php/php.editor/nbproject/project.properties
index f096c90..c5c88d1 100644
--- a/php/php.editor/nbproject/project.properties
+++ b/php/php.editor/nbproject/project.properties
@@ -20,7 +20,7 @@
nbjavac.ignore.missing.enclosing=**/CUP$ASTPHP5Parser$actions.class
javac.compilerargs=-J-Xmx512m
nbm.needs.restart=true
-spec.version.base=2.17.0
+spec.version.base=2.18.0
release.external/predefined_vars-1.0.zip=docs/predefined_vars.zip
sigtest.gen.fail.on.error=false
diff --git a/php/php.kit/manifest.mf b/php/php.kit/manifest.mf
index 967b5f9..e8e63aa 100644
--- a/php/php.kit/manifest.mf
+++ b/php/php.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.php.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.79
+OpenIDE-Module-Specification-Version: 1.80
OpenIDE-Module-Recommends: cnb.org.netbeans.modules.languages.ini, cnb.org.netbeans.modules.languages.neon, cnb.org.netbeans.modules.php.apigen, cnb.org.netbeans.modules.web.client.kit, cnb.org.netbeans.modules.websvc.saas.codegen.php, cnb.org.netbeans.modules.websvc.saas.kit, org.netbeans.modules.selenium2.php.Selenium2PhpSupportImpl
diff --git a/php/php.latte/manifest.mf b/php/php.latte/manifest.mf
index c564a6b..4707421 100644
--- a/php/php.latte/manifest.mf
+++ b/php/php.latte/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.latte/1
OpenIDE-Module-Layer: org/netbeans/modules/php/latte/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/latte/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
diff --git a/php/php.nette.tester/manifest.mf b/php/php.nette.tester/manifest.mf
index 676a13a..e1f1c5f 100644
--- a/php/php.nette.tester/manifest.mf
+++ b/php/php.nette.tester/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.nette.tester
OpenIDE-Module-Layer: org/netbeans/modules/php/nette/tester/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/nette/tester/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.31
+OpenIDE-Module-Specification-Version: 0.32
diff --git a/php/php.nette2/manifest.mf b/php/php.nette2/manifest.mf
index c0cc69d..b032030 100644
--- a/php/php.nette2/manifest.mf
+++ b/php/php.nette2/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.nette2/1
OpenIDE-Module-Layer: org/netbeans/modules/php/nette2/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/nette2/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.26
+OpenIDE-Module-Specification-Version: 1.27
diff --git a/php/php.phing/manifest.mf b/php/php.phing/manifest.mf
index e468611..982f288 100644
--- a/php/php.phing/manifest.mf
+++ b/php/php.phing/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.php.phing
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phing/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.27
+OpenIDE-Module-Specification-Version: 0.28
AutoUpdate-Show-In-Client: true
diff --git a/php/php.phpdoc/manifest.mf b/php/php.phpdoc/manifest.mf
index 817bc0b..6868273 100644
--- a/php/php.phpdoc/manifest.mf
+++ b/php/php.phpdoc/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.phpdoc
OpenIDE-Module-Layer: org/netbeans/modules/php/phpdoc/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpdoc/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/php/php.phpunit/manifest.mf b/php/php.phpunit/manifest.mf
index c021900..e781cdf 100644
--- a/php/php.phpunit/manifest.mf
+++ b/php/php.phpunit/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.phpunit/0
OpenIDE-Module-Layer: org/netbeans/modules/php/phpunit/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpunit/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.42
+OpenIDE-Module-Specification-Version: 0.43
diff --git a/php/php.project/manifest.mf b/php/php.project/manifest.mf
index d07b991..ff7bd15 100644
--- a/php/php.project/manifest.mf
+++ b/php/php.project/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.158
+OpenIDE-Module-Specification-Version: 2.159
OpenIDE-Module: org.netbeans.modules.php.project
OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties
diff --git a/php/php.refactoring/manifest.mf b/php/php.refactoring/manifest.mf
index fe09f08..585fe2b 100644
--- a/php/php.refactoring/manifest.mf
+++ b/php/php.refactoring/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.refactoring
OpenIDE-Module-Layer: org/netbeans/modules/refactoring/php/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/php/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
diff --git a/php/php.samples/manifest.mf b/php/php.samples/manifest.mf
index 411fcba..9e2bed4 100644
--- a/php/php.samples/manifest.mf
+++ b/php/php.samples/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.samples
OpenIDE-Module-Layer: org/netbeans/modules/php/samples/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/samples/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/php/php.smarty/manifest.mf b/php/php.smarty/manifest.mf
index 58107bd..27e8fbf 100644
--- a/php/php.smarty/manifest.mf
+++ b/php/php.smarty/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.smarty
OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.103
+OpenIDE-Module-Specification-Version: 1.104
diff --git a/php/php.symfony/manifest.mf b/php/php.symfony/manifest.mf
index 2ea70e5..52db463 100644
--- a/php/php.symfony/manifest.mf
+++ b/php/php.symfony/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.symfony
OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
diff --git a/php/php.symfony2/manifest.mf b/php/php.symfony2/manifest.mf
index 3893252..16e3747 100644
--- a/php/php.symfony2/manifest.mf
+++ b/php/php.symfony2/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.symfony2/1
OpenIDE-Module-Layer: org/netbeans/modules/php/symfony2/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony2/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
diff --git a/php/php.twig/manifest.mf b/php/php.twig/manifest.mf
index 2c0118c..b0eca75 100644
--- a/php/php.twig/manifest.mf
+++ b/php/php.twig/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.php.twig/1
OpenIDE-Module-Layer: org/netbeans/modules/php/twig/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/twig/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/php/php.zend/manifest.mf b/php/php.zend/manifest.mf
index 2a84be3..cd854ed 100644
--- a/php/php.zend/manifest.mf
+++ b/php/php.zend/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.zend
OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/php/php.zend2/manifest.mf b/php/php.zend2/manifest.mf
index 8f026e5..7255c84 100644
--- a/php/php.zend2/manifest.mf
+++ b/php/php.zend2/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.zend2
OpenIDE-Module-Layer: org/netbeans/modules/php/zend2/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend2/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.33
+OpenIDE-Module-Specification-Version: 0.34
diff --git a/php/selenium2.php/manifest.mf b/php/selenium2.php/manifest.mf
index 414289a..6f01d6a 100644
--- a/php/selenium2.php/manifest.mf
+++ b/php/selenium2.php/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.selenium2.php
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/php/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.selenium2.php.Selenium2PhpSupportImpl
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/php/spellchecker.bindings.php/manifest.mf b/php/spellchecker.bindings.php/manifest.mf
index d5bbcd0..39e05d9 100644
--- a/php/spellchecker.bindings.php/manifest.mf
+++ b/php/spellchecker.bindings.php/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.php
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/php/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/php/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.17
+OpenIDE-Module-Specification-Version: 0.18
diff --git a/php/websvc.saas.codegen.php/manifest.mf b/php/websvc.saas.codegen.php/manifest.mf
index 7082b12..1c77466 100644
--- a/php/websvc.saas.codegen.php/manifest.mf
+++ b/php/websvc.saas.codegen.php/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.saas.codegen.php
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/codegen/php/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
OpenIDE-Module-Layer: org/netbeans/modules/websvc/saas/codegen/php/layer.xml
diff --git a/platform/api.annotations.common/manifest.mf b/platform/api.annotations.common/manifest.mf
index 71e409a..a7a2393 100644
--- a/platform/api.annotations.common/manifest.mf
+++ b/platform/api.annotations.common/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.annotations.common/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/annotations/common/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/platform/api.htmlui/manifest.mf b/platform/api.htmlui/manifest.mf
index 3c46fe8..aebfe6b 100644
--- a/platform/api.htmlui/manifest.mf
+++ b/platform/api.htmlui/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.htmlui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/htmlui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
diff --git a/platform/api.intent/manifest.mf b/platform/api.intent/manifest.mf
index 634a827..39f2c9b 100644
--- a/platform/api.intent/manifest.mf
+++ b/platform/api.intent/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.intent
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/intent/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.19
+OpenIDE-Module-Specification-Version: 1.20
diff --git a/platform/api.io/manifest.mf b/platform/api.io/manifest.mf
index f60915e..5136de6 100644
--- a/platform/api.io/manifest.mf
+++ b/platform/api.io/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Essential-Module: true
OpenIDE-Module: org.netbeans.api.io
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/io/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
OpenIDE-Module-Recommends: org.netbeans.spi.io.InputOutputProvider
diff --git a/platform/api.progress.compat8/manifest.mf b/platform/api.progress.compat8/manifest.mf
index e949b99..925cf30 100644
--- a/platform/api.progress.compat8/manifest.mf
+++ b/platform/api.progress.compat8/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Essential-Module: true
OpenIDE-Module: org.netbeans.api.progress.compat8
OpenIDE-Module-Localizing-Bundle: api/progress/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.64
+OpenIDE-Module-Specification-Version: 1.65
OpenIDE-Module-Fragment-Host: org.netbeans.api.progress
diff --git a/platform/api.progress.nb/manifest.mf b/platform/api.progress.nb/manifest.mf
index 55cf55a..2c9440c 100644
--- a/platform/api.progress.nb/manifest.mf
+++ b/platform/api.progress.nb/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.progress.nb
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/progress/nb/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.65
+OpenIDE-Module-Specification-Version: 1.66
diff --git a/platform/api.progress/manifest.mf b/platform/api.progress/manifest.mf
index 4c7e198..1c1f381 100644
--- a/platform/api.progress/manifest.mf
+++ b/platform/api.progress/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/progress/module/resources/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.modules.progress.spi.ProgressUIWorkerProvider, org.netbeans.modules.progress.spi.RunOffEDTProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.65
+OpenIDE-Module-Specification-Version: 1.66
diff --git a/platform/api.scripting/manifest.mf b/platform/api.scripting/manifest.mf
index 6f7f073..cf2a3f3 100644
--- a/platform/api.scripting/manifest.mf
+++ b/platform/api.scripting/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.scripting
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/scripting/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.14
+OpenIDE-Module-Specification-Version: 1.15
OpenIDE-Module-Recommends: org.netbeans.spi.scripting.EngineProvider
diff --git a/platform/api.search/manifest.mf b/platform/api.search/manifest.mf
index a260093..2f2fd0c 100644
--- a/platform/api.search/manifest.mf
+++ b/platform/api.search/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.search
OpenIDE-Module-Localizing-Bundle: org/netbeans/api/search/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.38
+OpenIDE-Module-Specification-Version: 1.39
diff --git a/platform/api.templates/manifest.mf b/platform/api.templates/manifest.mf
index dbd29f1..b1fb8bf 100644
--- a/platform/api.templates/manifest.mf
+++ b/platform/api.templates/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.api.templates
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/templates/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
OpenIDE-Module-Recommends: org.netbeans.templates.IndentEngine
diff --git a/platform/api.visual/manifest.mf b/platform/api.visual/manifest.mf
index 7e03a68..de6d37e 100644
--- a/platform/api.visual/manifest.mf
+++ b/platform/api.visual/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.visual
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/visual/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.65
+OpenIDE-Module-Specification-Version: 2.66
AutoUpdate-Essential-Module: true
diff --git a/platform/applemenu/manifest.mf b/platform/applemenu/manifest.mf
index 6aed979..14e258f 100644
--- a/platform/applemenu/manifest.mf
+++ b/platform/applemenu/manifest.mf
@@ -4,6 +4,6 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/applemenu/Bundle.properties
OpenIDE-Module-Install: org/netbeans/modules/applemenu/Install.class
OpenIDE-Module-Layer: org/netbeans/modules/applemenu/layer.xml
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
OpenIDE-Module-Requires: org.openide.modules.os.MacOSX
diff --git a/platform/autoupdate.cli/manifest.mf b/platform/autoupdate.cli/manifest.mf
index d9ab2dc..e71ccde 100644
--- a/platform/autoupdate.cli/manifest.mf
+++ b/platform/autoupdate.cli/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.autoupdate.cli
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/cli/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
diff --git a/platform/autoupdate.services/manifest.mf b/platform/autoupdate.services/manifest.mf
index 20c8245..9d33d91 100644
--- a/platform/autoupdate.services/manifest.mf
+++ b/platform/autoupdate.services/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.autoupdate.services
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/services/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.72
+OpenIDE-Module-Specification-Version: 1.73
OpenIDE-Module-Layer: org/netbeans/modules/autoupdate/services/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/platform/autoupdate.ui/manifest.mf b/platform/autoupdate.ui/manifest.mf
index 7f1bf98..08892f7 100644
--- a/platform/autoupdate.ui/manifest.mf
+++ b/platform/autoupdate.ui/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.autoupdate.ui
OpenIDE-Module-Install: org/netbeans/modules/autoupdate/ui/actions/Installer.class
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/autoupdate/ui/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.63
+OpenIDE-Module-Specification-Version: 1.64
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/platform/core.execution/manifest.mf b/platform/core.execution/manifest.mf
index 816a3db..23eb81c 100644
--- a/platform/core.execution/manifest.mf
+++ b/platform/core.execution/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/execution/resources/Bundle.properties
OpenIDE-Module-Provides: org.openide.execution.ExecutionEngine, org.openide.execution.ExecutionEngine.defaultLookup
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
diff --git a/platform/core.io.ui/manifest.mf b/platform/core.io.ui/manifest.mf
index d7199cd..c6ddd5a 100644
--- a/platform/core.io.ui/manifest.mf
+++ b/platform/core.io.ui/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Provides: org.openide.windows.IOContainer$Provider
OpenIDE-Module-Layer: org/netbeans/core/io/ui/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/io/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
diff --git a/platform/core.kit/manifest.mf b/platform/core.kit/manifest.mf
index c6a1e3e..7cf957d 100644
--- a/platform/core.kit/manifest.mf
+++ b/platform/core.kit/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.core.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/core/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Essential-Module: true
diff --git a/platform/core.multitabs/nbproject/project.properties b/platform/core.multitabs/nbproject/project.properties
index 6e0b011..4c33a9d 100644
--- a/platform/core.multitabs/nbproject/project.properties
+++ b/platform/core.multitabs/nbproject/project.properties
@@ -18,5 +18,5 @@
javac.compilerargs=-Xlint -Xlint:-serial
javadoc.arch=${basedir}/arch.xml
nbm.needs.restart=true
-spec.version.base=1.29.0
+spec.version.base=1.30.0
is.autoload=true
diff --git a/platform/core.multiview/manifest.mf b/platform/core.multiview/manifest.mf
index 14d998d..fb7c6d0 100644
--- a/platform/core.multiview/manifest.mf
+++ b/platform/core.multiview/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.multiview/1
-OpenIDE-Module-Specification-Version: 1.61
+OpenIDE-Module-Specification-Version: 1.62
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/multiview/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/core/multiview/resources/mf-layer.xml
AutoUpdate-Essential-Module: true
diff --git a/platform/core.nativeaccess/manifest.mf b/platform/core.nativeaccess/manifest.mf
index d8d5bdf..fa5d1aa 100644
--- a/platform/core.nativeaccess/manifest.mf
+++ b/platform/core.nativeaccess/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.core.nativeaccess/1
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/nativeaccess/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
diff --git a/platform/core.netigso/manifest.mf b/platform/core.netigso/manifest.mf
index d775c32..04f4afa 100644
--- a/platform/core.netigso/manifest.mf
+++ b/platform/core.netigso/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.core.netigso
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/netigso/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.NetigsoFramework
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Needs: org.osgi.framework.launch.FrameworkFactory
AutoUpdate-Essential-Module: true
diff --git a/platform/core.network/manifest.mf b/platform/core.network/manifest.mf
index 5fef22f..9c0f530 100644
--- a/platform/core.network/manifest.mf
+++ b/platform/core.network/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.core.network
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/network/proxy/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.core.ProxySettings.Reloader
-OpenIDE-Module-Specification-Version: 1.29
+OpenIDE-Module-Specification-Version: 1.30
OpenIDE-Module-Recommends: javax.script.ScriptEngine.js
diff --git a/platform/core.osgi/manifest.mf b/platform/core.osgi/manifest.mf
index 7248863..2e0a470 100644
--- a/platform/core.osgi/manifest.mf
+++ b/platform/core.osgi/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.core.osgi
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/osgi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
AutoUpdate-Essential-Module: true
diff --git a/platform/core.output2/manifest.mf b/platform/core.output2/manifest.mf
index 63cbae2..9b81d16 100644
--- a/platform/core.output2/manifest.mf
+++ b/platform/core.output2/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/output2/Bundle.properties
OpenIDE-Module-Provides: org.openide.windows.IOProvider org.netbeans.spi.io.InputOutputProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
diff --git a/platform/core.startup.base/nbproject/project.properties b/platform/core.startup.base/nbproject/project.properties
index 3745073..1dba930 100644
--- a/platform/core.startup.base/nbproject/project.properties
+++ b/platform/core.startup.base/nbproject/project.properties
@@ -16,7 +16,7 @@
# under the License.
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.79.0
+spec.version.base=1.80.0
module.jar.dir=core
module.jar.basename=core-base.jar
javadoc.arch=${basedir}/arch.xml
diff --git a/platform/core.startup/nbproject/project.properties b/platform/core.startup/nbproject/project.properties
index 08ab316..8087537 100644
--- a/platform/core.startup/nbproject/project.properties
+++ b/platform/core.startup/nbproject/project.properties
@@ -21,7 +21,7 @@
javadoc.apichanges=${basedir}/apichanges.xml
module.jar.dir=core
module.jar.basename=core.jar
-spec.version.base=1.79.0
+spec.version.base=1.80.0
# XXX using a data dir from another module means that these tests cannot be run from testdist
test-unit-sys-prop.xtest.data=${nb_all}/platform/o.n.bootstrap/test/unit/data
diff --git a/platform/core.ui/manifest.mf b/platform/core.ui/manifest.mf
index f269096..9e257e7 100644
--- a/platform/core.ui/manifest.mf
+++ b/platform/core.ui/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
diff --git a/platform/core.windows/manifest.mf b/platform/core.windows/manifest.mf
index 8efda23..60db0d9 100644
--- a/platform/core.windows/manifest.mf
+++ b/platform/core.windows/manifest.mf
@@ -7,4 +7,4 @@
OpenIDE-Module-Needs: org.netbeans.swing.tabcontrol.customtabs.TabbedComponentFactory
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 2.102
+OpenIDE-Module-Specification-Version: 2.103
diff --git a/platform/editor.mimelookup.impl/manifest.mf b/platform/editor.mimelookup.impl/manifest.mf
index 7c9b6a4..0c6ac33 100644
--- a/platform/editor.mimelookup.impl/manifest.mf
+++ b/platform/editor.mimelookup.impl/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.editor.mimelookup.impl/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/mimelookup/impl/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.spi.editor.mimelookup.MimeDataProvider
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
diff --git a/platform/editor.mimelookup/manifest.mf b/platform/editor.mimelookup/manifest.mf
index f49013d..59ce66c 100644
--- a/platform/editor.mimelookup/manifest.mf
+++ b/platform/editor.mimelookup/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.editor.mimelookup/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/editor/mimelookup/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.57
+OpenIDE-Module-Specification-Version: 1.58
OpenIDE-Module-Recommends: org.netbeans.spi.editor.mimelookup.MimeDataProvider
AutoUpdate-Essential-Module: true
diff --git a/platform/favorites/manifest.mf b/platform/favorites/manifest.mf
index e64b451..c98a042 100644
--- a/platform/favorites/manifest.mf
+++ b/platform/favorites/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.favorites/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/favorites/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.63
+OpenIDE-Module-Specification-Version: 1.64
OpenIDE-Module-Layer: org/netbeans/modules/favorites/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/platform/htmlui/manifest.mf b/platform/htmlui/manifest.mf
index 3444413..ec654e3 100644
--- a/platform/htmlui/manifest.mf
+++ b/platform/htmlui/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.htmlui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/htmlui/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.2
+OpenIDE-Module-Specification-Version: 1.3
diff --git a/platform/janitor/manifest.mf b/platform/janitor/manifest.mf
index 7848e47..98b2bd8 100644
--- a/platform/janitor/manifest.mf
+++ b/platform/janitor/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.janitor
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/janitor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/platform/javahelp/manifest.mf b/platform/javahelp/manifest.mf
index dd5e39e..2a887d6 100644
--- a/platform/javahelp/manifest.mf
+++ b/platform/javahelp/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javahelp/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javahelp/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.58
+OpenIDE-Module-Specification-Version: 2.59
OpenIDE-Module-Provides: org.netbeans.api.javahelp.Help
OpenIDE-Module-Requires: org.openide.modules.InstalledFileLocator, org.openide.modules.ModuleFormat2
OpenIDE-Module-Layer: org/netbeans/modules/javahelp/resources/layer.xml
diff --git a/platform/junitlib/manifest.mf b/platform/junitlib/manifest.mf
index 669958c..ef1d019 100644
--- a/platform/junitlib/manifest.mf
+++ b/platform/junitlib/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.junitlib
OpenIDE-Module-Layer: org/netbeans/modules/junitlib/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/junitlib/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
diff --git a/platform/keyring.fallback/manifest.mf b/platform/keyring.fallback/manifest.mf
index 877078d..c092586 100644
--- a/platform/keyring.fallback/manifest.mf
+++ b/platform/keyring.fallback/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.keyring.fallback
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/fallback/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.25
+OpenIDE-Module-Specification-Version: 1.26
diff --git a/platform/keyring.impl/manifest.mf b/platform/keyring.impl/manifest.mf
index d142981..2424204 100644
--- a/platform/keyring.impl/manifest.mf
+++ b/platform/keyring.impl/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.keyring.impl
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
OpenIDE-Module-Provides: org.netbeans.modules.keyring.impl
diff --git a/platform/keyring/manifest.mf b/platform/keyring/manifest.mf
index 4f7b463..844cc59 100644
--- a/platform/keyring/manifest.mf
+++ b/platform/keyring/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.keyring
OpenIDE-Module-Layer: org/netbeans/modules/keyring/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/keyring/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
OpenIDE-Module-Recommends: org.netbeans.modules.keyring.impl
diff --git a/platform/lib.uihandler/manifest.mf b/platform/lib.uihandler/manifest.mf
index ddbbcab..4aa1a4f 100644
--- a/platform/lib.uihandler/manifest.mf
+++ b/platform/lib.uihandler/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.lib.uihandler
_OpenIDE-Module-Layer: org/netbeans/lib/uihandler/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/uihandler/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
diff --git a/platform/libs.asm/manifest.mf b/platform/libs.asm/manifest.mf
index 43f9711..b83b535 100644
--- a/platform/libs.asm/manifest.mf
+++ b/platform/libs.asm/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.asm
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/asm/Bundle.properties
-OpenIDE-Module-Specification-Version: 5.20
+OpenIDE-Module-Specification-Version: 5.21
diff --git a/platform/libs.batik.read/nbproject/project.properties b/platform/libs.batik.read/nbproject/project.properties
index 203d8c3..2e1b3f0 100644
--- a/platform/libs.batik.read/nbproject/project.properties
+++ b/platform/libs.batik.read/nbproject/project.properties
@@ -55,4 +55,4 @@
nbm.homepage=https://xmlgraphics.apache.org/batik/
sigtest.gen.fail.on.error=false
-spec.version.base=1.10.0
+spec.version.base=1.11.0
diff --git a/platform/libs.felix/manifest.mf b/platform/libs.felix/manifest.mf
index 3b6327d..31a5730 100644
--- a/platform/libs.felix/manifest.mf
+++ b/platform/libs.felix/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.felix
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/felix/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.32
+OpenIDE-Module-Specification-Version: 2.33
OpenIDE-Module-Provides: org.osgi.framework.launch.FrameworkFactory
AutoUpdate-Show-In-Client: false
Covered-Packages: META-INF,/MANIFEST.MF,org.netbeans.libs.felix,
diff --git a/platform/libs.flatlaf/manifest.mf b/platform/libs.flatlaf/manifest.mf
index fcc4201..38ed17d 100644
--- a/platform/libs.flatlaf/manifest.mf
+++ b/platform/libs.flatlaf/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/flatlaf/Bundle.properties
OpenIDE-Module: org.netbeans.libs.flatlaf/1
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.12
AutoUpdate-Show-In-Client: false
diff --git a/platform/libs.javafx/manifest.mf b/platform/libs.javafx/manifest.mf
index e2f05fe..6871c3a 100644
--- a/platform/libs.javafx/manifest.mf
+++ b/platform/libs.javafx/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.libs.javafx
OpenIDE-Module-Package-Dependencies: javafx.application[Application]
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/javafx/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.24
+OpenIDE-Module-Specification-Version: 2.25
OpenIDE-Module-Needs: org.openide.modules.jre.JavaFX
OpenIDE-Module-Provides: javafx.animation,
javafx.application,
diff --git a/platform/libs.jsr223/manifest.mf b/platform/libs.jsr223/manifest.mf
index 4148882..9239156 100644
--- a/platform/libs.jsr223/manifest.mf
+++ b/platform/libs.jsr223/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.jsr223/1
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jsr223/Bundle.properties
OpenIDE-Module-Deprecated: true
diff --git a/platform/libs.junit4/manifest.mf b/platform/libs.junit4/manifest.mf
index 50d082c..76bca36 100644
--- a/platform/libs.junit4/manifest.mf
+++ b/platform/libs.junit4/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.junit4
-OpenIDE-Module-Specification-Version: 1.35
+OpenIDE-Module-Specification-Version: 1.36
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/junit4/Bundle.properties
diff --git a/platform/libs.junit5/manifest.mf b/platform/libs.junit5/manifest.mf
index a5406dc..0e689ba 100644
--- a/platform/libs.junit5/manifest.mf
+++ b/platform/libs.junit5/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.junit5
-OpenIDE-Module-Specification-Version: 1.14
+OpenIDE-Module-Specification-Version: 1.15
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/junit5/Bundle.properties
diff --git a/platform/libs.osgi/manifest.mf b/platform/libs.osgi/manifest.mf
index ee61c1c..dac5cd1 100644
--- a/platform/libs.osgi/manifest.mf
+++ b/platform/libs.osgi/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.osgi
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/osgi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.39
+OpenIDE-Module-Specification-Version: 1.40
diff --git a/platform/libs.testng/manifest.mf b/platform/libs.testng/manifest.mf
index 620d623..684cadc 100644
--- a/platform/libs.testng/manifest.mf
+++ b/platform/libs.testng/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.libs.testng/1
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/testng/Bundle.properties
diff --git a/platform/masterfs.linux/manifest.mf b/platform/masterfs.linux/manifest.mf
index d438fc1..12d272d 100644
--- a/platform/masterfs.linux/manifest.mf
+++ b/platform/masterfs.linux/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.masterfs.linux
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/linux/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.31
OpenIDE-Module-Requires: org.openide.modules.os.Linux
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
diff --git a/platform/masterfs.macosx/manifest.mf b/platform/masterfs.macosx/manifest.mf
index 8a0e3d5..d34dd31 100644
--- a/platform/masterfs.macosx/manifest.mf
+++ b/platform/masterfs.macosx/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.masterfs.macosx
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/macosx/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.31
OpenIDE-Module-Requires: org.openide.modules.os.MacOSX
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
diff --git a/platform/masterfs.nio2/manifest.mf b/platform/masterfs.nio2/manifest.mf
index b30ab14..3f8d801 100644
--- a/platform/masterfs.nio2/manifest.mf
+++ b/platform/masterfs.nio2/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.masterfs.nio2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/nio2/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
diff --git a/platform/masterfs.ui/nbproject/project.properties b/platform/masterfs.ui/nbproject/project.properties
index 95898f2..cb420a6 100644
--- a/platform/masterfs.ui/nbproject/project.properties
+++ b/platform/masterfs.ui/nbproject/project.properties
@@ -17,4 +17,4 @@
is.eager=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.20.0
+spec.version.base=2.21.0
diff --git a/platform/masterfs.windows/manifest.mf b/platform/masterfs.windows/manifest.mf
index 9e00fd1..dc32d1e 100644
--- a/platform/masterfs.windows/manifest.mf
+++ b/platform/masterfs.windows/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/masterfs/watcher/windows/Bundle.properties
OpenIDE-Module-Requires: org.openide.modules.os.Windows
OpenIDE-Module-Provides: org.netbeans.modules.masterfs.providers.Notifier
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
diff --git a/platform/masterfs/nbproject/project.properties b/platform/masterfs/nbproject/project.properties
index 03973f7..a67fbb1 100644
--- a/platform/masterfs/nbproject/project.properties
+++ b/platform/masterfs/nbproject/project.properties
@@ -35,4 +35,4 @@
**/SlowRefreshAndPriorityIOTest.class,\
**/SlowRefreshSuspendableTest.class,\
**/StatFilesTest.class
-spec.version.base=2.72.0
+spec.version.base=2.73.0
diff --git a/platform/netbinox/manifest.mf b/platform/netbinox/manifest.mf
index 7ae5341..bb366e7 100644
--- a/platform/netbinox/manifest.mf
+++ b/platform/netbinox/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.netbinox
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/netbinox/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.58
+OpenIDE-Module-Specification-Version: 1.59
OpenIDE-Module-Provides: org.osgi.framework.launch.FrameworkFactory, org.netbeans.Netbinox
OpenIDE-Module-Hide-Classpath-Packages: org.eclipse.core.runtime.**,org.eclipse.osgi.**
Covered-Packages: META-INF,org.netbeans.modules.netbinox,
diff --git a/platform/o.apache.commons.codec/manifest.mf b/platform/o.apache.commons.codec/manifest.mf
index 8de868c..2672196 100644
--- a/platform/o.apache.commons.codec/manifest.mf
+++ b/platform/o.apache.commons.codec/manifest.mf
@@ -1,2 +1,2 @@
OpenIDE-Module: org.apache.commons.codec
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
diff --git a/platform/o.apache.commons.io/manifest.mf b/platform/o.apache.commons.io/manifest.mf
index 683386f..2b6dc6e 100644
--- a/platform/o.apache.commons.io/manifest.mf
+++ b/platform/o.apache.commons.io/manifest.mf
@@ -1,2 +1,2 @@
OpenIDE-Module: org.apache.commons.io
-OpenIDE-Module-Specification-Version: 2.16
+OpenIDE-Module-Specification-Version: 2.17
diff --git a/platform/o.apache.commons.lang3/manifest.mf b/platform/o.apache.commons.lang3/manifest.mf
index e0ee4b2..381d645 100644
--- a/platform/o.apache.commons.lang3/manifest.mf
+++ b/platform/o.apache.commons.lang3/manifest.mf
@@ -1,2 +1,2 @@
OpenIDE-Module: org.apache.commons.lang3
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
diff --git a/platform/o.apache.commons.logging/manifest.mf b/platform/o.apache.commons.logging/manifest.mf
index 7755b44..3804506 100644
--- a/platform/o.apache.commons.logging/manifest.mf
+++ b/platform/o.apache.commons.logging/manifest.mf
@@ -1,2 +1,2 @@
OpenIDE-Module: org.apache.commons.logging
-OpenIDE-Module-Specification-Version: 1.12
+OpenIDE-Module-Specification-Version: 1.13
diff --git a/platform/o.n.bootstrap/manifest.mf b/platform/o.n.bootstrap/manifest.mf
index b460486..ca8d0bc 100644
--- a/platform/o.n.bootstrap/manifest.mf
+++ b/platform/o.n.bootstrap/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.bootstrap/1
-OpenIDE-Module-Specification-Version: 2.95
+OpenIDE-Module-Specification-Version: 2.96
OpenIDE-Module-Localizing-Bundle: org/netbeans/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.NetigsoFramework
diff --git a/platform/o.n.core/manifest.mf b/platform/o.n.core/manifest.mf
index 8b182b2..068a678 100644
--- a/platform/o.n.core/manifest.mf
+++ b/platform/o.n.core/manifest.mf
@@ -5,5 +5,5 @@
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
OpenIDE-Module-Recommends: org.netbeans.core.ProxySettings.Reloader
-OpenIDE-Module-Specification-Version: 3.68
+OpenIDE-Module-Specification-Version: 3.69
diff --git a/platform/o.n.swing.laf.dark/nbproject/project.properties b/platform/o.n.swing.laf.dark/nbproject/project.properties
index 5022206..5f4df7d 100644
--- a/platform/o.n.swing.laf.dark/nbproject/project.properties
+++ b/platform/o.n.swing.laf.dark/nbproject/project.properties
@@ -18,4 +18,4 @@
is.autoload=true
javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=2.12.0
+spec.version.base=2.13.0
diff --git a/platform/o.n.swing.laf.flatlaf/manifest.mf b/platform/o.n.swing.laf.flatlaf/manifest.mf
index 3902bc7..ed66410 100644
--- a/platform/o.n.swing.laf.flatlaf/manifest.mf
+++ b/platform/o.n.swing.laf.flatlaf/manifest.mf
@@ -3,6 +3,6 @@
OpenIDE-Module-Layer: org/netbeans/swing/laf/flatlaf/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/laf/flatlaf/Bundle.properties
OpenIDE-Module: org.netbeans.swing.laf.flatlaf
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
AutoUpdate-Show-In-Client: false
diff --git a/platform/o.n.swing.outline/manifest.mf b/platform/o.n.swing.outline/manifest.mf
index 2bcc81e..483ca2b 100644
--- a/platform/o.n.swing.outline/manifest.mf
+++ b/platform/o.n.swing.outline/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.swing.outline
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/outline/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.51
+OpenIDE-Module-Specification-Version: 1.52
diff --git a/platform/o.n.swing.plaf/manifest.mf b/platform/o.n.swing.plaf/manifest.mf
index dea55ec..2d12b13 100644
--- a/platform/o.n.swing.plaf/manifest.mf
+++ b/platform/o.n.swing.plaf/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties
OpenIDE-Module: org.netbeans.swing.plaf
-OpenIDE-Module-Specification-Version: 1.59
+OpenIDE-Module-Specification-Version: 1.60
AutoUpdate-Show-In-Client: false
diff --git a/platform/o.n.swing.tabcontrol/manifest.mf b/platform/o.n.swing.tabcontrol/manifest.mf
index de5acb7..86db9ab 100644
--- a/platform/o.n.swing.tabcontrol/manifest.mf
+++ b/platform/o.n.swing.tabcontrol/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/tabcontrol/Bundle.properties
OpenIDE-Module: org.netbeans.swing.tabcontrol
-OpenIDE-Module-Specification-Version: 1.74
+OpenIDE-Module-Specification-Version: 1.75
AutoUpdate-Essential-Module: true
diff --git a/platform/openide.actions/manifest.mf b/platform/openide.actions/manifest.mf
index a16904b..47f94a0 100644
--- a/platform/openide.actions/manifest.mf
+++ b/platform/openide.actions/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/openide/actions/Bundle.properties
AutoUpdate-Essential-Module: true
OpenIDE-Module-Recommends: org.openide.util.spi.SVGLoader
-OpenIDE-Module-Specification-Version: 6.56
+OpenIDE-Module-Specification-Version: 6.57
diff --git a/platform/openide.awt/manifest.mf b/platform/openide.awt/manifest.mf
index 1e9f14e..776a07a 100644
--- a/platform/openide.awt/manifest.mf
+++ b/platform/openide.awt/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.openide.awt
OpenIDE-Module-Localizing-Bundle: org/openide/awt/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 7.85
+OpenIDE-Module-Specification-Version: 7.86
diff --git a/platform/openide.compat/manifest.mf b/platform/openide.compat/manifest.mf
index 652228c..0d710e6 100644
--- a/platform/openide.compat/manifest.mf
+++ b/platform/openide.compat/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.compat
-OpenIDE-Module-Specification-Version: 6.57
+OpenIDE-Module-Specification-Version: 6.58
OpenIDE-Module-Deprecated: true
OpenIDE-Module-Localizing-Bundle: org/openide/compat/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/platform/openide.dialogs/manifest.mf b/platform/openide.dialogs/manifest.mf
index 9583d33..c1bea57 100644
--- a/platform/openide.dialogs/manifest.mf
+++ b/platform/openide.dialogs/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.dialogs
-OpenIDE-Module-Specification-Version: 7.63
+OpenIDE-Module-Specification-Version: 7.64
OpenIDE-Module-Localizing-Bundle: org/openide/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/platform/openide.execution.compat8/manifest.mf b/platform/openide.execution.compat8/manifest.mf
index 9f0ddb6..53cd111 100644
--- a/platform/openide.execution.compat8/manifest.mf
+++ b/platform/openide.execution.compat8/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.execution.compat8
OpenIDE-Module-Localizing-Bundle: org/openide/execution/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.19
+OpenIDE-Module-Specification-Version: 9.20
OpenIDE-Module-Fragment-Host: org.openide.execution
diff --git a/platform/openide.execution/manifest.mf b/platform/openide.execution/manifest.mf
index 302800c..4aa4a39 100644
--- a/platform/openide.execution/manifest.mf
+++ b/platform/openide.execution/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.execution
-OpenIDE-Module-Specification-Version: 9.20
+OpenIDE-Module-Specification-Version: 9.21
OpenIDE-Module-Localizing-Bundle: org/openide/execution/Bundle.properties
OpenIDE-Module-Recommends: org.openide.execution.ExecutionEngine
AutoUpdate-Essential-Module: true
diff --git a/platform/openide.explorer/manifest.mf b/platform/openide.explorer/manifest.mf
index 939e190..bea85bb 100644
--- a/platform/openide.explorer/manifest.mf
+++ b/platform/openide.explorer/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.openide.explorer
OpenIDE-Module-Localizing-Bundle: org/openide/explorer/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 6.79
+OpenIDE-Module-Specification-Version: 6.80
diff --git a/platform/openide.filesystems.compat8/manifest.mf b/platform/openide.filesystems.compat8/manifest.mf
index d4a5b50..b75ed86 100644
--- a/platform/openide.filesystems.compat8/manifest.mf
+++ b/platform/openide.filesystems.compat8/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.filesystems.compat8
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/compat8/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.26
+OpenIDE-Module-Specification-Version: 9.27
OpenIDE-Module-Fragment-Host: org.openide.filesystems
diff --git a/platform/openide.filesystems.nb/manifest.mf b/platform/openide.filesystems.nb/manifest.mf
index ac9b6b2..66fa1f7 100644
--- a/platform/openide.filesystems.nb/manifest.mf
+++ b/platform/openide.filesystems.nb/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.filesystems.nb
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/nb/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.27
+OpenIDE-Module-Specification-Version: 9.28
diff --git a/platform/openide.filesystems/manifest.mf b/platform/openide.filesystems/manifest.mf
index ad732a9..73deb39 100644
--- a/platform/openide.filesystems/manifest.mf
+++ b/platform/openide.filesystems/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.openide.filesystems
OpenIDE-Module-Localizing-Bundle: org/openide/filesystems/Bundle.properties
OpenIDE-Module-Layer: org/openide/filesystems/resources/layer.xml
-OpenIDE-Module-Specification-Version: 9.29
+OpenIDE-Module-Specification-Version: 9.30
diff --git a/platform/openide.io/manifest.mf b/platform/openide.io/manifest.mf
index cb5ceb3..41f6720 100644
--- a/platform/openide.io/manifest.mf
+++ b/platform/openide.io/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.io
-OpenIDE-Module-Specification-Version: 1.66
+OpenIDE-Module-Specification-Version: 1.67
OpenIDE-Module-Localizing-Bundle: org/openide/io/Bundle.properties
OpenIDE-Module-Recommends: org.openide.windows.IOProvider, org.openide.windows.IOContainer$Provider
AutoUpdate-Essential-Module: true
diff --git a/platform/openide.loaders/manifest.mf b/platform/openide.loaders/manifest.mf
index 74107f1..e167367 100644
--- a/platform/openide.loaders/manifest.mf
+++ b/platform/openide.loaders/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.loaders
-OpenIDE-Module-Specification-Version: 7.87
+OpenIDE-Module-Specification-Version: 7.88
OpenIDE-Module-Localizing-Bundle: org/openide/loaders/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.templates.v1_0
OpenIDE-Module-Layer: org/netbeans/modules/openide/loaders/layer.xml
diff --git a/platform/openide.modules/manifest.mf b/platform/openide.modules/manifest.mf
index 9300c03..4df5e19 100644
--- a/platform/openide.modules/manifest.mf
+++ b/platform/openide.modules/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.modules
OpenIDE-Module-Localizing-Bundle: org/openide/modules/Bundle.properties
-OpenIDE-Module-Specification-Version: 7.65
+OpenIDE-Module-Specification-Version: 7.66
diff --git a/platform/openide.nodes/manifest.mf b/platform/openide.nodes/manifest.mf
index 43a46b0..a2078cc 100644
--- a/platform/openide.nodes/manifest.mf
+++ b/platform/openide.nodes/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.openide.nodes
OpenIDE-Module-Localizing-Bundle: org/openide/nodes/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 7.62
+OpenIDE-Module-Specification-Version: 7.63
diff --git a/platform/openide.options/manifest.mf b/platform/openide.options/manifest.mf
index acc1f29..518cd48 100644
--- a/platform/openide.options/manifest.mf
+++ b/platform/openide.options/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.options
-OpenIDE-Module-Specification-Version: 6.54
+OpenIDE-Module-Specification-Version: 6.55
OpenIDE-Module-Localizing-Bundle: org/openide/options/Bundle.properties
OpenIDE-Module-Deprecated: true
AutoUpdate-Essential-Module: true
diff --git a/platform/openide.text/manifest.mf b/platform/openide.text/manifest.mf
index 4547fd1..c6c6ddd 100644
--- a/platform/openide.text/manifest.mf
+++ b/platform/openide.text/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.openide.text
OpenIDE-Module-Localizing-Bundle: org/openide/text/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 6.85
+OpenIDE-Module-Specification-Version: 6.86
diff --git a/platform/openide.util.lookup/manifest.mf b/platform/openide.util.lookup/manifest.mf
index 1040742..9f76dca 100644
--- a/platform/openide.util.lookup/manifest.mf
+++ b/platform/openide.util.lookup/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util.lookup
OpenIDE-Module-Localizing-Bundle: org/openide/util/lookup/Bundle.properties
-OpenIDE-Module-Specification-Version: 8.51
+OpenIDE-Module-Specification-Version: 8.52
diff --git a/platform/openide.util.ui.svg/manifest.mf b/platform/openide.util.ui.svg/manifest.mf
index 134d5b2..f28fb03 100644
--- a/platform/openide.util.ui.svg/manifest.mf
+++ b/platform/openide.util.ui.svg/manifest.mf
@@ -2,6 +2,6 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.openide.util.ui.svg
OpenIDE-Module-Localizing-Bundle: org/openide/util/svg/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.12
OpenIDE-Module-Provides: org.openide.util.spi.SVGLoader
diff --git a/platform/openide.util.ui/manifest.mf b/platform/openide.util.ui/manifest.mf
index a4cf730..00c792b 100644
--- a/platform/openide.util.ui/manifest.mf
+++ b/platform/openide.util.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util.ui
OpenIDE-Module-Localizing-Bundle: org/openide/util/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.25
+OpenIDE-Module-Specification-Version: 9.26
diff --git a/platform/openide.util/manifest.mf b/platform/openide.util/manifest.mf
index 102627a..7f9ea07 100644
--- a/platform/openide.util/manifest.mf
+++ b/platform/openide.util/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.util
OpenIDE-Module-Localizing-Bundle: org/openide/util/base/Bundle.properties
-OpenIDE-Module-Specification-Version: 9.25
+OpenIDE-Module-Specification-Version: 9.26
diff --git a/platform/openide.windows/manifest.mf b/platform/openide.windows/manifest.mf
index 5cfe196..881fd5f 100644
--- a/platform/openide.windows/manifest.mf
+++ b/platform/openide.windows/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.openide.windows
-OpenIDE-Module-Specification-Version: 6.94
+OpenIDE-Module-Specification-Version: 6.95
OpenIDE-Module-Localizing-Bundle: org/openide/windows/Bundle.properties
AutoUpdate-Essential-Module: true
diff --git a/platform/options.api/manifest.mf b/platform/options.api/manifest.mf
index dfcc836..5a1bdd9 100644
--- a/platform/options.api/manifest.mf
+++ b/platform/options.api/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.options.api/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.62
+OpenIDE-Module-Specification-Version: 1.63
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/platform/options.keymap/manifest.mf b/platform/options.keymap/manifest.mf
index a73705d..215bb9a 100644
--- a/platform/options.keymap/manifest.mf
+++ b/platform/options.keymap/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.options.keymap
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/keymap/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/keymap/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/platform/print/manifest.mf b/platform/print/manifest.mf
index ce3a6fa..7e59bbf 100644
--- a/platform/print/manifest.mf
+++ b/platform/print/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 7.43
+OpenIDE-Module-Specification-Version: 7.44
OpenIDE-Module: org.netbeans.modules.print
OpenIDE-Module-Layer: org/netbeans/modules/print/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/print/resources/Bundle.properties
diff --git a/platform/progress.ui/manifest.mf b/platform/progress.ui/manifest.mf
index c9b6d74..eba92ef 100644
--- a/platform/progress.ui/manifest.mf
+++ b/platform/progress.ui/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/progress/ui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.modules.progress.spi.ProgressUIWorkerProvider, org.netbeans.modules.progress.spi.RunOffEDTProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/platform/queries/manifest.mf b/platform/queries/manifest.mf
index d79b6f5..913c58f 100644
--- a/platform/queries/manifest.mf
+++ b/platform/queries/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.queries/1
-OpenIDE-Module-Specification-Version: 1.60
+OpenIDE-Module-Specification-Version: 1.61
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/queries/Bundle.properties
diff --git a/platform/sampler/manifest.mf b/platform/sampler/manifest.mf
index 49dc27b..b90f2d5 100644
--- a/platform/sampler/manifest.mf
+++ b/platform/sampler/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.sampler
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/sampler/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
Main-Class: org.netbeans.modules.sampler.CLISampler
diff --git a/platform/sendopts/manifest.mf b/platform/sendopts/manifest.mf
index 614b91a..64f95f5 100644
--- a/platform/sendopts/manifest.mf
+++ b/platform/sendopts/manifest.mf
@@ -1,5 +1,5 @@
OpenIDE-Module: org.netbeans.modules.sendopts/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/sendopts/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.53
+OpenIDE-Module-Specification-Version: 2.54
AutoUpdate-Essential-Module: true
diff --git a/platform/settings/manifest.mf b/platform/settings/manifest.mf
index c79c4d8..5f5efef 100644
--- a/platform/settings/manifest.mf
+++ b/platform/settings/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Layer: org/netbeans/modules/settings/resources/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/settings/resources/Bundle.properties
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.66
+OpenIDE-Module-Specification-Version: 1.67
diff --git a/platform/spi.actions/manifest.mf b/platform/spi.actions/manifest.mf
index 2daf45c..e4c1807 100644
--- a/platform/spi.actions/manifest.mf
+++ b/platform/spi.actions/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.spi.actions/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/spi/actions/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
diff --git a/platform/spi.quicksearch/manifest.mf b/platform/spi.quicksearch/manifest.mf
index 98d4f3e..64e2ebf 100644
--- a/platform/spi.quicksearch/manifest.mf
+++ b/platform/spi.quicksearch/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.spi.quicksearch
OpenIDE-Module-Layer: org/netbeans/modules/quicksearch/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/spi/quicksearch/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
diff --git a/platform/templates/manifest.mf b/platform/templates/manifest.mf
index 6a159e7..201bb26 100644
--- a/platform/templates/manifest.mf
+++ b/platform/templates/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.templates/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/templates/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
OpenIDE-Module-Layer: org/netbeans/modules/templates/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/platform/templatesui/manifest.mf b/platform/templatesui/manifest.mf
index 12d0079..76ea1d5 100644
--- a/platform/templatesui/manifest.mf
+++ b/platform/templatesui/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.templatesui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/templatesui/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.api.templates.wizard
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/platform/uihandler/manifest.mf b/platform/uihandler/manifest.mf
index d715cd3..8b0bd1b 100644
--- a/platform/uihandler/manifest.mf
+++ b/platform/uihandler/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Install: org/netbeans/modules/uihandler/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/uihandler/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/uihandler/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.52
+OpenIDE-Module-Specification-Version: 2.53
diff --git a/profiler/debugger.jpda.heapwalk/manifest.mf b/profiler/debugger.jpda.heapwalk/manifest.mf
index 0913415..167741e 100644
--- a/profiler/debugger.jpda.heapwalk/manifest.mf
+++ b/profiler/debugger.jpda.heapwalk/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.debugger.jpda.heapwalk/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/heapwalk/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/heapwalk/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
org.netbeans.spi.debugger.ui
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.heapwalk
diff --git a/profiler/lib.profiler.charts/manifest.mf b/profiler/lib.profiler.charts/manifest.mf
index 49930a4..f127c38 100644
--- a/profiler/lib.profiler.charts/manifest.mf
+++ b/profiler/lib.profiler.charts/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.profiler.charts/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/profiler/charts/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
diff --git a/profiler/lib.profiler.common/manifest.mf b/profiler/lib.profiler.common/manifest.mf
index 07d1ddc..978b549 100644
--- a/profiler/lib.profiler.common/manifest.mf
+++ b/profiler/lib.profiler.common/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.profiler.common/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/profiler/common/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.64
+OpenIDE-Module-Specification-Version: 1.65
OpenIDE-Module-Needs: org.netbeans.lib.profiler.common.Profiler
diff --git a/profiler/lib.profiler.ui/manifest.mf b/profiler/lib.profiler.ui/manifest.mf
index 5e66e6a..a2219ba 100644
--- a/profiler/lib.profiler.ui/manifest.mf
+++ b/profiler/lib.profiler.ui/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.profiler.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/profiler/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.163
+OpenIDE-Module-Specification-Version: 1.164
diff --git a/profiler/lib.profiler/manifest.mf b/profiler/lib.profiler/manifest.mf
index bede959..432b418 100644
--- a/profiler/lib.profiler/manifest.mf
+++ b/profiler/lib.profiler/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.profiler/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/profiler/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.126
+OpenIDE-Module-Specification-Version: 1.127
diff --git a/profiler/maven.profiler/manifest.mf b/profiler/maven.profiler/manifest.mf
index eeb87c8..937c29f 100644
--- a/profiler/maven.profiler/manifest.mf
+++ b/profiler/maven.profiler/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven.profiler/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/profiler/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.49
+OpenIDE-Module-Specification-Version: 1.50
AutoUpdate-Show-In-Client: false
diff --git a/profiler/profiler.api/manifest.mf b/profiler/profiler.api/manifest.mf
index f41061f..4487b6b 100644
--- a/profiler/profiler.api/manifest.mf
+++ b/profiler/profiler.api/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.profiler.api/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.67
+OpenIDE-Module-Specification-Version: 1.68
Netigso-Export-Package: org.netbeans.modules.profiler.spi
diff --git a/profiler/profiler.attach/manifest.mf b/profiler/profiler.attach/manifest.mf
index c6c2c09..b04170a 100644
--- a/profiler/profiler.attach/manifest.mf
+++ b/profiler/profiler.attach/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.profiler.attach/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/attach/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.38
+OpenIDE-Module-Specification-Version: 2.39
diff --git a/profiler/profiler.freeform/manifest.mf b/profiler/profiler.freeform/manifest.mf
index 728e017..ad78315 100644
--- a/profiler/profiler.freeform/manifest.mf
+++ b/profiler/profiler.freeform/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.profiler.freeform/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/freeform/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
diff --git a/profiler/profiler.heapwalker/manifest.mf b/profiler/profiler.heapwalker/manifest.mf
index ef19d0e..a6c46ea 100644
--- a/profiler/profiler.heapwalker/manifest.mf
+++ b/profiler/profiler.heapwalker/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.profiler.heapwalker
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/heapwalker/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.129
+OpenIDE-Module-Specification-Version: 1.130
diff --git a/profiler/profiler.j2se/manifest.mf b/profiler/profiler.j2se/manifest.mf
index 0b6157e..78db31b 100644
--- a/profiler/profiler.j2se/manifest.mf
+++ b/profiler/profiler.j2se/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.profiler.j2se/1
OpenIDE-Module-Layer: org/netbeans/modules/profiler/j2se/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/j2se/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.53
+OpenIDE-Module-Specification-Version: 1.54
diff --git a/profiler/profiler.kit/manifest.mf b/profiler/profiler.kit/manifest.mf
index 67a5e26..b9646f0 100644
--- a/profiler/profiler.kit/manifest.mf
+++ b/profiler/profiler.kit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.profiler.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.36
+OpenIDE-Module-Specification-Version: 1.37
OpenIDE-Module-Provides: org.netbeans.modules.profiler
diff --git a/profiler/profiler.nbimpl/manifest.mf b/profiler/profiler.nbimpl/manifest.mf
index d671e68..91142a1 100644
--- a/profiler/profiler.nbimpl/manifest.mf
+++ b/profiler/profiler.nbimpl/manifest.mf
@@ -4,4 +4,4 @@
OpenIDE-Module-Layer: org/netbeans/modules/profiler/nbimpl/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/nbimpl/Bundle.properties
OpenIDE-Module-Provides: org.netbeans.lib.profiler.common.Profiler
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/profiler/profiler.nbmodule/manifest.mf b/profiler/profiler.nbmodule/manifest.mf
index d039d24..9a5ec16 100644
--- a/profiler/profiler.nbmodule/manifest.mf
+++ b/profiler/profiler.nbmodule/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.profiler.nbmodule/1
OpenIDE-Module-Layer: org/netbeans/modules/profiler/nbmodule/mf-layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/nbmodule/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.52
+OpenIDE-Module-Specification-Version: 1.53
diff --git a/profiler/profiler.options/manifest.mf b/profiler/profiler.options/manifest.mf
index 7bba278..4eb0535 100644
--- a/profiler/profiler.options/manifest.mf
+++ b/profiler/profiler.options/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.profiler.options
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/options/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.modules.options.java
-OpenIDE-Module-Specification-Version: 1.36
+OpenIDE-Module-Specification-Version: 1.37
diff --git a/profiler/profiler.oql.language/manifest.mf b/profiler/profiler.oql.language/manifest.mf
index 730adbf..f17bfcd 100644
--- a/profiler/profiler.oql.language/manifest.mf
+++ b/profiler/profiler.oql.language/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module: org.netbeans.modules.profiler.oql.language/0
OpenIDE-Module-Layer: org/netbeans/modules/profiler/oql/language/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/oql/language/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.45
+OpenIDE-Module-Specification-Version: 0.46
diff --git a/profiler/profiler.oql/manifest.mf b/profiler/profiler.oql/manifest.mf
index fd0e7c8..5ae7d21 100644
--- a/profiler/profiler.oql/manifest.mf
+++ b/profiler/profiler.oql/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.profiler.oql/2
OpenIDE-Module-Layer: org/netbeans/modules/profiler/oql/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/oql/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.35
+OpenIDE-Module-Specification-Version: 2.36
diff --git a/profiler/profiler.ppoints/manifest.mf b/profiler/profiler.ppoints/manifest.mf
index 95631f5..549e27b 100644
--- a/profiler/profiler.ppoints/manifest.mf
+++ b/profiler/profiler.ppoints/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.profiler.ppoints
OpenIDE-Module-Layer: org/netbeans/modules/profiler/ppoints/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/ppoints/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
diff --git a/profiler/profiler.projectsupport/manifest.mf b/profiler/profiler.projectsupport/manifest.mf
index fcdc0ab..6cf4837 100644
--- a/profiler/profiler.projectsupport/manifest.mf
+++ b/profiler/profiler.projectsupport/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.profiler.projectsupport
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/projectsupport/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
diff --git a/profiler/profiler.snaptracer/manifest.mf b/profiler/profiler.snaptracer/manifest.mf
index 94d423c..707fc27 100644
--- a/profiler/profiler.snaptracer/manifest.mf
+++ b/profiler/profiler.snaptracer/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.profiler.snaptracer/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/snaptracer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.41
+OpenIDE-Module-Specification-Version: 1.42
diff --git a/profiler/profiler.utilities/manifest.mf b/profiler/profiler.utilities/manifest.mf
index 3b9f85b..6831688 100644
--- a/profiler/profiler.utilities/manifest.mf
+++ b/profiler/profiler.utilities/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.profiler.utilities/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/utilities/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.54
+OpenIDE-Module-Specification-Version: 1.55
diff --git a/profiler/profiler/manifest.mf b/profiler/profiler/manifest.mf
index 8303eeb..87cea1b 100644
--- a/profiler/profiler/manifest.mf
+++ b/profiler/profiler/manifest.mf
@@ -5,5 +5,5 @@
OpenIDE-Module-Install: org/netbeans/modules/profiler/ProfilerModule.class
OpenIDE-Module-Requires: org.openide.windows.WindowManager
OpenIDE-Module-Package-Dependencies: com.sun.tools.attach[VirtualMachine]
-OpenIDE-Module-Specification-Version: 3.46
+OpenIDE-Module-Specification-Version: 3.47
diff --git a/webcommon/api.knockout/manifest.mf b/webcommon/api.knockout/manifest.mf
index cbbdd07..8abce2d 100644
--- a/webcommon/api.knockout/manifest.mf
+++ b/webcommon/api.knockout/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.knockout
OpenIDE-Module-Localizing-Bundle: org/netbeans/spi/knockout/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.18
+OpenIDE-Module-Specification-Version: 1.19
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/cordova.platforms.android/manifest.mf b/webcommon/cordova.platforms.android/manifest.mf
index 66984b4..1211cf4 100644
--- a/webcommon/cordova.platforms.android/manifest.mf
+++ b/webcommon/cordova.platforms.android/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.cordova.platforms.android
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cordova/platforms/android/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.43
+OpenIDE-Module-Specification-Version: 1.44
diff --git a/webcommon/cordova.platforms/manifest.mf b/webcommon/cordova.platforms/manifest.mf
index 0727be3..2aae059 100644
--- a/webcommon/cordova.platforms/manifest.mf
+++ b/webcommon/cordova.platforms/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.cordova.platforms
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cordova/platforms/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.53
+OpenIDE-Module-Specification-Version: 1.54
diff --git a/webcommon/cordova/manifest.mf b/webcommon/cordova/manifest.mf
index 8b76d34..da61545 100644
--- a/webcommon/cordova/manifest.mf
+++ b/webcommon/cordova/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.cordova
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/cordova/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.50
+OpenIDE-Module-Specification-Version: 1.51
OpenIDE-Module-Layer: org/netbeans/modules/cordova/resources/layer.xml
OpenIDE-Module-Recommends: cnb.org.netbeans.modules.cordova.platforms.ios
diff --git a/webcommon/extbrowser.chrome/manifest.mf b/webcommon/extbrowser.chrome/manifest.mf
index ba9c1b8..47139b5 100644
--- a/webcommon/extbrowser.chrome/manifest.mf
+++ b/webcommon/extbrowser.chrome/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.extbrowser.chrome
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/extbrowser/chrome/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/html.angular/manifest.mf b/webcommon/html.angular/manifest.mf
index 0aa4fa2..256436f 100644
--- a/webcommon/html.angular/manifest.mf
+++ b/webcommon/html.angular/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.html.angular
OpenIDE-Module-Layer: org/netbeans/modules/html/angular/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/angular/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.29
+OpenIDE-Module-Specification-Version: 1.30
diff --git a/webcommon/html.knockout/manifest.mf b/webcommon/html.knockout/manifest.mf
index 553b6e5..0384a94 100644
--- a/webcommon/html.knockout/manifest.mf
+++ b/webcommon/html.knockout/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.html.knockout
OpenIDE-Module-Layer: org/netbeans/modules/html/knockout/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/knockout/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
OpenIDE-Module-Provides: org.netbeans.modules.ko4j.editing
diff --git a/webcommon/javascript.bower/manifest.mf b/webcommon/javascript.bower/manifest.mf
index 5423245..da6c192 100644
--- a/webcommon/javascript.bower/manifest.mf
+++ b/webcommon/javascript.bower/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript.bower
OpenIDE-Module-Layer: org/netbeans/modules/javascript/bower/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/bower/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.22
+OpenIDE-Module-Specification-Version: 0.23
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.cdnjs/manifest.mf b/webcommon/javascript.cdnjs/manifest.mf
index 0f82b82..e153120 100644
--- a/webcommon/javascript.cdnjs/manifest.mf
+++ b/webcommon/javascript.cdnjs/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript.cdnjs/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/cdnjs/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.24
+OpenIDE-Module-Specification-Version: 0.25
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.grunt/manifest.mf b/webcommon/javascript.grunt/manifest.mf
index e1abd80..75165fa 100644
--- a/webcommon/javascript.grunt/manifest.mf
+++ b/webcommon/javascript.grunt/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript.grunt
OpenIDE-Module-Layer: org/netbeans/modules/javascript/grunt/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/grunt/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.31
+OpenIDE-Module-Specification-Version: 0.32
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.gulp/manifest.mf b/webcommon/javascript.gulp/manifest.mf
index 38a4d5b..465026e 100644
--- a/webcommon/javascript.gulp/manifest.mf
+++ b/webcommon/javascript.gulp/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript.gulp
OpenIDE-Module-Layer: org/netbeans/modules/javascript/gulp/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/gulp/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.30
+OpenIDE-Module-Specification-Version: 0.31
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.jstestdriver/manifest.mf b/webcommon/javascript.jstestdriver/manifest.mf
index 15b4575..cdb3766 100644
--- a/webcommon/javascript.jstestdriver/manifest.mf
+++ b/webcommon/javascript.jstestdriver/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript.jstestdriver
OpenIDE-Module-Layer: org/netbeans/modules/javascript/jstestdriver/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/jstestdriver/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.29
+OpenIDE-Module-Specification-Version: 0.30
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.karma/manifest.mf b/webcommon/javascript.karma/manifest.mf
index f9d916b..084ccf7 100644
--- a/webcommon/javascript.karma/manifest.mf
+++ b/webcommon/javascript.karma/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript.karma/0
OpenIDE-Module-Layer: org/netbeans/modules/javascript/karma/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/karma/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.33
+OpenIDE-Module-Specification-Version: 0.34
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.nodejs/manifest.mf b/webcommon/javascript.nodejs/manifest.mf
index 3152ecf..5e1de53 100644
--- a/webcommon/javascript.nodejs/manifest.mf
+++ b/webcommon/javascript.nodejs/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript.nodejs/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/nodejs/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.46
+OpenIDE-Module-Specification-Version: 0.47
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript.v8debug.ui/nbproject/project.properties b/webcommon/javascript.v8debug.ui/nbproject/project.properties
index 65ccefb..3c96aaa 100644
--- a/webcommon/javascript.v8debug.ui/nbproject/project.properties
+++ b/webcommon/javascript.v8debug.ui/nbproject/project.properties
@@ -19,4 +19,4 @@
javadoc.arch=${basedir}/arch.xml
is.eager=true
-spec.version.base=1.16.0
+spec.version.base=1.17.0
diff --git a/webcommon/javascript.v8debug/nbproject/project.properties b/webcommon/javascript.v8debug/nbproject/project.properties
index ccaecf6..5827632 100644
--- a/webcommon/javascript.v8debug/nbproject/project.properties
+++ b/webcommon/javascript.v8debug/nbproject/project.properties
@@ -19,4 +19,4 @@
javadoc.arch=${basedir}/arch.xml
is.autoload=true
-spec.version.base=1.27.0
+spec.version.base=1.28.0
diff --git a/webcommon/javascript2.doc/manifest.mf b/webcommon/javascript2.doc/manifest.mf
index 7dda6b4..c630688 100644
--- a/webcommon/javascript2.doc/manifest.mf
+++ b/webcommon/javascript2.doc/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.doc/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/doc/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/webcommon/javascript2.editor/manifest.mf b/webcommon/javascript2.editor/manifest.mf
index f979ce0..6d13c84 100644
--- a/webcommon/javascript2.editor/manifest.mf
+++ b/webcommon/javascript2.editor/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Install: org/netbeans/modules/javascript2/editor/ModuleInstaller.class
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/editor/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.92
+OpenIDE-Module-Specification-Version: 0.93
OpenIDE-Module-Recommends: cnb.org.netbeans.modules.html.editor
diff --git a/webcommon/javascript2.extdoc/manifest.mf b/webcommon/javascript2.extdoc/manifest.mf
index b76dafd..ed85d1e 100644
--- a/webcommon/javascript2.extdoc/manifest.mf
+++ b/webcommon/javascript2.extdoc/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javascript2.extdoc
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/extdoc/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/extdoc/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.15
+OpenIDE-Module-Specification-Version: 1.16
diff --git a/webcommon/javascript2.extjs/manifest.mf b/webcommon/javascript2.extjs/manifest.mf
index c61e19e..1956bb2 100644
--- a/webcommon/javascript2.extjs/manifest.mf
+++ b/webcommon/javascript2.extjs/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript2.extjs
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/extjs/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.26
+OpenIDE-Module-Specification-Version: 1.27
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript2.html/manifest.mf b/webcommon/javascript2.html/manifest.mf
index eb7052d..44c891e 100644
--- a/webcommon/javascript2.html/manifest.mf
+++ b/webcommon/javascript2.html/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.html
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/html/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.7
+OpenIDE-Module-Specification-Version: 1.8
diff --git a/webcommon/javascript2.jade/manifest.mf b/webcommon/javascript2.jade/manifest.mf
index 5cbb93e..95215a6 100644
--- a/webcommon/javascript2.jade/manifest.mf
+++ b/webcommon/javascript2.jade/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.javascript2.jade/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/jade/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.23
+OpenIDE-Module-Specification-Version: 0.24
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/jade/layer.xml
diff --git a/webcommon/javascript2.jquery/manifest.mf b/webcommon/javascript2.jquery/manifest.mf
index 094207d..413b199 100644
--- a/webcommon/javascript2.jquery/manifest.mf
+++ b/webcommon/javascript2.jquery/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.javascript2.jquery
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/jquery/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.26
+OpenIDE-Module-Specification-Version: 1.27
diff --git a/webcommon/javascript2.jsdoc/manifest.mf b/webcommon/javascript2.jsdoc/manifest.mf
index 915ad55..9a3962f 100644
--- a/webcommon/javascript2.jsdoc/manifest.mf
+++ b/webcommon/javascript2.jsdoc/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javascript2.jsdoc
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/jsdoc/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/jsdoc/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.15
+OpenIDE-Module-Specification-Version: 1.16
diff --git a/webcommon/javascript2.json/manifest.mf b/webcommon/javascript2.json/manifest.mf
index aa486f0..3d2aa5d 100644
--- a/webcommon/javascript2.json/manifest.mf
+++ b/webcommon/javascript2.json/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.javascript2.json
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/json/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/webcommon/javascript2.kit/manifest.mf b/webcommon/javascript2.kit/manifest.mf
index c6f8778..4e83f40 100644
--- a/webcommon/javascript2.kit/manifest.mf
+++ b/webcommon/javascript2.kit/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript2.kit/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.30
+OpenIDE-Module-Specification-Version: 0.31
AutoUpdate-Show-In-Client: true
diff --git a/webcommon/javascript2.knockout/manifest.mf b/webcommon/javascript2.knockout/manifest.mf
index 2933fdd..9746e8a 100644
--- a/webcommon/javascript2.knockout/manifest.mf
+++ b/webcommon/javascript2.knockout/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript2.knockout
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/knockout/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/knockout/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
AutoUpdate-Show-In-Client: true
diff --git a/webcommon/javascript2.lexer/manifest.mf b/webcommon/javascript2.lexer/manifest.mf
index 4cd2825..736bed5 100644
--- a/webcommon/javascript2.lexer/manifest.mf
+++ b/webcommon/javascript2.lexer/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.lexer/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/lexer/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
diff --git a/webcommon/javascript2.model/manifest.mf b/webcommon/javascript2.model/manifest.mf
index 221f44a..7e79f04 100644
--- a/webcommon/javascript2.model/manifest.mf
+++ b/webcommon/javascript2.model/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.model/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/model/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
diff --git a/webcommon/javascript2.nodejs/manifest.mf b/webcommon/javascript2.nodejs/manifest.mf
index e79c3db..20af106 100644
--- a/webcommon/javascript2.nodejs/manifest.mf
+++ b/webcommon/javascript2.nodejs/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript2.nodejs/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/nodejs/resources/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/nodejs/resources/layer.xml
-OpenIDE-Module-Specification-Version: 0.29
+OpenIDE-Module-Specification-Version: 0.30
AutoUpdate-Show-In-Client: true
diff --git a/webcommon/javascript2.prototypejs/manifest.mf b/webcommon/javascript2.prototypejs/manifest.mf
index 3db9704..2cd780d 100644
--- a/webcommon/javascript2.prototypejs/manifest.mf
+++ b/webcommon/javascript2.prototypejs/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.javascript2.prototypejs
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/prototypejs/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.22
+OpenIDE-Module-Specification-Version: 0.23
diff --git a/webcommon/javascript2.react/manifest.mf b/webcommon/javascript2.react/manifest.mf
index 6034873..bbcffa0 100644
--- a/webcommon/javascript2.react/manifest.mf
+++ b/webcommon/javascript2.react/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.javascript2.react
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/react/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/react/resources/layer.xml
-OpenIDE-Module-Specification-Version: 0.16
+OpenIDE-Module-Specification-Version: 0.17
AutoUpdate-Show-In-Client: true
diff --git a/webcommon/javascript2.requirejs/manifest.mf b/webcommon/javascript2.requirejs/manifest.mf
index 6615f1d..88d15a5 100644
--- a/webcommon/javascript2.requirejs/manifest.mf
+++ b/webcommon/javascript2.requirejs/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.javascript2.requirejs
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/requirejs/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/requirejs/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.24
+OpenIDE-Module-Specification-Version: 0.25
diff --git a/webcommon/javascript2.sdoc/manifest.mf b/webcommon/javascript2.sdoc/manifest.mf
index 8ee394c..e632389 100644
--- a/webcommon/javascript2.sdoc/manifest.mf
+++ b/webcommon/javascript2.sdoc/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.javascript2.sdoc
OpenIDE-Module-Layer: org/netbeans/modules/javascript2/sdoc/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/sdoc/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.15
+OpenIDE-Module-Specification-Version: 1.16
diff --git a/webcommon/javascript2.source.query/manifest.mf b/webcommon/javascript2.source.query/manifest.mf
index 55d16f5..484ba5e 100644
--- a/webcommon/javascript2.source.query/manifest.mf
+++ b/webcommon/javascript2.source.query/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.javascript2.source.query/0
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/source/query/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.16
+OpenIDE-Module-Specification-Version: 0.17
OpenIDE-Module-Provides: org.netbeans.modules.javascript2.debug.spi.SourceElementsQuery
AutoUpdate-Show-In-Client: false
diff --git a/webcommon/javascript2.types/manifest.mf b/webcommon/javascript2.types/manifest.mf
index c8f0f37..270e726 100644
--- a/webcommon/javascript2.types/manifest.mf
+++ b/webcommon/javascript2.types/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.javascript2.types/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript2/types/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
diff --git a/webcommon/languages.apacheconf/manifest.mf b/webcommon/languages.apacheconf/manifest.mf
index d1b0cac..262f299 100644
--- a/webcommon/languages.apacheconf/manifest.mf
+++ b/webcommon/languages.apacheconf/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.languages.apacheconf
OpenIDE-Module-Layer: org/netbeans/modules/languages/apacheconf/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/apacheconf/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
diff --git a/webcommon/languages.ini/manifest.mf b/webcommon/languages.ini/manifest.mf
index 31d6e67..6cd6d48 100644
--- a/webcommon/languages.ini/manifest.mf
+++ b/webcommon/languages.ini/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.languages.ini
OpenIDE-Module-Layer: org/netbeans/modules/languages/ini/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/ini/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
diff --git a/webcommon/lib.v8debug/manifest.mf b/webcommon/lib.v8debug/manifest.mf
index 5763d65..1e73b7b 100644
--- a/webcommon/lib.v8debug/manifest.mf
+++ b/webcommon/lib.v8debug/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.lib.v8debug/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/lib/v8debug/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
Main-Class: org.netbeans.lib.v8debug.client.cmdline.V8Debug
diff --git a/webcommon/libs.graaljs/manifest.mf b/webcommon/libs.graaljs/manifest.mf
index bcc8fe8..7253ed0 100644
--- a/webcommon/libs.graaljs/manifest.mf
+++ b/webcommon/libs.graaljs/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.libs.graaljs/2
OpenIDE-Module-Layer: org/netbeans/libs/graaljs/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/graaljs/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.17
+OpenIDE-Module-Specification-Version: 1.18
OpenIDE-Module-Provides: javax.script.ScriptEngine.js,org.netbeans.libs.graaljs
diff --git a/webcommon/libs.jstestdriver/manifest.mf b/webcommon/libs.jstestdriver/manifest.mf
index e4f5628..bdaf9f4 100644
--- a/webcommon/libs.jstestdriver/manifest.mf
+++ b/webcommon/libs.jstestdriver/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.libs.jstestdriver
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/jstestdriver/Bundle.properties
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
diff --git a/webcommon/libs.nashorn/manifest.mf b/webcommon/libs.nashorn/manifest.mf
index 5fe419b..0b0c283 100644
--- a/webcommon/libs.nashorn/manifest.mf
+++ b/webcommon/libs.nashorn/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.libs.nashorn/2
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/nashorn/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.2
+OpenIDE-Module-Specification-Version: 2.3
diff --git a/webcommon/libs.plist/manifest.mf b/webcommon/libs.plist/manifest.mf
index 13061cf..ff66f75 100644
--- a/webcommon/libs.plist/manifest.mf
+++ b/webcommon/libs.plist/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.libs.plist
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/plist/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
diff --git a/webcommon/netserver/manifest.mf b/webcommon/netserver/manifest.mf
index 98480aa..7f9cde9 100644
--- a/webcommon/netserver/manifest.mf
+++ b/webcommon/netserver/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.netserver
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/netserver/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.30
+OpenIDE-Module-Specification-Version: 1.31
diff --git a/webcommon/selenium2.webclient.mocha/manifest.mf b/webcommon/selenium2.webclient.mocha/manifest.mf
index 3bf9ea4..47b00cb 100644
--- a/webcommon/selenium2.webclient.mocha/manifest.mf
+++ b/webcommon/selenium2.webclient.mocha/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.selenium2.webclient.mocha
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/webclient/mocha/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
diff --git a/webcommon/selenium2.webclient.protractor/manifest.mf b/webcommon/selenium2.webclient.protractor/manifest.mf
index e09b253..7ca4e5b 100644
--- a/webcommon/selenium2.webclient.protractor/manifest.mf
+++ b/webcommon/selenium2.webclient.protractor/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.selenium2.webclient.protractor
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/webclient/protractor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.20
+OpenIDE-Module-Specification-Version: 1.21
diff --git a/webcommon/selenium2.webclient/manifest.mf b/webcommon/selenium2.webclient/manifest.mf
index 640b906..ed6d769 100644
--- a/webcommon/selenium2.webclient/manifest.mf
+++ b/webcommon/selenium2.webclient/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.selenium2.webclient
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/selenium2/webclient/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.24
+OpenIDE-Module-Specification-Version: 1.25
diff --git a/webcommon/typescript.editor/manifest.mf b/webcommon/typescript.editor/manifest.mf
index 4d7bb78..1ef564d 100644
--- a/webcommon/typescript.editor/manifest.mf
+++ b/webcommon/typescript.editor/manifest.mf
@@ -2,5 +2,5 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.typescript.editor
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/typescript/editor/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/webcommon/web.client.kit/manifest.mf b/webcommon/web.client.kit/manifest.mf
index 24b3659..97e9090 100644
--- a/webcommon/web.client.kit/manifest.mf
+++ b/webcommon/web.client.kit/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.web.client.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/client/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.33
+OpenIDE-Module-Specification-Version: 1.34
diff --git a/webcommon/web.client.samples/manifest.mf b/webcommon/web.client.samples/manifest.mf
index c35c201..76f9632 100644
--- a/webcommon/web.client.samples/manifest.mf
+++ b/webcommon/web.client.samples/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.web.client.samples
OpenIDE-Module-Layer: org/netbeans/modules/web/client/samples/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/client/samples/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.31
+OpenIDE-Module-Specification-Version: 1.32
diff --git a/webcommon/web.clientproject.api/manifest.mf b/webcommon/web.clientproject.api/manifest.mf
index 4cfc80f..33410b5 100644
--- a/webcommon/web.clientproject.api/manifest.mf
+++ b/webcommon/web.clientproject.api/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.web.clientproject.api
OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/api/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.121
+OpenIDE-Module-Specification-Version: 1.122
diff --git a/webcommon/web.clientproject/manifest.mf b/webcommon/web.clientproject/manifest.mf
index cc2271e..5ed9074 100644
--- a/webcommon/web.clientproject/manifest.mf
+++ b/webcommon/web.clientproject/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.web.clientproject
OpenIDE-Module-Layer: org/netbeans/modules/web/clientproject/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/clientproject/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.104
+OpenIDE-Module-Specification-Version: 1.105
OpenIDE-Module-Provides: org.netbeans.modules.web.clientproject
diff --git a/webcommon/web.inspect/manifest.mf b/webcommon/web.inspect/manifest.mf
index a4381ef..9e864d0 100644
--- a/webcommon/web.inspect/manifest.mf
+++ b/webcommon/web.inspect/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.web.inspect
OpenIDE-Module-Layer: org/netbeans/modules/web/inspect/resources/layer.xml
OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 0.47
+OpenIDE-Module-Specification-Version: 0.48
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/inspect/Bundle.properties
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Provides: org.netbeans.modules.web.browser.api.PageInspector
diff --git a/webcommon/web.javascript.debugger/manifest.mf b/webcommon/web.javascript.debugger/manifest.mf
index 0250925..9209ac2 100644
--- a/webcommon/web.javascript.debugger/manifest.mf
+++ b/webcommon/web.javascript.debugger/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.web.javascript.debugger
OpenIDE-Module-Layer: org/netbeans/modules/web/javascript/debugger/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/javascript/debugger/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
diff --git a/webcommon/web.webkit.tooling/manifest.mf b/webcommon/web.webkit.tooling/manifest.mf
index a4f5692..1bff510 100644
--- a/webcommon/web.webkit.tooling/manifest.mf
+++ b/webcommon/web.webkit.tooling/manifest.mf
@@ -3,4 +3,4 @@
OpenIDE-Module: org.netbeans.modules.web.webkit.tooling
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/webkit/tooling/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.WindowManager
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
diff --git a/websvccommon/websvc.jaxwsmodelapi/manifest.mf b/websvccommon/websvc.jaxwsmodelapi/manifest.mf
index 7ea2712..e0ebe73 100644
--- a/websvccommon/websvc.jaxwsmodelapi/manifest.mf
+++ b/websvccommon/websvc.jaxwsmodelapi/manifest.mf
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.jaxwsmodelapi/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/jaxwsmodelapi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
AutoUpdate-Show-In-Client: false
diff --git a/websvccommon/websvc.saas.api/manifest.mf b/websvccommon/websvc.saas.api/manifest.mf
index 0c90f02..5cbc870 100644
--- a/websvccommon/websvc.saas.api/manifest.mf
+++ b/websvccommon/websvc.saas.api/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.websvc.saas.api
OpenIDE-Module-Layer: org/netbeans/modules/websvc/saas/model/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/spi/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
diff --git a/websvccommon/websvc.saas.codegen/manifest.mf b/websvccommon/websvc.saas.codegen/manifest.mf
index 92933a9..93f6a48 100644
--- a/websvccommon/websvc.saas.codegen/manifest.mf
+++ b/websvccommon/websvc.saas.codegen/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.saas.codegen
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/codegen/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.47
+OpenIDE-Module-Specification-Version: 1.48
AutoUpdate-Show-In-Client: false
diff --git a/websvccommon/websvc.saas.kit/manifest.mf b/websvccommon/websvc.saas.kit/manifest.mf
index cd0f197..8b53a43 100644
--- a/websvccommon/websvc.saas.kit/manifest.mf
+++ b/websvccommon/websvc.saas.kit/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.saas.kit
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/kit/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.44
+OpenIDE-Module-Specification-Version: 1.45
AutoUpdate-Show-In-Client: true
OpenIDE-Module-Provides: org.netbeans.modules.websvc.saas.kit
diff --git a/websvccommon/websvc.saas.ui/manifest.mf b/websvccommon/websvc.saas.ui/manifest.mf
index 9fab42f..19a051c 100644
--- a/websvccommon/websvc.saas.ui/manifest.mf
+++ b/websvccommon/websvc.saas.ui/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.websvc.saas.ui
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/websvc/saas/ui/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.45
+OpenIDE-Module-Specification-Version: 1.46
AutoUpdate-Show-In-Client: false
