[netbeans-antora] branch main updated: htaccess order
This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/netbeans-antora.git The following commit(s) were added to refs/heads/main by this push: new d284f6b htaccess order new 30d166a Merge pull request #6 from ebarboni/htaccessorder d284f6b is described below commit d284f6b623618083179f56ec1027c4e109ab0aa4 Author: Eric Barboni AuthorDate: Fri Oct 13 10:41:37 2023 +0200 htaccess order --- supplemental-ui/.htaccess | 41 - 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/supplemental-ui/.htaccess b/supplemental-ui/.htaccess index 4e47fc5..7cc7415 100644 --- a/supplemental-ui/.htaccess +++ b/supplemental-ui/.htaccess @@ -1,25 +1,10 @@ DirectoryIndex index.html index.asciidoc -# former path to antora path -Redirect 301 /about/ /front/main/about/ -Redirect 301 /blogs/ /front/main/blogs/ -Redirect 301 /jackpot/ /front/main/jackpot/ -Redirect 301 /community/ /front/main/community/ -Redirect 301 /help/ /front/main/help/ -Redirect 301 /projects/ /front/main/projects/ -Redirect 301 /participate/ /front/main/participate/ -Redirect 301 /kb/ /tutorial/main/kb/ -Redirect 301 /tutorials/ /tutorial/main/tutorial/ -Redirect 301 /wiki/ /wiki/main/wiki/ - - +# download from incubation Redirect 302 /download/9.0-beta/source https://archive.apache.org/dist/incubator/netbeans/incubating-netbeans-java/incubating-9.0-beta/incubating-netbeans-java-9.0-beta-source.zip Redirect 302 /download/9.0-beta/binary https://archive.apache.org/dist/incubator/netbeans/incubating-netbeans-java/incubating-9.0-beta/incubating-netbeans-java-9.0-beta-bin.zip -# former path to antora path after letting download to -Redirect 301 /download/ /front/main/download/ - - +# old NetBeans updates center Redirect 301 /updates/8.2/uc/final/certified/catalog.xml.gz http://updates.netbeans.org/netbeans/updates/8.2/uc/final/certified/catalog.xml.gz # Inbound links from the IDE - prefixed with /nb/ @@ -62,8 +47,8 @@ Redirect 302 /nb/updates/19/ https://netbeans-vm1.apache.org/uc/19/ Redirect 302 /nb/plugins/19/ https://plugins.netbeans.apache.org/data/19/ Redirect 302 /nb/updates/dev/ https://netbeans-vm1.apache.org/uc/dev/ Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/19/ -Redirect 302 /nb/issues_redirect.html https://netbeans.apache.org/participate/report-issue.html -Redirect 302 /nb/report-issue https://netbeans.apache.org/participate/report-issue.html +Redirect 302 /nb/issues_redirect.html https://netbeans.apache.org/front/main/participate/report-issue.html +Redirect 302 /nb/report-issue https://netbeans.apache.org/front/main/participate/report-issue.html # Inbound links from the build - prefixed with /nbbuild/ Redirect 302 /nbbuild/netbeansrelease.json https://raw.githubusercontent.com/apache/netbeans-jenkins-lib/HEAD/meta/netbeansrelease.json @@ -71,8 +56,8 @@ Redirect 302 /nbbuild/netbeansrelease.json https://raw.githubusercontent.com/apa #cgi mirror script not needed #Redirect 301 /download/maven/index.html /download/maven/index.cgi -# Redirect /kb/trails to /kb/docs antora path -Redirect 301 /kb/trails /tutorial/main/kb/docs +# Redirect /kb/trails to /kb/docs +Redirect 301 /kb/trails /kb/docs # Some other redirections Redirect 301 /features/ide/database.html /kb/docs/ide/#_databases @@ -92,6 +77,20 @@ RedirectMatch 301 ^/.?downloads/.*$ /download/index.html # Redirect plugin page to plugin portal Redirect 302 /plugins/index.html https://plugins.netbeans.apache.org/ +# former path to antora path after letting download to +Redirect 301 /about/ /front/main/about/ +# should also redirect atom +Redirect 301 /blogs/ /front/main/blogs/ +Redirect 301 /jackpot/ /front/main/jackpot/ +Redirect 301 /community/ /front/main/community/ +Redirect 301 /help/ /front/main/help/ +Redirect 301 /projects/ /front/main/projects/ +Redirect 301 /participate/ /front/main/participate/ +Redirect 301 /kb/ /tutorial/main/kb/ +Redirect 301 /tutorials/ /tutorial/main/tutorial/ +Redirect 301 /wiki/ /wiki/main/wiki/ +Redirect 301 /download/ /front/main/download/ + # A simple error page to antora folder ErrorDocument 404 /front/main/404.html - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch antora updated: Add .asf.yaml to antora.
This is an automated email from the ASF dual-hosted git repository. vieiro pushed a commit to branch antora in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/antora by this push: new bd4089727 Add .asf.yaml to antora. bd4089727 is described below commit bd4089727edb977c9956d6f07576dc40c10745aa Author: Antonio AuthorDate: Mon Oct 16 20:15:47 2023 +0200 Add .asf.yaml to antora. As per ASF-Infra suggestions. --- .asf.yaml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 0..8e20a73ee --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,10 @@ +github: + description: "Apache NetBeans Antora Preview" + homepage: "https://netbeans-antora.staged.apache.org/; + labels: +- netbeans +- website +- antora +staging: + profile: antora # See https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features#Git.asf.yamlfeatures-Stagingawebsitepreviewdomain + whoami: antora - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch master updated: Rollback antora preview.
This is an automated email from the ASF dual-hosted git repository. vieiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 96c1ea9e4 Rollback antora preview. new 656e2d6c5 Merge pull request #687 from vieiro/feature/revert-antora-preview 96c1ea9e4 is described below commit 96c1ea9e42b801982b75077521c5ff28b93c8685 Author: Antonio AuthorDate: Mon Oct 16 20:10:54 2023 +0200 Rollback antora preview. The .asf.yaml must be in the antora branch, ASF-infra explains. Let's do that --- .asf.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 3295fc069..d00ad318d 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -7,5 +7,3 @@ github: - jbake publish: whoami: asf-site -staging: - profile: antora # See https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features#Git.asf.yamlfeatures-Stagingawebsitepreviewdomain - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Adding action/command for adding DB connection proerties to the OCI Vault
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/master by this push: new d200acf85b Adding action/command for adding DB connection proerties to the OCI Vault new 3fae03992a Merge pull request #6574 from jhorvath/db_to_oci_vault d200acf85b is described below commit d200acf85b62f8027757dc08424699e570f881e9 Author: Jan Horvath AuthorDate: Thu Oct 12 21:04:32 2023 +0200 Adding action/command for adding DB connection proerties to the OCI Vault --- enterprise/cloud.oracle/external/binaries-list | 22 +- ...license.txt => oci-java-sdk-3.25.3-license.txt} | 4 +- .../cloud.oracle/nbproject/project.properties | 24 +- enterprise/cloud.oracle/nbproject/project.xml | 48 +- .../oracle/actions/AddDbConnectionToVault.java | 719 + .../modules/cloud/oracle/resources/key.svg | 85 +++ .../modules/cloud/oracle/resources/layer.xml | 31 + .../modules/cloud/oracle/resources/secret.svg | 65 ++ .../modules/cloud/oracle/resources/vault.svg | 80 +++ .../modules/cloud/oracle/vault/KeyItem.java| 49 ++ .../modules/cloud/oracle/vault/KeyNode.java| 88 +++ .../modules/cloud/oracle/vault/SecretItem.java | 49 ++ .../modules/cloud/oracle/vault/SecretNode.java | 77 +++ .../modules/cloud/oracle/vault/VaultItem.java | 55 ++ .../modules/cloud/oracle/vault/VaultNode.java | 80 +++ .../oracle/actions/AddDbConnectionToVaultTest.java | 70 ++ .../netbeans/modules/nbcode/integration/layer.xml | 1 + java/java.lsp.server/vscode/package-lock.json | 4 +- java/java.lsp.server/vscode/package.json | 24 + 19 files changed, 1530 insertions(+), 45 deletions(-) diff --git a/enterprise/cloud.oracle/external/binaries-list b/enterprise/cloud.oracle/external/binaries-list index 622fd1395e..ecd1327b51 100644 --- a/enterprise/cloud.oracle/external/binaries-list +++ b/enterprise/cloud.oracle/external/binaries-list @@ -15,16 +15,18 @@ # specific language governing permissions and limitations # under the License. -F89364D98A616CBA66CA535759EA092C54B4BF75 com.oracle.oci.sdk:oci-java-sdk-common:3.9.0 -7BB77013E6B91FCC7CD72D3338EB9F4019E20EA9 com.oracle.oci.sdk:oci-java-sdk-database:3.9.0 -8AB9B9CA57124F30B6D25CBAC944A7CEE0373068 com.oracle.oci.sdk:oci-java-sdk-identity:3.9.0 -F2071C1D75795350EB4D6807C4327AA333C5930C com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.9.0 -10D73A80C8F66F959C84189272A7FC1C0CB1C435 com.oracle.oci.sdk:oci-java-sdk-workrequests:3.9.0 -031597E1BEEED3E48203BE6ECEBBA442E6FE177E com.oracle.oci.sdk:oci-java-sdk-devops:3.9.0 -5E52AF447D216717453E91782FCB965DF5669D5C com.oracle.oci.sdk:oci-java-sdk-adm:3.9.0 -C81CF0C79C300BF0526DF80D7890F688C1E32803 com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.9.0 -19C42576CC31E6028F29639F442EBA0CD895ADB3 com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.9.0 -9499C6360FFDBEBC6F0F1285A20DD91485FEDD46 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.9.0 +01713F2F4C8533893B8BD73C9461698F16F2B091 com.oracle.oci.sdk:oci-java-sdk-common:3.25.3 +5E25BDEF20C9897C16EA939DBF185177F158EC40 com.oracle.oci.sdk:oci-java-sdk-database:3.25.3 +D1015B3664782EABF06354C63748152E6D3BF268 com.oracle.oci.sdk:oci-java-sdk-vault:3.25.3 +0B6A6C71B4880A87B1FB034B3F1AB6E5361FC558 com.oracle.oci.sdk:oci-java-sdk-keymanagement:3.25.3 +E46F0CE2219BBCDA94B87D4CB4EF4166DAF6C925 com.oracle.oci.sdk:oci-java-sdk-identity:3.25.3 +832F50EFBFB3B320CA5CAEC75FE607FB8CEDF40E com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.25.3 +78C9D083AD254C858E4A69F51958A9A46D260F97 com.oracle.oci.sdk:oci-java-sdk-workrequests:3.25.3 +9D89873EC1059B5B75058DB5FF1C25D66A9EC859 com.oracle.oci.sdk:oci-java-sdk-devops:3.25.3 +95F57672B60D7A611582262828DCED3F7544BA7C com.oracle.oci.sdk:oci-java-sdk-adm:3.25.3 +A8B7EBCA334E8145469A8FE0365C02A2727218EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.25.3 +AECECCD95E5ED92C73E455B7BA4AC714229041EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.25.3 +0CEE99CE7AA783353D19C56AC9F1AD72485DDBE8 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.25.3 E5F6CAE5CA7ECAAC1EC2827A9E2D65AE2869CADA org.apache.httpcomponents:httpclient:4.5.13 853B96D3AFBB7BF8CC303FE27EE96836A10C1834 org.apache.httpcomponents:httpcore:4.4.13 diff --git a/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt similarity index 96% rename from enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt rename to enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt index c7fcf3f3b4..45069662ff 100644 --- a/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt +++ b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt
[netbeans-website] branch master updated: Antora preview in staging mode
This is an automated email from the ASF dual-hosted git repository. vieiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/master by this push: new 944c4c1ff Antora preview in staging mode new 1470023a1 Merge pull request #686 from vieiro/feature/antora-preview 944c4c1ff is described below commit 944c4c1fffa1ff10f781d26dd206762c753b9eb1 Author: Antonio AuthorDate: Mon Oct 16 19:47:30 2023 +0200 Antora preview in staging mode --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index d00ad318d..3295fc069 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -7,3 +7,5 @@ github: - jbake publish: whoami: asf-site +staging: + profile: antora # See https://cwiki.apache.org/confluence/display/INFRA/git+-+.asf.yaml+features#Git.asf.yamlfeatures-Stagingawebsitepreviewdomain - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] 01/02: Updated README
This is an automated email from the ASF dual-hosted git repository. vieiro pushed a commit to branch antora in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit a3337b4572482063771354741a9c680187b0d17a Author: Antonio AuthorDate: Mon Oct 16 19:30:08 2023 +0200 Updated README --- README.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 57609450d..c22b847ee 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -incubator-netbeans-website --- -This is the source of the http://netbeans.apache.org website. +Antora branch +- + +This is a test branch to publish artifacts generated with Antora. + -TODO: please add instructions here for updating the website, -once this is setup. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch antora created (now 7fd31c60b)
This is an automated email from the ASF dual-hosted git repository. vieiro pushed a change to branch antora in repository https://gitbox.apache.org/repos/asf/netbeans-website.git at 7fd31c60b Generated by Antora. This branch includes the following new commits: new a3337b457 Updated README new 7fd31c60b Generated by Antora. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: Layout fixes for the project problems warning dialog.
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9182094bbf Layout fixes for the project problems warning dialog.
new 659aa5ced2 Merge pull request #6575 from
mbien/tweak-project-problems-dialog-ui
9182094bbf is described below
commit 9182094bbfe0547095687633cb8af549abca107d
Author: Michael Bien
AuthorDate: Mon Oct 16 17:55:56 2023 +0200
Layout fixes for the project problems warning dialog.
---
.../ui/problems/BrokenReferencesAlertPanel.form| 63 ++--
.../ui/problems/BrokenReferencesAlertPanel.java| 68 --
2 files changed, 56 insertions(+), 75 deletions(-)
diff --git
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
index 089a38b371..9d12e743ce 100644
---
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
+++
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
@@ -36,25 +36,44 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
@@ -79,11 +98,6 @@
-
-
-
-
-
@@ -91,25 +105,10 @@
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
index 758e87b4be..448fd72016 100644
---
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
+++
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
@@ -35,24 +35,13 @@ public class BrokenReferencesAlertPanel extends JPanel {
*/
// //GEN-BEGIN:initComponents
private void initComponents() {
-java.awt.GridBagConstraints gridBagConstraints;
-jLabel1 = new javax.swing.JLabel();
+javax.swing.JLabel problemLabel = new javax.swing.JLabel();
notAgain = new javax.swing.JCheckBox();
-message = new javax.swing.JLabel();
-jPanel1 = new javax.swing.JPanel();
-
-setLayout(new java.awt.GridBagLayout());
+javax.swing.JLabel message = new javax.swing.JLabel();
java.util.ResourceBundle bundle =
java.util.ResourceBundle.getBundle("org/netbeans/modules/project/ui/problems/Bundle");
// NOI18N
-org.openide.awt.Mnemonics.setLocalizedText(jLabel1,
bundle.getString("MSG_Broken_References_Label")); // NOI18N
-gridBagConstraints = new java.awt.GridBagConstraints();
-gridBagConstraints.gridx = 0;
-gridBagConstraints.gridy = 0;
-gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
-gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-gridBagConstraints.insets = new java.awt.Insets(11, 11, 0, 0);
-add(jLabel1, gridBagConstraints);
+org.openide.awt.Mnemonics.setLocalizedText(problemLabel,
bundle.getString("MSG_Broken_References_Label")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(notAgain,
org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"MSG_BrokenReferencesAlertPanel_notAgain")); // NOI18N
notAgain.setMargin(new java.awt.Insets(0, 0, 0, 0));
@@ -61,34 +50,30 @@ public class BrokenReferencesAlertPanel extends JPanel {
notAgainActionPerformed(evt);
}
});
-gridBagConstraints = new java.awt.GridBagConstraints();
-gridBagConstraints.gridx = 0;
-gridBagConstraints.gridy = 2;
-gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
-gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
-gridBagConstraints.insets = new java.awt.Insets(6, 11, 0, 0);
-add(notAgain, gridBagConstraints);
-
notAgain.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSN_BrokenReferencesAlertPanel_notAgain")); // NOI18N
-
[netbeans] branch master updated: #6525: maven execution should setup LegacySupport before running Maven
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1aabe20219 #6525: maven execution should setup LegacySupport before
running Maven
new 1fc0a4e56d Merge pull request #6552 from
sdedic/maven/execute-legacy-support
1aabe20219 is described below
commit 1aabe202194c62c9a26235eec866302dae7a11e7
Author: Svata Dedic
AuthorDate: Mon Oct 16 17:53:04 2023 +0200
#6525: maven execution should setup LegacySupport before running Maven
---
.../modules/maven/embedder/MavenEmbedder.java | 115 -
1 file changed, 69 insertions(+), 46 deletions(-)
diff --git
a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
index 0216b7d2df..72a12f21f2 100644
---
a/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
+++
b/java/maven.embedder/src/org/netbeans/modules/maven/embedder/MavenEmbedder.java
@@ -20,6 +20,8 @@
package org.netbeans.modules.maven.embedder;
import java.io.File;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,7 +37,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.maven.DefaultMaven;
import org.apache.maven.Maven;
-import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -98,8 +99,8 @@ import org.openide.util.Exceptions;
import org.openide.util.BaseUtilities;
import org.eclipse.aether.repository.Authentication;
import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.internal.impl.EnhancedLocalRepositoryManagerFactory;
-import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
import org.eclipse.aether.util.repository.AuthenticationBuilder;
@@ -479,6 +480,7 @@ public final class MavenEmbedder {
* @throws ModelBuildingException if the POM or parents could not even be
parsed; warnings are not reported
*/
public ModelBuildingResult executeModelBuilder(File pom) throws
ModelBuildingException {
+setUpLegacySupport();
ModelBuilder mb = lookupComponent(ModelBuilder.class);
assert mb!=null : "ModelBuilder component not found in maven";
ModelBuildingRequest req = new DefaultModelBuildingRequest();
@@ -598,6 +600,11 @@ public final class MavenEmbedder {
return req;
}
+/**
+ * Do not keep the reference to the session. Plexus will hopefully keep it
for us.
+ */
+private volatile Reference thisRepositorySession = new
WeakReference<>(null);
+
/**
* Needed to avoid an NPE in {@link
org.eclipse.org.eclipse.aether.DefaultArtifactResolver#resolveArtifacts} under
some conditions.
* (Also {@link
org.eclipse.org.eclipse.aether.DefaultMetadataResolver#resolve}; wherever a
{@link org.eclipse.aether.RepositorySystemSession} is used.)
@@ -605,54 +612,70 @@ public final class MavenEmbedder {
*/
public void setUpLegacySupport() {
LegacySupport support = lookupComponent(LegacySupport.class);
-if (support.getSession() != null) {
-return;
-}
-DefaultRepositorySystemSession session = new
DefaultRepositorySystemSession();
-session.setOffline(isOffline());
-EnhancedLocalRepositoryManagerFactory f =
lookupComponent(EnhancedLocalRepositoryManagerFactory.class);
-try {
-session.setLocalRepositoryManager(f.newInstance(session, new
LocalRepository(getLocalRepository().getBasedir(;
-} catch (NoLocalRepositoryManagerException ex) {
-LOG.log(Level.WARNING, null, ex);
-}
-// Adapted from DefaultMaven.newRepositorySession, but does not look
like that can be called directly:
-DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
-Settings _settings = getSettings();
-for (Mirror m : _settings.getMirrors()) {
-mirrorSelector.add(m.getId(), m.getUrl(), m.getLayout(), false,
m.getMirrorOf(), m.getMirrorOfLayouts());
+MavenSession existing = support.getSession();
+MavenSession initializedSession = thisRepositorySession.get();
+if (existing != null) {
+RepositorySystemSession existingRepo =
existing.getRepositorySession();
+if (initializedSession != null &&
initializedSession.getRepositorySession() ==
[netbeans] branch master updated (0625641ec3 -> 8cbb672170)
This is an automated email from the ASF dual-hosted git repository. lkishalmi pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 0625641ec3 Merge pull request #6548 from sdedic/gradle/detect-offline-stack-overflow new 86da2eb8be Removed a few defunct Gradle Settings new 8a1ea98ac6 Use Default Java Runtime Selector for Gradle instead of Gradle Version Selector. new 5538a4f8a2 Calling setters on deprecated Gradle settings logs warning. new 0d84dd23f3 Minor layout tweaks in Gradle settings UI. new ce558a9ae0 Removed the option for the Gradle execution customizer new 8cbb672170 Merge pull request #6516 from lkishalmi/deprecate-a-few-gradle-setting The 9194 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: extide/gradle/apichanges.xml | 20 + extide/gradle/manifest.mf | 2 +- .../gradle/api/execute/GradleCommandLine.java | 1 - .../modules/gradle/api/execute/RunUtils.java | 23 +- .../gradle/customizer/GradleExecutionPanel.form| 2 +- .../gradle/customizer/GradleExecutionPanel.java| 4 +- .../gradle/customizer/ProjectInfoPanel.form| 82 ++-- .../gradle/customizer/ProjectInfoPanel.java| 62 +-- .../modules/gradle/execute/Bundle.properties | 1 - .../gradle/execute/ExecutionOptionsPanel.form | 17 +- .../gradle/execute/ExecutionOptionsPanel.java | 18 +- .../execute/GradleDistributionProviderImpl.java| 9 +- .../gradle/execute/GradleExecutorOptionsPanel.form | 19 +- .../gradle/execute/GradleExecutorOptionsPanel.java | 14 +- .../execute/GradleJavaPlatformProviderImpl.java| 2 +- .../modules/gradle/loaders/GradleDaemon.java | 16 - .../modules/gradle/options/Bundle.properties | 13 +- .../gradle/options/GradleExperimentalSettings.java | 21 + .../gradle/options/GradleOptionsController.java| 6 - .../modules/gradle/options/SettingsPanel.form | 211 - .../modules/gradle/options/SettingsPanel.java | 473 ++--- .../modules/gradle/spi/GradleSettings.java | 58 ++- 22 files changed, 524 insertions(+), 550 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch master updated: #6536, #6537: avoid stack overflow, catch missing artifacts to be downloaded.
This is an automated email from the ASF dual-hosted git repository.
sdedic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 151296b004 #6536, #6537: avoid stack overflow, catch missing artifacts
to be downloaded.
new 0625641ec3 Merge pull request #6548 from
sdedic/gradle/detect-offline-stack-overflow
151296b004 is described below
commit 151296b0042832647702f6fa304f28a1e57f67b5
Author: Svata Dedic
AuthorDate: Mon Oct 9 17:24:41 2023 +0200
#6536, #6537: avoid stack overflow, catch missing artifacts to be
downloaded.
---
.../gradle/tooling/NbProjectInfoBuilder.java | 72 ++
1 file changed, 47 insertions(+), 25 deletions(-)
diff --git
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
index 805f81c20b..66445fc31f 100644
---
a/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
+++
b/extide/gradle/netbeans-gradle-tooling/src/main/java/org/netbeans/modules/gradle/tooling/NbProjectInfoBuilder.java
@@ -40,6 +40,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.IdentityHashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@@ -102,7 +103,7 @@ import org.gradle.api.tasks.SourceSetContainer;
import org.gradle.api.tasks.TaskDependency;
import org.gradle.api.tasks.bundling.Jar;
import org.gradle.api.tasks.testing.Test;
-import org.gradle.internal.extensibility.DefaultExtraPropertiesExtension;
+import org.gradle.internal.resolve.ArtifactResolveException;
import org.gradle.jvm.JvmLibrary;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
@@ -274,7 +275,7 @@ class NbProjectInfoBuilder {
addTypes(nonDecorated, classes);
return
classes.stream().map(Class::getName).sorted().collect(Collectors.joining(","));
}
-
+
private static final Set EXCLUDE_TASK_PROPERTIES = new
HashSet<>(Arrays.asList(
"dependsOn",
"project",
@@ -418,6 +419,10 @@ class NbProjectInfoBuilder {
long time = System.currentTimeMillis();
try {
r.run();
+} catch (RuntimeException ex) {
+// convert will eventually throw a different exception
+convertOfflineException(ex);
+LOG.debug("Error encountered during {0}: {1}", s, ex);
} finally {
long span = System.currentTimeMillis() - time;
model.registerPerf(s, span);
@@ -509,8 +514,14 @@ class NbProjectInfoBuilder {
public static final String COLLECTION_KEYS_MARKER = "#keys"; // NOI18N
+/**
+ * Prevents the recursive descent to loop back to an already processed
structure.
+ */
+private Map valueIdentities = new IdentityHashMap<>();
+
private static boolean isPrimitiveOrString(Class c) {
-if (c == Object.class) {
+// Cannot export a Class as an object, the Class may not exist in the
netbeans VM.
+if (c == Object.class || c == Class.class) {
return false;
}
String n = c.getName();
@@ -533,10 +544,15 @@ class NbProjectInfoBuilder {
}
private void inspectObjectAndValues(Class clazz, Object object, String
prefix, Map> globalTypes, Map
propertyTypes, Map defaultValues, Set excludes, boolean
type) {
+if (valueIdentities.put(object, Boolean.TRUE) == Boolean.TRUE) {
+return;
+}
try {
inspectObjectAndValues0(clazz, object, prefix, globalTypes,
propertyTypes, defaultValues, excludes, type);
} catch (RuntimeException ex) {
LOG.warn("Error during inspection of {}, value {}, prefix {}",
clazz, object, prefix);
+} finally {
+valueIdentities.remove(object);
}
}
@@ -1188,12 +1204,16 @@ class NbProjectInfoBuilder {
model.getInfo().put(propBase + "classpath_compile",
storeSet(sourceSet.getCompileClasspath().getFiles()));
model.getInfo().put(propBase + "classpath_runtime",
storeSet(sourceSet.getRuntimeClasspath().getFiles()));
} catch(Exception e) {
+convertOfflineException(e);
+// will not be reached
model.noteProblem(e);
}
sinceGradle("4.6", () -> {
try {
model.getInfo().put(propBase +
"classpath_annotation", storeSet(getProperty(sourceSet,
"annotationProcessorPath", "files")));
[netbeans] branch master updated (9b91eba3ef -> 3a00223693)
This is an automated email from the ASF dual-hosted git repository. sdedic pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 9b91eba3ef Merge pull request #6529 from thurka/GCN-3474 new 7c9cf71036 Do not ask for proxies on each project. new 15e396a98e Allow external control of proxy policy using system property new 3a00223693 Merge pull request #6558 from sdedic/sdedic/maven-gradle-proxy-session The 9186 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../gradle/execute/GradleNetworkProxySupport.java | 2 +- .../gradle/options/GradleExperimentalSettings.java | 21 +++-- .../modules/maven/execute/MavenProxySupport.java| 2 +- .../modules/maven/options/MavenSettings.java| 21 +++-- 4 files changed, 40 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch db_to_oci_vault updated (cf6d33e569 -> 7740431ef2)
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a change to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git omit cf6d33e569 Adding action/command for adding DB connection proerties to the OCI Vault add 7740431ef2 Adding action/command for adding DB connection proerties to the OCI Vault This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cf6d33e569) \ N -- N -- N refs/heads/db_to_oci_vault (7740431ef2) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../netbeans/modules/cloud/oracle/actions/AddDbConnectionToVault.java | 3 +++ 1 file changed, 3 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch issue-for-next-iteration deleted (was ffcd23aeb6)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch issue-for-next-iteration in repository https://gitbox.apache.org/repos/asf/netbeans.git was ffcd23aeb6 Apache NetBeans 19 current version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch jtulach/VSNetBeansBackport2757 deleted (was 1af0490264)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch jtulach/VSNetBeansBackport2757 in repository https://gitbox.apache.org/repos/asf/netbeans.git was 1af0490264 Check few well known clusters This change permanently discards the following revisions: discard 1af0490264 Check few well known clusters discard 45e298b715 Update CHANGELOG.md - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch jdk18_3 deleted (was c8320a2fa3)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch jdk18_3 in repository https://gitbox.apache.org/repos/asf/netbeans.git was c8320a2fa3 Split into declaration and assignment issue for var type (#453) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch revert-2509-NETBEANS-819 deleted (was 4292453d4e)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch revert-2509-NETBEANS-819 in repository https://gitbox.apache.org/repos/asf/netbeans.git was 4292453d4e Revert "[NETBEANS-819] partial fix for cursor. Text selection does't work" The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch emi-foojay-friend deleted (was 5da234148b)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch emi-foojay-friend in repository https://gitbox.apache.org/repos/asf/netbeans.git was 5da234148b Documents java.j2seplatform newly public API/SPI and bumps version The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch db_to_oci_vault updated (d2b3a14c33 -> cf6d33e569)
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a change to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git omit d2b3a14c33 Adding action/command for adding DB connection proerties to the OCI Vault add cf6d33e569 Adding action/command for adding DB connection proerties to the OCI Vault This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d2b3a14c33) \ N -- N -- N refs/heads/db_to_oci_vault (cf6d33e569) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../cloud/oracle/actions/AddDbConnectionToVault.java| 17 - 1 file changed, 12 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans-website] branch asf-site updated: Update .htaccess for NB20-rc1
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/netbeans-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 72b4110e3 Update .htaccess for NB20-rc1 72b4110e3 is described below commit 72b4110e3f4bdf149b7b1cd7afbc1764c98add02 Author: Neil C Smith AuthorDate: Mon Oct 16 13:38:58 2023 +0100 Update .htaccess for NB20-rc1 --- content/.htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/.htaccess b/content/.htaccess index 0fcfa2a29..dea09ef8b 100644 --- a/content/.htaccess +++ b/content/.htaccess @@ -41,6 +41,8 @@ Redirect 302 /nb/updates/18/ https://netbeans-vm1.apache.org/uc/18/ Redirect 302 /nb/plugins/18/ https://plugins.netbeans.apache.org/data/18/ Redirect 302 /nb/updates/19/ https://netbeans-vm1.apache.org/uc/19/ Redirect 302 /nb/plugins/19/ https://plugins.netbeans.apache.org/data/19/ +Redirect 302 /nb/updates/20/ https://netbeans-vm1.apache.org/uc/20/ +Redirect 302 /nb/plugins/20/ https://plugins.netbeans.apache.org/data/19/ Redirect 302 /nb/updates/dev/ https://netbeans-vm1.apache.org/uc/dev/ Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/19/ Redirect 302 /nb/issues_redirect.html https://netbeans.apache.org/participate/report-issue.html - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 01/01: Adding action/command for adding DB connection proerties to the OCI Vault
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a commit to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d2b3a14c3311afdbc9558e3d03ea47ecd6b435c6 Author: Jan Horvath AuthorDate: Thu Oct 12 21:04:32 2023 +0200 Adding action/command for adding DB connection proerties to the OCI Vault --- enterprise/cloud.oracle/external/binaries-list | 22 +- ...license.txt => oci-java-sdk-3.25.3-license.txt} | 4 +- .../cloud.oracle/nbproject/project.properties | 24 +- enterprise/cloud.oracle/nbproject/project.xml | 48 +- .../oracle/actions/AddDbConnectionToVault.java | 709 + .../modules/cloud/oracle/resources/key.svg | 85 +++ .../modules/cloud/oracle/resources/layer.xml | 31 + .../modules/cloud/oracle/resources/secret.svg | 65 ++ .../modules/cloud/oracle/resources/vault.svg | 80 +++ .../modules/cloud/oracle/vault/KeyItem.java| 49 ++ .../modules/cloud/oracle/vault/KeyNode.java| 90 +++ .../modules/cloud/oracle/vault/SecretItem.java | 49 ++ .../modules/cloud/oracle/vault/SecretNode.java | 79 +++ .../modules/cloud/oracle/vault/VaultItem.java | 55 ++ .../modules/cloud/oracle/vault/VaultNode.java | 82 +++ .../oracle/actions/AddDbConnectionToVaultTest.java | 70 ++ .../netbeans/modules/nbcode/integration/layer.xml | 1 + java/java.lsp.server/vscode/package-lock.json | 4 +- java/java.lsp.server/vscode/package.json | 24 + 19 files changed, 1526 insertions(+), 45 deletions(-) diff --git a/enterprise/cloud.oracle/external/binaries-list b/enterprise/cloud.oracle/external/binaries-list index 622fd1395e..ecd1327b51 100644 --- a/enterprise/cloud.oracle/external/binaries-list +++ b/enterprise/cloud.oracle/external/binaries-list @@ -15,16 +15,18 @@ # specific language governing permissions and limitations # under the License. -F89364D98A616CBA66CA535759EA092C54B4BF75 com.oracle.oci.sdk:oci-java-sdk-common:3.9.0 -7BB77013E6B91FCC7CD72D3338EB9F4019E20EA9 com.oracle.oci.sdk:oci-java-sdk-database:3.9.0 -8AB9B9CA57124F30B6D25CBAC944A7CEE0373068 com.oracle.oci.sdk:oci-java-sdk-identity:3.9.0 -F2071C1D75795350EB4D6807C4327AA333C5930C com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.9.0 -10D73A80C8F66F959C84189272A7FC1C0CB1C435 com.oracle.oci.sdk:oci-java-sdk-workrequests:3.9.0 -031597E1BEEED3E48203BE6ECEBBA442E6FE177E com.oracle.oci.sdk:oci-java-sdk-devops:3.9.0 -5E52AF447D216717453E91782FCB965DF5669D5C com.oracle.oci.sdk:oci-java-sdk-adm:3.9.0 -C81CF0C79C300BF0526DF80D7890F688C1E32803 com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.9.0 -19C42576CC31E6028F29639F442EBA0CD895ADB3 com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.9.0 -9499C6360FFDBEBC6F0F1285A20DD91485FEDD46 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.9.0 +01713F2F4C8533893B8BD73C9461698F16F2B091 com.oracle.oci.sdk:oci-java-sdk-common:3.25.3 +5E25BDEF20C9897C16EA939DBF185177F158EC40 com.oracle.oci.sdk:oci-java-sdk-database:3.25.3 +D1015B3664782EABF06354C63748152E6D3BF268 com.oracle.oci.sdk:oci-java-sdk-vault:3.25.3 +0B6A6C71B4880A87B1FB034B3F1AB6E5361FC558 com.oracle.oci.sdk:oci-java-sdk-keymanagement:3.25.3 +E46F0CE2219BBCDA94B87D4CB4EF4166DAF6C925 com.oracle.oci.sdk:oci-java-sdk-identity:3.25.3 +832F50EFBFB3B320CA5CAEC75FE607FB8CEDF40E com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.25.3 +78C9D083AD254C858E4A69F51958A9A46D260F97 com.oracle.oci.sdk:oci-java-sdk-workrequests:3.25.3 +9D89873EC1059B5B75058DB5FF1C25D66A9EC859 com.oracle.oci.sdk:oci-java-sdk-devops:3.25.3 +95F57672B60D7A611582262828DCED3F7544BA7C com.oracle.oci.sdk:oci-java-sdk-adm:3.25.3 +A8B7EBCA334E8145469A8FE0365C02A2727218EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.25.3 +AECECCD95E5ED92C73E455B7BA4AC714229041EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.25.3 +0CEE99CE7AA783353D19C56AC9F1AD72485DDBE8 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.25.3 E5F6CAE5CA7ECAAC1EC2827A9E2D65AE2869CADA org.apache.httpcomponents:httpclient:4.5.13 853B96D3AFBB7BF8CC303FE27EE96836A10C1834 org.apache.httpcomponents:httpcore:4.4.13 diff --git a/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt similarity index 96% rename from enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt rename to enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt index c7fcf3f3b4..45069662ff 100644 --- a/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt +++ b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt @@ -1,9 +1,9 @@ Name: OCI Java SDK Description: Oracle Cloud Infrastructure SDK for Java Origin: https://github.com/oracle/oci-java-sdk -Version: 3.9.0 +Version: 3.25.3 License: UPL-Apache-2.0 -Files: oci-java-sdk-circuitbreaker-3.9.0.jar,
[netbeans] branch db_to_oci_vault updated (13e01e27f9 -> d2b3a14c33)
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a change to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git omit 13e01e27f9 Adding action/command for adding DB connection proerties to the OCI Vault new d2b3a14c33 Adding action/command for adding DB connection proerties to the OCI Vault This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (13e01e27f9) \ N -- N -- N refs/heads/db_to_oci_vault (d2b3a14c33) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../oracle/actions/AddDbConnectionToVault.java | 24 +++--- 1 file changed, 17 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch db_to_oci_vault updated (658e76614b -> 13e01e27f9)
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a change to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git discard 658e76614b Adding action/command for adding DB connection proerties to the OCI Vault add 13e01e27f9 Adding action/command for adding DB connection proerties to the OCI Vault This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (658e76614b) \ N -- N -- N refs/heads/db_to_oci_vault (13e01e27f9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: enterprise/cloud.oracle/external/binaries-list | 2 -- 1 file changed, 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] branch db_to_oci_vault updated (776d9007d7 -> 658e76614b)
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a change to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git omit 776d9007d7 Fixing license omit bab7ed0485 Fixing license omit 2b1b3056c9 Adding action/command for adding DB connection proerties to the OCI Vault new 658e76614b Adding action/command for adding DB connection proerties to the OCI Vault This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (776d9007d7) \ N -- N -- N refs/heads/db_to_oci_vault (658e76614b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: - To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
[netbeans] 01/01: Adding action/command for adding DB connection proerties to the OCI Vault
This is an automated email from the ASF dual-hosted git repository. jhorvath pushed a commit to branch db_to_oci_vault in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 658e76614bb6d2a4ef4ef5da5096308a5ab8097c Author: Jan Horvath AuthorDate: Thu Oct 12 21:04:32 2023 +0200 Adding action/command for adding DB connection proerties to the OCI Vault --- enterprise/cloud.oracle/external/binaries-list | 24 +- ...license.txt => oci-java-sdk-3.25.3-license.txt} | 4 +- .../cloud.oracle/nbproject/project.properties | 24 +- enterprise/cloud.oracle/nbproject/project.xml | 48 +- .../oracle/actions/AddDbConnectionToVault.java | 699 + .../modules/cloud/oracle/resources/key.svg | 85 +++ .../modules/cloud/oracle/resources/layer.xml | 31 + .../modules/cloud/oracle/resources/secret.svg | 65 ++ .../modules/cloud/oracle/resources/vault.svg | 80 +++ .../modules/cloud/oracle/vault/KeyItem.java| 49 ++ .../modules/cloud/oracle/vault/KeyNode.java| 90 +++ .../modules/cloud/oracle/vault/SecretItem.java | 49 ++ .../modules/cloud/oracle/vault/SecretNode.java | 79 +++ .../modules/cloud/oracle/vault/VaultItem.java | 55 ++ .../modules/cloud/oracle/vault/VaultNode.java | 82 +++ .../oracle/actions/AddDbConnectionToVaultTest.java | 70 +++ .../netbeans/modules/nbcode/integration/layer.xml | 1 + java/java.lsp.server/vscode/package-lock.json | 4 +- java/java.lsp.server/vscode/package.json | 24 + 19 files changed, 1518 insertions(+), 45 deletions(-) diff --git a/enterprise/cloud.oracle/external/binaries-list b/enterprise/cloud.oracle/external/binaries-list index 622fd1395e..cd2ac7f460 100644 --- a/enterprise/cloud.oracle/external/binaries-list +++ b/enterprise/cloud.oracle/external/binaries-list @@ -15,16 +15,20 @@ # specific language governing permissions and limitations # under the License. -F89364D98A616CBA66CA535759EA092C54B4BF75 com.oracle.oci.sdk:oci-java-sdk-common:3.9.0 -7BB77013E6B91FCC7CD72D3338EB9F4019E20EA9 com.oracle.oci.sdk:oci-java-sdk-database:3.9.0 -8AB9B9CA57124F30B6D25CBAC944A7CEE0373068 com.oracle.oci.sdk:oci-java-sdk-identity:3.9.0 -F2071C1D75795350EB4D6807C4327AA333C5930C com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.9.0 -10D73A80C8F66F959C84189272A7FC1C0CB1C435 com.oracle.oci.sdk:oci-java-sdk-workrequests:3.9.0 -031597E1BEEED3E48203BE6ECEBBA442E6FE177E com.oracle.oci.sdk:oci-java-sdk-devops:3.9.0 -5E52AF447D216717453E91782FCB965DF5669D5C com.oracle.oci.sdk:oci-java-sdk-adm:3.9.0 -C81CF0C79C300BF0526DF80D7890F688C1E32803 com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.9.0 -19C42576CC31E6028F29639F442EBA0CD895ADB3 com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.9.0 -9499C6360FFDBEBC6F0F1285A20DD91485FEDD46 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.9.0 +01713F2F4C8533893B8BD73C9461698F16F2B091 com.oracle.oci.sdk:oci-java-sdk-common:3.25.3 +5E25BDEF20C9897C16EA939DBF185177F158EC40 com.oracle.oci.sdk:oci-java-sdk-database:3.25.3 +D1015B3664782EABF06354C63748152E6D3BF268 com.oracle.oci.sdk:oci-java-sdk-vault:3.25.3 +0B6A6C71B4880A87B1FB034B3F1AB6E5361FC558 com.oracle.oci.sdk:oci-java-sdk-keymanagement:3.25.3 +# FD7FC0F0C715CC0D2865C07C4EF7CB9A016D095F com.oracle.oci.sdk:oci-java-sdk-vault:3.25.3 +# 23A82EE6D7C87C5C34ED3285EA28C1D1BCA282F0 com.oracle.oci.sdk:oci-java-sdk-keymanagement:3.25.3 +E46F0CE2219BBCDA94B87D4CB4EF4166DAF6C925 com.oracle.oci.sdk:oci-java-sdk-identity:3.25.3 +832F50EFBFB3B320CA5CAEC75FE607FB8CEDF40E com.oracle.oci.sdk:oci-java-sdk-circuitbreaker:3.25.3 +78C9D083AD254C858E4A69F51958A9A46D260F97 com.oracle.oci.sdk:oci-java-sdk-workrequests:3.25.3 +9D89873EC1059B5B75058DB5FF1C25D66A9EC859 com.oracle.oci.sdk:oci-java-sdk-devops:3.25.3 +95F57672B60D7A611582262828DCED3F7544BA7C com.oracle.oci.sdk:oci-java-sdk-adm:3.25.3 +A8B7EBCA334E8145469A8FE0365C02A2727218EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient:3.25.3 +AECECCD95E5ED92C73E455B7BA4AC714229041EE com.oracle.oci.sdk:oci-java-sdk-common-httpclient-jersey:3.25.3 +0CEE99CE7AA783353D19C56AC9F1AD72485DDBE8 com.oracle.oci.sdk:oci-java-sdk-addons-apache-configurator-jersey:3.25.3 E5F6CAE5CA7ECAAC1EC2827A9E2D65AE2869CADA org.apache.httpcomponents:httpclient:4.5.13 853B96D3AFBB7BF8CC303FE27EE96836A10C1834 org.apache.httpcomponents:httpcore:4.4.13 diff --git a/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt similarity index 96% rename from enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt rename to enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt index c7fcf3f3b4..45069662ff 100644 --- a/enterprise/cloud.oracle/external/oci-java-sdk-3.9.0-license.txt +++ b/enterprise/cloud.oracle/external/oci-java-sdk-3.25.3-license.txt @@ -1,9 +1,9 @@ Name: OCI Java SDK Description: Oracle Cloud
[netbeans] branch master updated: do not create repository and entity classes from template if project was not configured with databse support
This is an automated email from the ASF dual-hosted git repository.
thurka pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new fc9e5178f8 do not create repository and entity classes from template
if project was not configured with databse support
new 9b91eba3ef Merge pull request #6529 from thurka/GCN-3474
fc9e5178f8 is described below
commit fc9e5178f822f61cc194ed259505ecf7d37efc00
Author: Tomas Hurka
AuthorDate: Wed Oct 4 14:04:59 2023 +0200
do not create repository and entity classes from template if project was
not configured with databse support
---
.../org/netbeans/modules/micronaut/db/MicronautEntity.java| 5 +
.../netbeans/modules/micronaut/db/MicronautRepository.java| 4
.../src/org/netbeans/modules/micronaut/db/Utils.java | 11 +--
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java
index 7e83726708..76d072c548 100644
---
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java
+++
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java
@@ -105,6 +105,7 @@ public class MicronautEntity extends RelatedCMPWizard {
@NbBundle.Messages({
"MSG_NoDbConn=No database connection found",
+"MSG_NoDdSupport=No database support libraries found for {0}",
"MSG_NoProject=No project found for {0}",
"MSG_NoSourceGroup=No source group found for {0}",
"MSG_SelectTables=Select Database Tables",
@@ -137,6 +138,10 @@ public class MicronautEntity extends RelatedCMPWizard {
DialogDisplayer.getDefault().notifyLater(new
NotifyDescriptor.Message(Bundle.MSG_NoSourceGroup(folder.getPath()),
NotifyDescriptor.ERROR_MESSAGE));
return Collections.emptyList();
}
+if (!Utils.isDBSupported(sourceGroup) &&
!Utils.isJPASupported(sourceGroup)) {
+DialogDisplayer.getDefault().notifyLater(new
NotifyDescriptor.Message(Bundle.MSG_NoDdSupport(folder.getPath()),
NotifyDescriptor.ERROR_MESSAGE));
+return Collections.emptyList();
+}
DatabaseConnection connection =
ConnectionManager.getDefault().getPreferredConnection(true);
if (connection == null) {
DialogDisplayer.getDefault().notifyLater(new
NotifyDescriptor.Message(Bundle.MSG_NoDbConn(),
NotifyDescriptor.ERROR_MESSAGE));
diff --git
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautRepository.java
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautRepository.java
index 4f3c6b6797..1bb29e08ec 100644
---
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautRepository.java
+++
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautRepository.java
@@ -113,6 +113,10 @@ public class MicronautRepository implements
TemplateWizard.Iterator {
DialogDisplayer.getDefault().notifyLater(new
NotifyDescriptor.Message(Bundle.MSG_NoSourceGroup(folder.getPath()),
NotifyDescriptor.ERROR_MESSAGE));
return Collections.emptyList();
}
+if (!Utils.isDBSupported(sourceGroup) &&
!Utils.isJPASupported(sourceGroup)) {
+DialogDisplayer.getDefault().notifyLater(new
NotifyDescriptor.Message(Bundle.MSG_NoDdSupport(folder.getPath()),
NotifyDescriptor.ERROR_MESSAGE));
+return Collections.emptyList();
+}
final boolean jpaSupported =
Utils.isJPASupported(sourceGroup);
final Map entity2idTypes =
getEntityClasses(sourceGroup, jpaSupported);
final List entities = new
ArrayList<>();
diff --git
a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/Utils.java
b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/Utils.java
index 4e3e08fbd7..c0e5897dea 100644
--- a/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/Utils.java
+++ b/enterprise/micronaut/src/org/netbeans/modules/micronaut/db/Utils.java
@@ -28,6 +28,14 @@ import org.netbeans.api.project.SourceGroup;
public class Utils {
public static boolean isJPASupported(SourceGroup sg) {
+return resolveClassName(sg,
"io.micronaut.data.jpa.repository.JpaRepository"); //NOI18N
+}
+
+public static boolean isDBSupported(SourceGroup sg) {
+return resolveClassName(sg, "io.micronaut.data.annotation.Id");
//NOI18N
+}
+
+private static boolean resolveClassName(SourceGroup sg, String fqn) {
if (sg == null) {
return false;
