Skip to content

Commit

Permalink
Merge branch 'master' into delivery
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdedic
sdedic committed May 17, 2022
2 parents aaa9fca + a27d75b commit 65b94ae
Show file tree
Hide file tree
Showing 962 changed files with 9,148 additions and 3,847 deletions.
2 changes: 1 addition & 1 deletion apisupport/apisupport.ant/manifest.mf
View file
@@ -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.88
OpenIDE-Module-Specification-Version: 2.89
AutoUpdate-Show-In-Client: false
OpenIDE-Module-Layer: org/netbeans/modules/apisupport/project/resources/layer.xml
2 changes: 1 addition & 1 deletion apisupport/apisupport.installer.maven/manifest.mf
View file
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
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.38
OpenIDE-Module-Specification-Version: 1.39

2 changes: 1 addition & 1 deletion apisupport/apisupport.installer/manifest.mf
View file
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
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.39
OpenIDE-Module-Specification-Version: 1.40

2 changes: 1 addition & 1 deletion apisupport/apisupport.kit/manifest.mf
View file
@@ -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.46
OpenIDE-Module-Specification-Version: 1.47
OpenIDE-Module-Provides: org.netbeans.modules.apisupport.kit

2 changes: 1 addition & 1 deletion apisupport/apisupport.project/manifest.mf
View file
Expand Up @@ -4,5 +4,5 @@ OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/apisupport/project/api/Bu
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.92
OpenIDE-Module-Specification-Version: 1.93

2 changes: 1 addition & 1 deletion apisupport/apisupport.refactoring/manifest.mf
View file
@@ -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.53
OpenIDE-Module-Specification-Version: 1.54

2 changes: 1 addition & 1 deletion apisupport/apisupport.wizards/manifest.mf
View file
Expand Up @@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
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.36
OpenIDE-Module-Specification-Version: 1.37

2 changes: 1 addition & 1 deletion apisupport/maven.apisupport/manifest.mf
View file
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
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.75
OpenIDE-Module-Specification-Version: 1.76

19 changes: 10 additions & 9 deletions apisupport/maven.apisupport/nbproject/project.xml
View file
Expand Up @@ -25,6 +25,16 @@
<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
<code-name-base>org.netbeans.modules.maven.apisupport</code-name-base>
<module-dependencies>
<!-- keep in front of any module which uses lucene, maven indexer uses it's own verison -->
<dependency>
<code-name-base>org.netbeans.modules.maven.indexer</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
<specification-version>2.11</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.api.annotations.common</code-name-base>
<build-prerequisite/>
Expand Down Expand Up @@ -165,15 +175,6 @@
<specification-version>2.54</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.maven.indexer</code-name-base>
<build-prerequisite/>
<compile-dependency/>
<run-dependency>
<release-version>2</release-version>
<specification-version>2.11</specification-version>
</run-dependency>
</dependency>
<dependency>
<code-name-base>org.netbeans.modules.maven.model</code-name-base>
<build-prerequisite/>
Expand Down
37 changes: 11 additions & 26 deletions apisupport/maven.apisupport/src/org/netbeans/modules/maven/apisupport/MavenNbModuleImpl.java
View file
Expand Up @@ -78,10 +78,6 @@
import org.openide.filesystems.FileUtil;
import org.openide.filesystems.XMLFileSystem;
import org.openide.modules.SpecificationVersion;
import org.openide.util.RequestProcessor;

import java.util.logging.Level;
import java.util.logging.Logger;

/**
*
Expand All @@ -93,10 +89,7 @@ public class MavenNbModuleImpl implements NbModuleProvider {

private final Project project;
private final DependencyAdder dependencyAdder = new DependencyAdder();
private static final RequestProcessor RP = new RequestProcessor(MavenNbModuleImpl.class);

private final RequestProcessor.Task tsk = RP.create(dependencyAdder);


public static final String MAVEN_CENTRAL = "central";
public static final String APACHE_SNAPSHOT_REPO_ID = "apache.snapshots";
// this repository is not good anymore, dev-SNAPSHOT version are buil on apache snapshot
Expand All @@ -110,12 +103,10 @@ public class MavenNbModuleImpl implements NbModuleProvider {
public static final String GROUPID_MOJO = "org.codehaus.mojo";
public static final String GROUPID_APACHE = "org.apache.netbeans.utilities";
public static final String NBM_PLUGIN = "nbm-maven-plugin";
private static final String LATEST_NBM_PLUGIN_VERSION = "4.3";
static final String LATEST_NBM_PLUGIN_VERSION = "4.7";

public static final String NETBEANSAPI_GROUPID = "org.netbeans.api";

private static final Logger LOG = Logger.getLogger("org.netbeans.modules.maven.apisupport.MavenNbModuleImpl");

/** Creates a new instance of MavenNbModuleImpl
* @param project
*/
Expand All @@ -128,23 +119,17 @@ static List<RepositoryInfo> netbeansRepo() {
RepositoryPreferences.getInstance().getRepositoryInfoById(MAVEN_CENTRAL));
}

/**
* Returns the latest known version of the NetBeans maven plugin.
* This method will not wait for the index to be downloaded, it will return a default value instead.
*/
public static String getLatestNbmPluginVersion() {
try {
RepositoryQueries.Result<NBVersionInfo> versionsResult = RepositoryQueries.getVersionsResult(GROUPID_APACHE, NBM_PLUGIN, null);

if (versionsResult.isPartial()) {
versionsResult.waitForSkipped();
}
RepositoryQueries.Result<NBVersionInfo> versionsResult = RepositoryQueries.getVersionsResult(GROUPID_APACHE, NBM_PLUGIN, null);

// Versions are sorted in descending order
List<NBVersionInfo> results = versionsResult.getResults();
if (!results.isEmpty()) {
return results.get(0).getVersion();
}
}
catch (NullPointerException ex) {
// This exceptions occurs during unit tests so default to LATEST_NBM_PLUGIN_VERSION
LOG.log(Level.WARNING, "Unable to get latest nbm-maven-plugin version number");
// Versions are sorted in descending order
List<NBVersionInfo> results = versionsResult.getResults();
if (!results.isEmpty()) {
return results.get(0).getVersion();
}
return LATEST_NBM_PLUGIN_VERSION;
}
Expand Down
2 changes: 1 addition & 1 deletion apisupport/timers/manifest.mf
View file
Expand Up @@ -3,6 +3,6 @@ OpenIDE-Module: org.netbeans.modules.timers/1
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.47
OpenIDE-Module-Specification-Version: 1.48
AutoUpdate-Show-In-Client: true

2 changes: 1 addition & 1 deletion cpplite/cpplite.debugger/manifest.mf
View file
Expand Up @@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
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.8
OpenIDE-Module-Specification-Version: 1.9

2 changes: 1 addition & 1 deletion cpplite/cpplite.editor/manifest.mf
View file
Expand Up @@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
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.7
OpenIDE-Module-Specification-Version: 1.8

2 changes: 1 addition & 1 deletion cpplite/cpplite.kit/manifest.mf
View file
Expand Up @@ -2,5 +2,5 @@ Manifest-Version: 1.0
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.7
OpenIDE-Module-Specification-Version: 1.8

2 changes: 1 addition & 1 deletion cpplite/cpplite.project/manifest.mf
View file
Expand Up @@ -3,5 +3,5 @@ AutoUpdate-Show-In-Client: false
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.7
OpenIDE-Module-Specification-Version: 1.8

2 changes: 1 addition & 1 deletion enterprise/api.web.webmodule/manifest.mf
View file
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.api.web.webmodule
OpenIDE-Module-Specification-Version: 1.54
OpenIDE-Module-Specification-Version: 1.55
OpenIDE-Module-Layer: org/netbeans/modules/web/webmodule/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/webmodule/Bundle.properties
2 changes: 1 addition & 1 deletion enterprise/cloud.amazon/manifest.mf
View file
Expand Up @@ -4,5 +4,5 @@ OpenIDE-Module: org.netbeans.modules.cloud.amazon/0
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.28
OpenIDE-Module-Specification-Version: 1.29

2 changes: 1 addition & 1 deletion enterprise/cloud.common/manifest.mf
View file
Expand Up @@ -2,4 +2,4 @@ Manifest-Version: 1.0
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.27
OpenIDE-Module-Specification-Version: 1.28
12 changes: 7 additions & 5 deletions enterprise/cloud.oracle/external/binaries-list
View file
Expand Up @@ -15,11 +15,13 @@
# specific language governing permissions and limitations
# under the License.

19F36E3A7A4914A5B361F840D65EF00B670CE064 com.oracle.oci.sdk:oci-java-sdk-common:2.10.0
3D4C9B62BDDFC86B154C78FA751257D6B2BB309A com.oracle.oci.sdk:oci-java-sdk-database:2.10.0
9DE4EA6F96CFFB2C7EEDFA903AAA7A5A2D345F18 com.oracle.oci.sdk:oci-java-sdk-identity:2.10.0
992769EA9FB96F0CB65B65B63DFCF785DEFFFC5F com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:2.10.0
F00ECE576884E10D5F2E4B34D1D1785ADE41211C com.oracle.oci.sdk:oci-java-sdk-workrequests:2.10.0
DB39E0A216BDCF38156BBE0179641D462BB62647 com.oracle.oci.sdk:oci-java-sdk-common:2.27.0
C51EF1AA99B091AE01ADD0FFE16E04226A46A87F com.oracle.oci.sdk:oci-java-sdk-database:2.27.0
F15AAE27A41CC0771DC77FE242EAAE9C652A91AB com.oracle.oci.sdk:oci-java-sdk-identity:2.27.0
07468545ED99239202283D08CC3B81C7F75795F3 com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:2.27.0
0CFEAB32956965D25DFAB4C3EC2F14B9064B4D99 com.oracle.oci.sdk:oci-java-sdk-workrequests:2.27.0
0FF864DC94B63D4248B2DBFA595C68ABEDF1D360 com.oracle.oci.sdk:oci-java-sdk-devops:2.27.0
36746680FE0C804CE33B947B4DBB092E1E9D2322 com.oracle.oci.sdk:oci-java-sdk-adm:2.27.0
CACECE66244150F252B5C58E0A38FEA0D5015665 com.nimbusds:nimbus-jose-jwt:9.11.1
25EA2E8B0C338A877313BD4672D3FE056EA78F0D com.google.code.findbugs:jsr305:3.0.2
52C3DCE0E910EB8F7CE649F44EFADA7E26D8996A org.glassfish.jersey.media:jersey-media-json-jackson:2.34
Expand Down
7 changes: 3 additions & 4 deletions .../external/oci-java-sdk-2.10.0-license.txt → .../external/oci-java-sdk-2.27.0-license.txt
View file
@@ -1,10 +1,9 @@
Name: OCI Java SDK
Description: Oracle Cloud Infrastructure SDK for Java
License: UPL-Apache-2.0
Origin: https://github.com/oracle/oci-java-sdk
Version: 2.10.0
Files: oci-java-sdk-circuitbreaker-2.10.0.jar, oci-java-sdk-common-2.10.0.jar, oci-java-sdk-database-2.10.0.jar, oci-java-sdk-identity-2.10.0.jar, oci-java-sdk-workrequests-2.10.0.jar

Version: 2.27.0
License: UPL-Apache-2.0
Files: oci-java-sdk-circuitbreaker-2.27.0.jar, oci-java-sdk-common-2.27.0.jar, oci-java-sdk-database-2.27.0.jar, oci-java-sdk-identity-2.27.0.jar, oci-java-sdk-workrequests-2.27.0.jar, oci-java-sdk-adm-2.27.0.jar, oci-java-sdk-devops-2.27.0.jar

Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion enterprise/cloud.oracle/manifest.mf
View file
Expand Up @@ -4,6 +4,6 @@ OpenIDE-Module: org.netbeans.modules.cloud.oracle
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.1
OpenIDE-Module-Specification-Version: 1.2
OpenIDE-Module-Display-Category: Cloud

13 changes: 8 additions & 5 deletions enterprise/cloud.oracle/nbproject/project.properties
View file
Expand Up @@ -20,11 +20,14 @@ release.external/jersey-apache-connector-2.34.jar=modules/ext/jersey-apache-conn
release.external/jersey-media-json-jackson-2.34.jar=modules/ext/jersey-media-json-jackson-2.34.jar
release.external/jsr305-3.0.2.jar=modules/ext/jsr305-3.0.2.jar
release.external/nimbus-jose-jwt-9.11.1.jar=modules/ext/nimbus-jose-jwt-9.11.1.jar
release.external/oci-java-sdk-circuitbreaker-2.10.0.jar=modules/ext/oci-java-sdk-circuitbreaker-2.10.0.jar
release.external/oci-java-sdk-common-2.10.0.jar=modules/ext/oci-java-sdk-common-2.10.0.jar
release.external/oci-java-sdk-database-2.10.0.jar=modules/ext/oci-java-sdk-database-2.10.0.jar
release.external/oci-java-sdk-identity-2.10.0.jar=modules/ext/oci-java-sdk-identity-2.10.0.jar
release.external/oci-java-sdk-workrequests-2.10.0.jar=modules/ext/oci-java-sdk-workrequests-2.10.0.jar
release.external/oci-java-sdk-circuitbreaker-2.27.0.jar=modules/ext/oci-java-sdk-circuitbreaker-2.27.0.jar
release.external/oci-java-sdk-common-2.27.0.jar=modules/ext/oci-java-sdk-common-2.27.0.jar
release.external/oci-java-sdk-devops-2.27.0.jar=modules/ext/oci-java-sdk-devops-2.27.0.jar
release.external/oci-java-sdk-database-2.27.0.jar=modules/ext/oci-java-sdk-database-2.27.0.jar
release.external/oci-java-sdk-identity-2.27.0.jar=modules/ext/oci-java-sdk-identity-2.27.0.jar
release.external/oci-java-sdk-workrequests-2.27.0.jar=modules/ext/oci-java-sdk-workrequests-2.27.0.jar
release.external/oci-java-sdk-devops-2.27.0.jar=modules/ext/oci-java-sdk-devops-2.27.0.jar
release.external/oci-java-sdk-adm-2.27.0.jar=modules/ext/oci-java-sdk-adm-2.27.0.jar
release.external/resilience4j-circuitbreaker-1.2.0.jar=modules/ext/resilience4j-circuitbreaker-1.2.0.jar
release.external/resilience4j-core-1.2.0.jar=modules/ext/resilience4j-core-1.2.0.jar
release.external/vavr-0.10.2.jar=modules/ext/vavr-0.10.2.jar
Expand Down
28 changes: 18 additions & 10 deletions enterprise/cloud.oracle/nbproject/project.xml
View file
Expand Up @@ -227,16 +227,24 @@
<binary-origin>external/jersey-apache-connector-2.34.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-identity-2.10.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-identity-2.10.0.jar</binary-origin>
<runtime-relative-path>ext/oci-java-sdk-identity-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-identity-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/resilience4j-circuitbreaker-1.2.0.jar</runtime-relative-path>
<binary-origin>external/resilience4j-circuitbreaker-1.2.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-common-2.10.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-common-2.10.0.jar</binary-origin>
<runtime-relative-path>ext/oci-java-sdk-common-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-common-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-devops-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-devops-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-adm-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-adm-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jakarta.activation-api-1.2.1.jar</runtime-relative-path>
Expand All @@ -251,16 +259,16 @@
<binary-origin>external/vavr-0.10.2.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-database-2.10.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-database-2.10.0.jar</binary-origin>
<runtime-relative-path>ext/oci-java-sdk-database-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-database-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jersey-media-json-jackson-2.34.jar</runtime-relative-path>
<binary-origin>external/jersey-media-json-jackson-2.34.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-circuitbreaker-2.10.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-circuitbreaker-2.10.0.jar</binary-origin>
<runtime-relative-path>ext/oci-java-sdk-circuitbreaker-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-circuitbreaker-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/vavr-match-0.10.2.jar</runtime-relative-path>
Expand All @@ -271,8 +279,8 @@
<binary-origin>external/nimbus-jose-jwt-9.11.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/oci-java-sdk-workrequests-2.10.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-workrequests-2.10.0.jar</binary-origin>
<runtime-relative-path>ext/oci-java-sdk-workrequests-2.27.0.jar</runtime-relative-path>
<binary-origin>external/oci-java-sdk-workrequests-2.27.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/resilience4j-core-1.2.0.jar</runtime-relative-path>
Expand Down

0 comments on commit 65b94ae

Please sign in to comment.