[netbeans] branch delivery updated: Keep using Groovy DSL for Gradle
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new a173c03c04 Keep using Groovy DSL for Gradle
new bc4d915b31 Merge pull request #6307 from
lkishalmi/gradle-keep-groovy-dsl
a173c03c04 is described below
commit a173c03c04c6450239419821fc7344069bc9858d
Author: Laszlo Kishalmi
AuthorDate: Sun Aug 6 14:54:28 2023 -0700
Keep using Groovy DSL for Gradle
---
.../modules/gradle/java/newproject/SimpleApplicationProjectWizard.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
index d2ea0be046..f5ba6d5c55 100644
---
a/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
+++
b/java/gradle.java/src/org/netbeans/modules/gradle/java/newproject/SimpleApplicationProjectWizard.java
@@ -65,7 +65,7 @@ public class SimpleApplicationProjectWizard extends
BaseGradleWizardIterator {
final File loc = (File)
params.get(CommonProjectActions.PROJECT_PARENT_FOLDER);
final File root = new File(loc, name);
-ops.createGradleInit(root,
type).basePackage(packageBase).projectName(name).add(); // NOI18N
+ops.createGradleInit(root,
type).basePackage(packageBase).projectName(name).dsl("groovy").add(); // NOI18N
ops.addProjectPreload(root);
ops.addProjectPreload(new File(root, subFolder));
-
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: Merge pull request #6276 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 0fab71ce352999143402ff588dcb07f131cfd05e Merge: ebd5019465 5d6c0c0646 Author: Neil C Smith AuthorDate: Mon Aug 7 10:07:01 2023 +0100 Merge pull request #6276 from apache/delivery Sync delivery to master after 19-rc4 .../impl/ejb/annotation/EnterpriseBeansImpl.java | 1 + .../dd/impl/web/annotation/AnnotationHelpers.java | 1 + .../j2ee/ejbcore/action/SendJMSGenerator.java | 1 + .../api/methodcontroller/EjbMethodController.java | 2 +- .../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 3 +- .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 3 +- .../ejb/wizard/mdb/MdbPropertiesPanelVisual.java | 1 + .../wizard/mdb/MessageDestinationUiSupport.java| 1 + .../wizard/session/SessionEJBWizardDescriptor.java | 3 +- .../ejb/wizard/session/SessionEJBWizardPanel.java | 6 +-- .../rules/AsynchronousMethodInvocation.java| 1 + .../web/jsf/impl/metamodel/ObjectProviders.java| 1 + .../modules/db/sql/loader/SQLCloneableEditor.java | 8 ++-- .../modules/db/sql/loader/SQLEditorSupport.java| 2 + .../netbeans/lib/terminalemulator/StreamTerm.java | 10 - .../orm/annotation/EntityMappingsImpl.java | 1 + .../netbeans/modules/java/lsp/server/Utils.java| 49 ++ .../java/lsp/server/protocol/LspTemplateUI.java| 19 + .../lsp/server/protocol/NbCodeClientWrapper.java | 13 +- .../lsp/server/ui/NotifyDescriptorAdapter.java | 6 ++- .../modules/java/lsp/server/UtilsTest.java | 32 ++ .../lsp/server/protocol/LspTemplateUITest.java | 24 +++ java/java.lsp.server/vscode/CHANGELOG.md | 13 +- .../org/netbeans/api/java/source/TreeMaker.java| 11 + .../netbeans/modules/javadoc/hints/AddTagFix.java | 2 +- .../modules/javadoc/hints/RemoveTagFix.java| 2 +- .../core/windows/services/DialogDisplayerImpl.java | 48 +++-- .../netbeans/core/windows/services/NbDialog.java | 8 .../core/windows/services/NbPresenter.java | 20 ++--- .../core/windows/services/NbDialogTest.java| 7 ++-- .../core/windows/services/NbPresenterTest.java | 11 ++--- .../core/windows/services/NotifyLaterTest.java | 2 +- 32 files changed, 221 insertions(+), 91 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 (ebd5019465 -> 0fab71ce35)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from ebd5019465 Merge pull request #6288 from jhorvath/adb_schema_uppercase add 4a8a8d483d Terminal input ignores detected encoding add 61a38aa3cf Merge pull request #6271 from matthiasblaesing/inputencoding_terminal add 18e2961149 Bugfix: Bring back singleton option when creating a new Session Bean and interfaceless EJBs add a9904d9682 Merge pull request #6257 from matthiasblaesing/session_bean_interface_less_ejb add 226367d465 Fix: Committing SQL files does not change blue color on the file tab in editor add 2f504a8249 Merge pull request #6265 from matthiasblaesing/sqleditor_versioning_state add b5e0253f65 #6278: Improved whitespace handling when stripping HTML. Centralize whitespace handling for quickpicks add 748ef78152 Changelog update. add 38ba76cbfd Merge pull request #6280 from sdedic/lsp/quickpick-whitespaces add 5f6908fa4a Fix Javadoc formatting error when using add/remove param hint. add 6272f5c470 Merge pull request #6282 from neilcsmith-net/fix-garbled-javadoc add 5082b150b9 Fix issue (GH6290) in new DialogDisplayerImpl behaviour introduced in GH5989 / GH6216. add 5d6c0c0646 Merge pull request #6294 from neilcsmith-net/gh6290 new 0fab71ce35 Merge pull request #6276 from apache/delivery 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: .../impl/ejb/annotation/EnterpriseBeansImpl.java | 1 + .../dd/impl/web/annotation/AnnotationHelpers.java | 1 + .../j2ee/ejbcore/action/SendJMSGenerator.java | 1 + .../api/methodcontroller/EjbMethodController.java | 2 +- .../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 3 +- .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 3 +- .../ejb/wizard/mdb/MdbPropertiesPanelVisual.java | 1 + .../wizard/mdb/MessageDestinationUiSupport.java| 1 + .../wizard/session/SessionEJBWizardDescriptor.java | 3 +- .../ejb/wizard/session/SessionEJBWizardPanel.java | 6 +-- .../rules/AsynchronousMethodInvocation.java| 1 + .../web/jsf/impl/metamodel/ObjectProviders.java| 1 + .../modules/db/sql/loader/SQLCloneableEditor.java | 8 ++-- .../modules/db/sql/loader/SQLEditorSupport.java| 2 + .../netbeans/lib/terminalemulator/StreamTerm.java | 10 - .../orm/annotation/EntityMappingsImpl.java | 1 + .../netbeans/modules/java/lsp/server/Utils.java| 49 ++ .../java/lsp/server/protocol/LspTemplateUI.java| 19 + .../lsp/server/protocol/NbCodeClientWrapper.java | 13 +- .../lsp/server/ui/NotifyDescriptorAdapter.java | 6 ++- .../modules/java/lsp/server/UtilsTest.java | 32 ++ .../lsp/server/protocol/LspTemplateUITest.java | 24 +++ java/java.lsp.server/vscode/CHANGELOG.md | 13 +- .../org/netbeans/api/java/source/TreeMaker.java| 11 + .../netbeans/modules/javadoc/hints/AddTagFix.java | 2 +- .../modules/javadoc/hints/RemoveTagFix.java| 2 +- .../core/windows/services/DialogDisplayerImpl.java | 48 +++-- .../netbeans/core/windows/services/NbDialog.java | 8 .../core/windows/services/NbPresenter.java | 20 ++--- .../core/windows/services/NbDialogTest.java| 7 ++-- .../core/windows/services/NbPresenterTest.java | 11 ++--- .../core/windows/services/NotifyLaterTest.java | 2 +- 32 files changed, 221 insertions(+), 91 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] annotated tag 19-rc4 updated (f1f01f07c5 -> 588b492c43)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 19-rc4 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 19-rc4 was modified! *** from f1f01f07c5 (commit) to 588b492c43 (tag) tagging f1f01f07c5874faea7a7864b07f0305949981830 (commit) replaces 19-rc3 by Neil C Smith on Fri Aug 4 17:16:42 2023 +0100 - Log - Apache NetBeans 19-rc4 --- No new revisions were added by this update. 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-jenkins-lib] branch master updated: Add metadata for 19-rc4.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 09fbaf4 Add metadata for 19-rc4.
new 4607100 Merge pull request #98 from neilcsmith-net/nb190
09fbaf4 is described below
commit 09fbaf413aedfff1ce8a5ba335f050bf6502491a
Author: Neil C Smith
AuthorDate: Fri Aug 4 12:02:48 2023 +0100
Add metadata for 19-rc4.
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 0bffecf..ad233e4 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1065,6 +1065,10 @@
"9e004a08c61fd707f83fe7e6e6e746dd5a82d33f": {
"version": "rc3",
"position": "3"
+},
+"f1f01f07c5874faea7a7864b07f0305949981830": {
+"version": "rc4",
+"position": "4"
}
},
"releasedate": {
-
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: Merge pull request #6275 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release190 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit f1f01f07c5874faea7a7864b07f0305949981830 Merge: 9e004a08c6 5d6c0c0646 Author: Neil C Smith AuthorDate: Fri Aug 4 11:58:37 2023 +0100 Merge pull request #6275 from apache/delivery Sync delivery to release190 for 19-rc4 .../impl/ejb/annotation/EnterpriseBeansImpl.java | 1 + .../dd/impl/web/annotation/AnnotationHelpers.java | 1 + .../j2ee/ejbcore/action/SendJMSGenerator.java | 1 + .../api/methodcontroller/EjbMethodController.java | 2 +- .../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 3 +- .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 3 +- .../ejb/wizard/mdb/MdbPropertiesPanelVisual.java | 1 + .../wizard/mdb/MessageDestinationUiSupport.java| 1 + .../wizard/session/SessionEJBWizardDescriptor.java | 3 +- .../ejb/wizard/session/SessionEJBWizardPanel.java | 6 +-- .../rules/AsynchronousMethodInvocation.java| 1 + .../web/jsf/impl/metamodel/ObjectProviders.java| 1 + .../modules/db/sql/loader/SQLCloneableEditor.java | 8 ++-- .../modules/db/sql/loader/SQLEditorSupport.java| 2 + .../netbeans/lib/terminalemulator/StreamTerm.java | 10 - .../orm/annotation/EntityMappingsImpl.java | 1 + .../netbeans/modules/java/lsp/server/Utils.java| 49 ++ .../java/lsp/server/protocol/LspTemplateUI.java| 19 + .../lsp/server/protocol/NbCodeClientWrapper.java | 13 +- .../lsp/server/ui/NotifyDescriptorAdapter.java | 6 ++- .../modules/java/lsp/server/UtilsTest.java | 32 ++ .../lsp/server/protocol/LspTemplateUITest.java | 24 +++ java/java.lsp.server/vscode/CHANGELOG.md | 13 +- .../org/netbeans/api/java/source/TreeMaker.java| 11 + .../netbeans/modules/javadoc/hints/AddTagFix.java | 2 +- .../modules/javadoc/hints/RemoveTagFix.java| 2 +- .../core/windows/services/DialogDisplayerImpl.java | 48 +++-- .../netbeans/core/windows/services/NbDialog.java | 8 .../core/windows/services/NbPresenter.java | 20 ++--- .../core/windows/services/NbDialogTest.java| 7 ++-- .../core/windows/services/NbPresenterTest.java | 11 ++--- .../core/windows/services/NotifyLaterTest.java | 2 +- 32 files changed, 221 insertions(+), 91 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 release190 updated (9e004a08c6 -> f1f01f07c5)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release190 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 9e004a08c6 Merge pull request #6260 from apache/delivery add 4a8a8d483d Terminal input ignores detected encoding add 61a38aa3cf Merge pull request #6271 from matthiasblaesing/inputencoding_terminal add 18e2961149 Bugfix: Bring back singleton option when creating a new Session Bean and interfaceless EJBs add a9904d9682 Merge pull request #6257 from matthiasblaesing/session_bean_interface_less_ejb add 226367d465 Fix: Committing SQL files does not change blue color on the file tab in editor add 2f504a8249 Merge pull request #6265 from matthiasblaesing/sqleditor_versioning_state add b5e0253f65 #6278: Improved whitespace handling when stripping HTML. Centralize whitespace handling for quickpicks add 748ef78152 Changelog update. add 38ba76cbfd Merge pull request #6280 from sdedic/lsp/quickpick-whitespaces add 5f6908fa4a Fix Javadoc formatting error when using add/remove param hint. add 6272f5c470 Merge pull request #6282 from neilcsmith-net/fix-garbled-javadoc add 5082b150b9 Fix issue (GH6290) in new DialogDisplayerImpl behaviour introduced in GH5989 / GH6216. add 5d6c0c0646 Merge pull request #6294 from neilcsmith-net/gh6290 new f1f01f07c5 Merge pull request #6275 from apache/delivery 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: .../impl/ejb/annotation/EnterpriseBeansImpl.java | 1 + .../dd/impl/web/annotation/AnnotationHelpers.java | 1 + .../j2ee/ejbcore/action/SendJMSGenerator.java | 1 + .../api/methodcontroller/EjbMethodController.java | 2 +- .../ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 3 +- .../ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 3 +- .../ejb/wizard/mdb/MdbPropertiesPanelVisual.java | 1 + .../wizard/mdb/MessageDestinationUiSupport.java| 1 + .../wizard/session/SessionEJBWizardDescriptor.java | 3 +- .../ejb/wizard/session/SessionEJBWizardPanel.java | 6 +-- .../rules/AsynchronousMethodInvocation.java| 1 + .../web/jsf/impl/metamodel/ObjectProviders.java| 1 + .../modules/db/sql/loader/SQLCloneableEditor.java | 8 ++-- .../modules/db/sql/loader/SQLEditorSupport.java| 2 + .../netbeans/lib/terminalemulator/StreamTerm.java | 10 - .../orm/annotation/EntityMappingsImpl.java | 1 + .../netbeans/modules/java/lsp/server/Utils.java| 49 ++ .../java/lsp/server/protocol/LspTemplateUI.java| 19 + .../lsp/server/protocol/NbCodeClientWrapper.java | 13 +- .../lsp/server/ui/NotifyDescriptorAdapter.java | 6 ++- .../modules/java/lsp/server/UtilsTest.java | 32 ++ .../lsp/server/protocol/LspTemplateUITest.java | 24 +++ java/java.lsp.server/vscode/CHANGELOG.md | 13 +- .../org/netbeans/api/java/source/TreeMaker.java| 11 + .../netbeans/modules/javadoc/hints/AddTagFix.java | 2 +- .../modules/javadoc/hints/RemoveTagFix.java| 2 +- .../core/windows/services/DialogDisplayerImpl.java | 48 +++-- .../netbeans/core/windows/services/NbDialog.java | 8 .../core/windows/services/NbPresenter.java | 20 ++--- .../core/windows/services/NbDialogTest.java| 7 ++-- .../core/windows/services/NbPresenterTest.java | 11 ++--- .../core/windows/services/NotifyLaterTest.java | 2 +- 32 files changed, 221 insertions(+), 91 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 delivery updated: Fix issue (GH6290) in new DialogDisplayerImpl behaviour introduced in GH5989 / GH6216.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 5082b150b9 Fix issue (GH6290) in new DialogDisplayerImpl behaviour
introduced in GH5989 / GH6216.
new 5d6c0c0646 Merge pull request #6294 from neilcsmith-net/gh6290
5082b150b9 is described below
commit 5082b150b90cd6789e4275e095444e18e4509fed
Author: Neil C Smith
AuthorDate: Thu Aug 3 13:30:03 2023 +0100
Fix issue (GH6290) in new DialogDisplayerImpl behaviour introduced in
GH5989 / GH6216.
---
.../core/windows/services/DialogDisplayerImpl.java | 48 --
.../netbeans/core/windows/services/NbDialog.java | 8
.../core/windows/services/NbPresenter.java | 20 ++---
.../core/windows/services/NbDialogTest.java| 7 ++--
.../core/windows/services/NbPresenterTest.java | 11 ++---
.../core/windows/services/NotifyLaterTest.java | 2 +-
6 files changed, 47 insertions(+), 49 deletions(-)
diff --git
a/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
b/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
index eb9df92d42..78c9814a5d 100644
---
a/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
+++
b/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
@@ -26,7 +26,6 @@ import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.GraphicsEnvironment;
import java.awt.HeadlessException;
-import java.awt.KeyboardFocusManager;
import java.awt.Window;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
@@ -38,6 +37,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CompletableFuture;
+import javax.swing.JOptionPane;
import javax.swing.JRootPane;
import javax.swing.SwingUtilities;
import org.netbeans.core.windows.view.ui.DefaultSeparateContainer;
@@ -120,7 +120,14 @@ public class DialogDisplayerImpl extends DialogDisplayer {
}
}
}
-NbDialog dlg = new NbDialog(d, w);
+NbDialog dlg;
+if (w instanceof Frame) {
+dlg = new NbDialog(d, (Frame) w);
+} else if (w instanceof Dialog) {
+dlg = new NbDialog(d, (Dialog) w);
+} else {
+dlg = new NbDialog(d,
WindowManager.getDefault().getMainWindow());
+}
customizeDlg(dlg);
dlg.requestFocusInWindow ();
return dlg;
@@ -130,19 +137,24 @@ public class DialogDisplayerImpl extends DialogDisplayer {
private Window findDialogParent() {
Component parentComponent = Utilities.findDialogParent(null);
-if (parentComponent instanceof Window) {
-return (Window) parentComponent;
-}
-Window parent = null;
-if (parentComponent != null) {
-parent = SwingUtilities.windowForComponent(parentComponent);
-}
-if (parent == null || parent instanceof NbPresenter && ((NbPresenter)
parent).isLeaf ()) {
+Window parent = findDialogParent(parentComponent);
+if (parent == null || parent == JOptionPane.getRootFrame()
+|| parent instanceof NbPresenter && ((NbPresenter)
parent).isLeaf()) {
return WindowManager.getDefault().getMainWindow();
}
return parent;
}
+private Window findDialogParent(Component component) {
+if (component == null) {
+return null;
+}
+if (component instanceof Frame || component instanceof Dialog) {
+return (Window) component;
+}
+return findDialogParent(component.getParent());
+}
+
/** Notifies user by a dialog.
* @param descriptor description that contains needed informations
* @return the option that has been choosen in the notification.
@@ -227,9 +239,21 @@ public class DialogDisplayerImpl extends DialogDisplayer {
Window parent = noParent ? null : findDialogParent();
if (descriptor instanceof DialogDescriptor) {
-presenter = new NbDialog((DialogDescriptor) descriptor,
parent);
+if (parent instanceof Dialog) {
+presenter = new NbDialog((DialogDescriptor) descriptor,
(Dialog) parent);
+} else if (parent instanceof Frame) {
+presenter = new NbDialog((DialogDescriptor) descriptor,
(Frame) parent);
+} else {
+presenter = new NbDialog((DialogDescriptor) descriptor,
(Frame) null);
+}
} else {
-
svn commit: r63340 - /dev/netbeans/netbeans-nbpackage/1.0-beta3/ /release/netbeans/netbeans-nbpackage/1.0-beta2/ /release/netbeans/netbeans-nbpackage/1.0-beta3/
Author: neilcsmith Date: Thu Aug 3 13:27:36 2023 New Revision: 63340 Log: Release Apache NetBeans NBPackage 1.0-beta3 Added: release/netbeans/netbeans-nbpackage/1.0-beta3/ - copied from r63339, dev/netbeans/netbeans-nbpackage/1.0-beta3/ Removed: dev/netbeans/netbeans-nbpackage/1.0-beta3/ release/netbeans/netbeans-nbpackage/1.0-beta2/ - 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-6216-rk-dialog-parent deleted (was b42b19b8a5)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch revert-6216-rk-dialog-parent in repository https://gitbox.apache.org/repos/asf/netbeans.git was b42b19b8a5 Revert "Use the currently active dialog as the presenter parent" This change permanently discards the following revisions: discard b42b19b8a5 Revert "Use the currently active dialog as the presenter parent" - 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-6216-rk-dialog-parent created (now b42b19b8a5)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch revert-6216-rk-dialog-parent in repository https://gitbox.apache.org/repos/asf/netbeans.git at b42b19b8a5 Revert "Use the currently active dialog as the presenter parent" This branch includes the following new commits: new b42b19b8a5 Revert "Use the currently active dialog as the presenter parent" 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. - 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: Revert "Use the currently active dialog as the presenter parent"
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch revert-6216-rk-dialog-parent
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit b42b19b8a54ffcc26e74f1114cb0b0bbcb5e4a97
Author: Neil C Smith
AuthorDate: Thu Aug 3 09:59:54 2023 +0100
Revert "Use the currently active dialog as the presenter parent"
---
.../core/windows/services/DialogDisplayerImpl.java | 113 +
.../netbeans/core/windows/services/NbDialog.java | 10 +-
.../core/windows/services/NbPresenter.java | 48 +
.../core/windows/services/NodeOperationImpl.java | 8 +-
.../windows/services/DialogDisplayerImplTest.java | 31 +-
.../core/windows/services/NbDialogTest.java| 53 --
.../core/windows/services/NbPresenterTest.java | 25 +
.../core/windows/services/NotifyLaterTest.java | 2 +-
platform/openide.util.ui/apichanges.xml| 16 ---
.../src/org/openide/util/Utilities.java| 57 ++-
10 files changed, 122 insertions(+), 241 deletions(-)
diff --git
a/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
b/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
index eb9df92d42..85cbb635ba 100644
---
a/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
+++
b/platform/core.windows/src/org/netbeans/core/windows/services/DialogDisplayerImpl.java
@@ -42,7 +42,6 @@ import javax.swing.JRootPane;
import javax.swing.SwingUtilities;
import org.netbeans.core.windows.view.ui.DefaultSeparateContainer;
import org.openide.util.Lookup;
-import org.openide.util.Utilities;
import org.openide.util.lookup.ServiceProvider;
/**
@@ -96,53 +95,53 @@ public class DialogDisplayerImpl extends DialogDisplayer {
}
return Mutex.EVENT.readAccess (new Mutex.Action () {
public Dialog run () {
-Window w = preferredParent;
-if (w != null) {
-// Verify the preferred parent
-Component p = Utilities.findDialogParent(w);
-if (p != w) {
-w = null;
+// if a modal dialog active use it as parent
+// otherwise use the main window
+if (NbPresenter.currentModalDialog != null) {
+NbDialog dlg;
+if (NbPresenter.currentModalDialog.isLeaf ()) {
+dlg = new NbDialog(d, WindowManager.getDefault
().getMainWindow ());
+} else {
+dlg = new NbDialog(d, NbPresenter.currentModalDialog);
}
+customizeDlg(dlg);
+return dlg;
}
-if (w == null) {
-w = findDialogParent();
-if (!(w instanceof NbPresenter) || !w.isVisible()) {
-// undocked window is not instanceof NbPresenter
although it's NetBeans's native window
-// all docked windows implements ModeUIBase interface
-if (! (w instanceof
DefaultSeparateContainer.ModeUIBase)) {
-Container cont =
SwingUtilities.getAncestorOfClass(Window.class, w);
-if (cont instanceof
DefaultSeparateContainer.ModeUIBase) {
-w = (Window) cont;
-} else {
-// don't set non-ide window as parent
-w = WindowManager.getDefault ().getMainWindow
();
+else {
+Window w = preferredParent;
+if( null == w ) {
+w =
KeyboardFocusManager.getCurrentKeyboardFocusManager ().getActiveWindow ();
+if (!(w instanceof NbPresenter) || !w.isVisible()) {
+// undocked window is not instanceof NbPresenter
although it's NetBeans's native window
+// all docked windows implements ModeUIBase
interface
+if (! (w instanceof
DefaultSeparateContainer.ModeUIBase)) {
+Container cont =
SwingUtilities.getAncestorOfClass(Window.class, w);
+if (cont instanceof
DefaultSeparateContainer.ModeUIBase) {
+w = (Window) cont;
+} else {
+// don't set non-ide window as parent
+w = WindowManager.getDefault
().getMainWindow ();
+}
}
+} else if (w instanceof NbPresenter && ((NbPresenter)
w).isLeaf ()) {
+w = WindowManager.getDefaul
[netbeans] branch delivery updated: Fix Javadoc formatting error when using add/remove param hint.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 5f6908fa4a Fix Javadoc formatting error when using add/remove param
hint.
new 6272f5c470 Merge pull request #6282 from
neilcsmith-net/fix-garbled-javadoc
5f6908fa4a is described below
commit 5f6908fa4a078e41d0821158784ff5fd8e3bc3ae
Author: Neil C Smith
AuthorDate: Tue Aug 1 15:45:48 2023 +0100
Fix Javadoc formatting error when using add/remove param hint.
---
.../src/org/netbeans/api/java/source/TreeMaker.java | 11 +++
.../src/org/netbeans/modules/javadoc/hints/AddTagFix.java | 2 +-
.../src/org/netbeans/modules/javadoc/hints/RemoveTagFix.java | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git
a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
index e45ae80274..38d84cd3b0 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/TreeMaker.java
@@ -3534,6 +3534,17 @@ public final class TreeMaker {
return delegate.Deprecated(text);
}
+/**Creates a new javadoc comment.
+ *
+ * @param fullBody the entire body of the comment
+ * @param tags the block tags of the comment (after the main body)
+ * @return newly created DocCommentTree
+ * @since 2.62
+ */
+public DocCommentTree DocComment(List fullBody, List tags) {
+return delegate.DocComment(fullBody, tags);
+}
+
/**Creates a new javadoc comment.
*
* @param firstSentence the javadoc comment's first sentence
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
b/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
index de835b49a5..fc0535f9ee 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
@@ -85,7 +85,7 @@ abstract class AddTagFix extends JavaFix {
blockTags.add(newTree);
}
-DocCommentTree newDoc = make.DocComment(docComment.getFirstSentence(),
docComment.getBody(), blockTags);
+DocCommentTree newDoc = make.DocComment(docComment.getFullBody(),
blockTags);
Tree tree = ctx.getPath().getLeaf();
javac.rewrite(tree, docComment, newDoc);
}
diff --git
a/java/javadoc/src/org/netbeans/modules/javadoc/hints/RemoveTagFix.java
b/java/javadoc/src/org/netbeans/modules/javadoc/hints/RemoveTagFix.java
index 766edc77f2..16bcfab5c7 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/hints/RemoveTagFix.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/hints/RemoveTagFix.java
@@ -72,7 +72,7 @@ final class RemoveTagFix extends JavaFix {
blockTags.add(docTree);
}
}
-DocCommentTree newDoc = make.DocComment(docComment.getFirstSentence(),
docComment.getBody(), blockTags);
+DocCommentTree newDoc = make.DocComment(docComment.getFullBody(),
blockTags);
Tree tree = ctx.getPath().getLeaf();
javac.rewrite(tree, docComment, newDoc);
}
-
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 delivery updated: Fix: Committing SQL files does not change blue color on the file tab in editor
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 226367d465 Fix: Committing SQL files does not change blue color on the
file tab in editor
new 2f504a8249 Merge pull request #6265 from
matthiasblaesing/sqleditor_versioning_state
226367d465 is described below
commit 226367d465122086d098b2112e713857310276b6
Author: Matthias Bläsing
AuthorDate: Thu Jul 27 22:14:27 2023 +0200
Fix: Committing SQL files does not change blue color on the file tab in
editor
The construction of the editor panel for SQL is a bit special to
support both using it as SQL console and file editor and allow it to
execute sql statements.
In normal editors multiview elements are initialized by the
infrastructure and #initializeCloneableEditor is called by it to
connect the DataNode and the editor. This was missing for the SQLEditor.
Closes: #6224
---
.../org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java| 8 +---
.../src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java
b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java
index e81e054952..f352e78d63 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLCloneableEditor.java
@@ -106,16 +106,18 @@ public final class SQLCloneableEditor extends
CloneableEditor implements MultiVi
private MultiViewElementCallback callback;
public SQLCloneableEditor() {
+// Constructor used for deserialization/persistence
super(null);
putClientProperty("oldInitialize", Boolean.TRUE); // NOI18N
}
public SQLCloneableEditor(Lookup context) {
+// Normally used constructor
super(context.lookup(SQLEditorSupport.class));
-SQLEditorSupport support = context.lookup(SQLEditorSupport.class);
-setActivatedNodes(new Node[]
{support.getDataObject().getNodeDelegate()});
putClientProperty("oldInitialize", Boolean.TRUE); // NOI18N
-initialize();
+SQLEditorSupport support = context.lookup(SQLEditorSupport.class);
+setActivatedNodes(new
Node[]{support.getDataObject().getNodeDelegate()});
+support.initializeCloneableEditor(this);
}
void setResults(List results) {
diff --git
a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
index 3d75da0a1e..046d80b37e 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
@@ -144,6 +144,8 @@ public class SQLEditorSupport extends DataEditorSupport
@Override
protected void initializeCloneableEditor(CloneableEditor editor) {
+// Invoked when SQLCloneableEditor is deserialized and from the
+// SQLCloneableEditor(Lookup) constructor.
super.initializeCloneableEditor(editor);
((SQLCloneableEditor) editor).initialize();
}
-
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 delivery updated: Terminal input ignores detected encoding
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 4a8a8d483d Terminal input ignores detected encoding
new 61a38aa3cf Merge pull request #6271 from
matthiasblaesing/inputencoding_terminal
4a8a8d483d is described below
commit 4a8a8d483da73b00f6c635bd555e20b060f5f35f
Author: Matthias Bläsing
AuthorDate: Sat Jul 29 14:20:21 2023 +0200
Terminal input ignores detected encoding
It was observed that on a german windows installation with JDK 17 the
terminal correctly shows german umlauts, but fails on input.
The terminal subsystem has code to detect the charset used in the
terminal.
Investigation then leads to StreamTerm, where the InputStream for data
coming from the terminal is adapted with the detected charset, while
the user input is ran through an OutputStreamWriter without charset
set. Therefore the user input is encoded with Cp1250 (default on
german windows setups). This leads to garbled input.
The fix applies the same logik, that is already applied to the
InputStream, also to the OutputStream.
---
.../src/org/netbeans/lib/terminalemulator/StreamTerm.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/StreamTerm.java
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/StreamTerm.java
index 0600ee61c8..1bcb3ac3c5 100644
---
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/StreamTerm.java
+++
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/StreamTerm.java
@@ -274,7 +274,15 @@ public class StreamTerm extends Term {
updateTtySize();
if (pin != null) {
-outputStreamWriter = new OutputStreamWriter(pin);
+if(charSet == null) {
+outputStreamWriter = new OutputStreamWriter(pin);
+} else {
+try {
+outputStreamWriter = new OutputStreamWriter(pin, charSet);
+} catch (UnsupportedEncodingException ex) {
+outputStreamWriter = new OutputStreamWriter(pin);
+}
+}
stdinMonitor = new InputMonitor(outputStreamWriter);
addInputListener(stdinMonitor);
}
-
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 delivery updated: Bugfix: Bring back singleton option when creating a new Session Bean and interfaceless EJBs
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 18e2961149 Bugfix: Bring back singleton option when creating a new
Session Bean and interfaceless EJBs
new a9904d9682 Merge pull request #6257 from
matthiasblaesing/session_bean_interface_less_ejb
18e2961149 is described below
commit 18e29611497b7d6f4004df5f107e386cb2029c7a
Author: Matthias Bläsing
AuthorDate: Tue Jul 25 21:40:28 2023 +0200
Bugfix: Bring back singleton option when creating a new Session Bean and
interfaceless EJBs
The options shown when selecting New > Session Bean are based on the
capabilities of the used enterprise project.
The check missed some Jakarta EE versions and so were disabled.
Analysis done by @asbachb
Closes: #4892
Closes: #4830
---
.../modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java| 1 +
.../modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java | 1 +
.../org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java | 1 +
.../j2ee/ejbcore/api/methodcontroller/EjbMethodController.java | 2 +-
.../j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeVisualPanel2.java | 3 ++-
.../j2ee/ejbcore/ejb/wizard/jpa/dao/EjbFacadeWizardPanel2.java | 3 ++-
.../j2ee/ejbcore/ejb/wizard/mdb/MdbPropertiesPanelVisual.java | 1 +
.../j2ee/ejbcore/ejb/wizard/mdb/MessageDestinationUiSupport.java| 1 +
.../j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardDescriptor.java | 3 ++-
.../j2ee/ejbcore/ejb/wizard/session/SessionEJBWizardPanel.java | 6 +++---
.../j2ee/ejbverification/rules/AsynchronousMethodInvocation.java| 1 +
.../netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java| 1 +
.../persistenceapi/metadata/orm/annotation/EntityMappingsImpl.java | 1 +
13 files changed, 18 insertions(+), 7 deletions(-)
diff --git
a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
index 147b4a8be5..450c011058 100644
---
a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
+++
b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/ejb/annotation/EnterpriseBeansImpl.java
@@ -44,6 +44,7 @@ import
org.netbeans.modules.j2ee.metadata.model.api.support.annotation.Annotatio
import
org.netbeans.modules.j2ee.metadata.model.api.support.annotation.ObjectProvider;
import
org.netbeans.modules.j2ee.metadata.model.api.support.annotation.PersistentObjectManager;
+// @todo: Support JakartaEE
public class EnterpriseBeansImpl implements EnterpriseBeans {
private final AnnotationModelHelper helper;
diff --git
a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
index 80e403bd25..ac425be9fe 100644
---
a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
+++
b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/web/annotation/AnnotationHelpers.java
@@ -33,6 +33,7 @@ import
org.netbeans.modules.j2ee.metadata.model.api.support.annotation.Persisten
/**
* @author Petr Slechta
*/
+// @todo: Support JakartaEE
public class AnnotationHelpers {
private AnnotationModelHelper helper;
diff --git
a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
index 4add112514..50d0a15012 100644
---
a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
+++
b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/SendJMSGenerator.java
@@ -79,6 +79,7 @@ import org.openide.util.Exceptions;
*
* @author Martin Adamek
*/
+// @todo: Support JakartaEE
public final class SendJMSGenerator {
private static final Logger LOG =
Logger.getLogger(SendJMSGenerator.class.getName());
diff --git
a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
index 0c80b8e91a..fb6c7517f6 100644
---
a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
+++
b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EjbMethodController.java
@@ -72,7 +72,7 @@ public abstract class EjbMethodController {
Project project = FileOwnerQuery.getOwner(ejbClassFO);
if (project != n
svn commit: r63235 - /dev/netbeans/netbeans-nbpackage/1.0-beta3/
Author: neilcsmith Date: Fri Jul 28 13:27:40 2023 New Revision: 63235 Log: Apache NetBeans NBPackage 1.0-beta3 vote 1 Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/ dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip (with props) dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.asc dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.sha512 dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip (with props) dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.asc dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.sha512 Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.asc == --- dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.asc (added) +++ dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.asc Fri Jul 28 13:27:40 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJKBAABCgA0FiEEewN+6+Dw3t/uZbaYNwOsOJoSqdQFAmTDuawWHG5laWxjc21p +dGhAYXBhY2hlLm9yZwAKCRA3A6w4mhKp1DHXD/48cHImkXEWT53+jnccEmblQs79 +2st8eRQ9tJaZAkKZu2Cjd6zya6iX1ukSPvlguGv9u05Wq9AvSbylWVadIoknd3tX +CKXJvKjKA8yyyWGxpbKLrWqGqn/nBsHIiPb/ynLzLenS4529yjQr+2HBkbcREK1C +y1mEGWzinAQZzP3k5VmUy5YVbr2oeUgn5vN/hcp5gvMCT/vk7Qit0Q01Sjn0rYf/ +4zT5x8TnI255yi/+lfBW3dzbJoQ8CMW7I3YvvauWSbZAQo+4X0PP4TnvDu8cotKO +WKTpVJx+PFXlcPq6vCFsR//OVmpjWzwCESRRJcLO8kJiWjWkAs9X9dJvln2OlxmS +SwL+wYIbQpuEsHzoiRnYc/Fmr8bMRai89+w8hlU0lS2rczwGTXT3MRckleRcMg/s +lG26SVx8NzSvYZ2s9Ky17ICJN6cbwlN90r6WAYGd9tZ4JPAh398/o/n3P1SAsDCS +mDsv/mmT51K6BUJ7gyScx2DqOOnhbdObTkWuidy34IIZD2ivBZ4aCH/kyCdmbSg/ +cI0VWzgk9Fzgpc2UaLkx5NvqIOuHX3yNHqw4WEK4QM5ZieusLXdIBv0WGBNNsPbt +LEgAahqWLOav4VfTMcqK2Oe0oKSUTpDhml/fg6DRB8IJqOo0Z05vQW9PxoYK7Xeh +7Hw55scElIUbYTaLMw== +=lAwp +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.sha512 == --- dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.sha512 (added) +++ dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-bin.zip.sha512 Fri Jul 28 13:27:40 2023 @@ -0,0 +1 @@ +825a5a287bdaf41982fbce0660e00bdfbb8707836e104024d7f4a6d62c9545cc8b8221fd9e5527e3245d3c526b82216cd263d8496af8c1dd92c56635025a3c42 nbpackage-1.0-beta3-bin.zip Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip == Binary file - no diff available. Propchange: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.asc == --- dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.asc (added) +++ dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.asc Fri Jul 28 13:27:40 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJKBAABCgA0FiEEewN+6+Dw3t/uZbaYNwOsOJoSqdQFAmTDuawWHG5laWxjc21p +dGhAYXBhY2hlLm9yZwAKCRA3A6w4mhKp1PuiD/0Vp5tCsqHfQ10w8Kfg4CPSfJ8J +hf+pH2VppmqxJv0NVXZAyyAEPBYQ1YcbDuizYdMpKC1eEYqX1tHLh86k0zEK6YEW +M34I5KsHDPuJCe2+HcLEzzGMHlryAUNXaRQZucaKbQpiksTXEOo45lkeemvMoVuj +GlURK2L47hB+Nb3hmF6Jjj+hvAg6FaDsvCwpyoWx+JBauFa5es5rWujU5Zblwpzg +wspCv3MT2MJAyNRNzaCtLV/IChSyp77X93utOeEFJm9FnjhJN9yOjBN6jisvAFiX +IIuOFR4J8PwhIqLpU+vAZF7jswGC79zT9dp1M0+k2zxkKQKrm4ks0o5uc4IhkSGi +fYs+FtBQiiYOB3rzwCljwPvGr4ZweVVVQmm5182REQDAIP0DXSZJ/KKWAQNWrM19 +cjK0f4d520kk8ieHIYNIpzjZ5aZ+3Fhuji84DngcZJYgj9lr6i5HaKogC/0AJcoM +AvVPX7duUkeMDJGDpboSZtnRueiEP+WOiHCpSrHeMP2c0rNY2eAA3uPnYn8lD1UW +7lu5FE8Pz1vjmA5chlQBdBr4g+3jfQYK4hwfXGy8N+HKBEv8kQvyxNJFaGBvnOpO +NiOJJo6jxKxoDuXQ2Mmt03AUNXqAcbz6lCwvXaLuPAVodYgaRW3a0LwYciNVuKnZ +glZ8KnMY00WZP8M9pg== +=lx1G +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.sha512 == --- dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.sha512 (added) +++ dev/netbeans/netbeans-nbpackage/1.0-beta3/nbpackage-1.0-beta3-source-release.zip.sha512 Fri Jul 28 13:27:40
[netbeans-nbpackage] annotated tag nbpackage-1.0-beta3 updated (92e3e52 -> e59631d)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag nbpackage-1.0-beta3 in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git *** WARNING: tag nbpackage-1.0-beta3 was modified! *** from 92e3e52 (commit) to e59631d (tag) tagging 92e3e529ed2497012447b6b033f50471aec22064 (commit) by Neil C Smith on Fri Jul 28 13:49:49 2023 +0100 - Log - [maven-release-plugin] copy for tag nbpackage-1.0-beta3 --- No new revisions were added by this update. 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-nbpackage] branch master updated (8a94ba0 -> 90ec758)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git from 8a94ba0 Merge pull request #38 from neilcsmith-net/maven-wrapper add 92e3e52 [maven-release-plugin] prepare release nbpackage-1.0-beta3 add 90ec758 [maven-release-plugin] prepare for next development iteration No new revisions were added by this update. Summary of changes: pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - 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-nbpackage] branch master updated: Add Maven Wrapper (only-script) configured to use Maven 3.9.3.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git
The following commit(s) were added to refs/heads/master by this push:
new 659673d Add Maven Wrapper (only-script) configured to use Maven 3.9.3.
new 8a94ba0 Merge pull request #38 from neilcsmith-net/maven-wrapper
659673d is described below
commit 659673d2706d7491f5140ad882b41f8f98b701f4
Author: Neil C Smith
AuthorDate: Thu Jul 27 10:48:31 2023 +0100
Add Maven Wrapper (only-script) configured to use Maven 3.9.3.
---
.github/workflows/test.yaml| 2 +-
.../wrapper/maven-wrapper.properties | 31 +--
mvnw | 239 +
mvnw.cmd | 145 +
4 files changed, 388 insertions(+), 29 deletions(-)
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 0395223..1e144ba 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -41,4 +41,4 @@ jobs:
distribution: 'temurin'
cache: maven
- name: Build with Maven
- run: mvn --batch-mode package
+ run: ./mvnw --batch-mode clean verify
diff --git a/.github/workflows/test.yaml b/.mvn/wrapper/maven-wrapper.properties
similarity index 54%
copy from .github/workflows/test.yaml
copy to .mvn/wrapper/maven-wrapper.properties
index 0395223..2c9faf6 100644
--- a/.github/workflows/test.yaml
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -14,31 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-
-name: NBPackage
-
-on:
- push:
- pull_request:
-# unlocked event is used as super secret restart button
-types: [opened, synchronize, unlocked]
-
-jobs:
- linux-build:
-name: Build and test on ${{ matrix.os }}, JDK ${{ matrix.java }}
-strategy:
- matrix:
-java: [ '11', '17' ]
-os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ]
-runs-on: ${{ matrix.os }}
-
-steps:
-- uses: actions/checkout@v3
-- name: Set up JDK
- uses: actions/setup-java@v3
- with:
-java-version: ${{ matrix.java }}
-distribution: 'temurin'
-cache: maven
-- name: Build with Maven
- run: mvn --batch-mode package
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionSha256Sum=80b3b63df0e40ca8cde902bb1a40e4488ede24b3f282bd7bd6fba8eb5a7e055c
diff --git a/mvnw b/mvnw
new file mode 100755
index 000..633bbb7
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,239 @@
+#!/bin/sh
+#
+# 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.
+#
+
+#
+# Apache Maven Wrapper startup batch script, version 3.2.0
+#
+# Optional ENV vars
+# -
+# JAVA_HOME - location of a JDK home dir, required when download maven via
java source
+# MVNW_REPOURL - repo url base for downloading maven distribution
+# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script;
others: silence the output
+#
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+(CYGWIN*|MINGW*) [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix
"$JAVA_HOME")"
+ native_path() { cygpath --path --windows "$1"; } ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+ # For Cygwin and MinGW, ensure paths are in Unix format before any
[netbeans] branch master updated (b79fd30b2e -> 119e442c45)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from b79fd30b2e Merge pull request #6206 from lahodaj/jdk21 add f954a246d8 Revert "Use resolve() method that actually throws exception. Respect remote repository chaching." add cd844223fc Merge pull request #6228 from mbien/revert-maven-embedder-commit_delivery add 88dcee788e Add support for GlassFish 7.0.6 - Add support of the MicroProfile REST Client - Add a new way to start GlassFish - Add support for using @Inject to inject REST artifacts - Bug fixes and updates of various components - Bump the GlassFish version in some tests add de8dde74c1 Merge pull request #6221 from pepness/glassfish706 add 97438e5b35 Fix option import regression add 49b653966b Merge pull request #6220 from mbien/fix-option-import_delivery add 459c2d1511 Enable 'Rerun failed tests' button for JUnit5 add a4a69824ad Merge pull request #6217 from Atrament666/fix_rerun_failed_button add a067bcb581 Avoid getting all types with an empty type name #6039 add f052d630a9 Merge pull request #6237 from junichi11/php-gh-6039-fix-regression add 7d88fd1955 Investigate distribution sensitive ComputeImportsTest failures add d05aee81e3 Merge pull request #6235 from mbien/ci-change-coffee-brand add dbbe7979ca Add blank lines for formatting options(Between Use Types) when use statements are inserted by "Fix Imports" #6238 add 62f8c1aac3 Improve the `sort` method add e83c2e7f11 Merge pull request #6242 from junichi11/php-gh-6238-uses-psr12-blank-line add ac29761846 Set DB environment for java+ as well as for java add 9032ecc28e Merge pull request #6248 from jhorvath/db-env add e2bff3b719 Upgrade Gradle Tooling API to 8.3-rc-1 add 479bdef447 Merge pull request #6254 from lkishalmi/gradle-tooling-api-8.3-rc-1 add 119e442c45 Merge pull request #6234 from apache/delivery No new revisions were added by this update. Summary of changes: .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java| 14 + .../glassfish/tooling/admin/AdminFactory.java | 1 + .../glassfish/tooling/data/GlassFishVersion.java | 10 +- .../server/config/ConfigBuilderProvider.java | 8 +- .../glassfish/tooling/admin/AdminFactoryTest.java | 4 +- .../tooling/data/GlassFishVersionTest.java | 8 +- .../glassfish/tooling/utils/EnumUtilsTest.java | 26 +- .../api/execute/GradleDistributionManager.java | 2 +- extide/libs.gradle/external/binaries-list | 2 +- ...txt => gradle-tooling-api-8.3-rc-1-license.txt} | 6 +- txt => gradle-tooling-api-8.3-rc-1-notice.txt} | 0 extide/libs.gradle/nbproject/project.properties| 2 +- extide/libs.gradle/nbproject/project.xml | 2 +- .../java/editor/imports/ComputeImportsTest.java| 4 +- .../vscode/src/dbConfigurationProvider.ts | 6 +- java/java.lsp.server/vscode/src/extension.ts | 5 +- .../modules/maven/embedder/MavenEmbedder.java | 22 +- .../maven/junit/JUnitOutputListenerProvider.java | 17 +- .../AbstractProjectClassPathImplTest.java | 7 +- .../modules/php/editor/actions/FixUsesAction.java | 21 +- .../php/editor/actions/FixUsesPerformer.java | 93 ++-- .../php/editor/actions/ImportDataCreator.java | 5 + .../modules/php/editor/indent/FmtOptions.java | 2 +- .../php/editor/parser/PHPDocCommentParser.java | 31 +- .../ReturnTypeArrayShapes01.pass | 9 + .../ReturnTypeArrayShapes02.pass | 9 + .../ReturnTypeGenerics01.pass | 9 + .../ReturnTypeGenerics02.pass | 9 + .../ReturnTypeGenerics03.pass | 9 + .../ReturnTypeGenerics04.pass | 9 + .../ReturnTypeGenerics05.pass | 9 + .../ReturnTypeObjectShapes01.pass | 9 + .../ReturnTypeObjectShapes02.pass | 9 + .../testGH4609PSR12_GroupUses01.php} | 0 .../testGH4609PSR12_GroupUses01.php.fixUses} | 0 .../testGH4609PSR12_GroupUses02.php} | 0 .../testGH4609PSR12_GroupUses02.php.fixUses} | 4 +- .../testGH4609PSR12_GroupUsesWithPSR12a01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12a02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a02.php.fixUses} | 2 +- .../testGH4609PSR12_GroupUsesWithPSR12b01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12b02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12c01.php} | 0 ...tGH4609PSR12_GroupUsesWithP
[netbeans] annotated tag 19-rc3 updated (9e004a08c6 -> 12ed68ce83)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 19-rc3 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 19-rc3 was modified! *** from 9e004a08c6 (commit) to 12ed68ce83 (tag) tagging 9e004a08c61fd707f83fe7e6e6e746dd5a82d33f (commit) replaces 19-rc1 by Neil C Smith on Thu Jul 27 10:14:22 2023 +0100 - Log - Apache NetBeans 19-rc3 --- No new revisions were added by this update. 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-jenkins-lib] branch master updated: Add metadata for 19-rc3.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new ee6bf72 Add metadata for 19-rc3.
new dff92e9 Merge pull request #97 from neilcsmith-net/nb190
ee6bf72 is described below
commit ee6bf722a13ca6a4b1e5183c8796244ac68add77
Author: Neil C Smith
AuthorDate: Wed Jul 26 16:55:10 2023 +0100
Add metadata for 19-rc3.
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index c73509c..0bffecf 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1061,6 +1061,10 @@
"4fe23f8f1057b3bf89ad2df330f64dc8128a0542": {
"version": "rc2",
"position": "2"
+},
+"9e004a08c61fd707f83fe7e6e6e746dd5a82d33f": {
+"version": "rc3",
+"position": "3"
}
},
"releasedate": {
-
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: Merge pull request #6260 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release190 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 9e004a08c61fd707f83fe7e6e6e746dd5a82d33f Merge: 4fe23f8f10 479bdef447 Author: Neil C Smith AuthorDate: Wed Jul 26 16:50:49 2023 +0100 Merge pull request #6260 from apache/delivery Sync delivery to release190 for 19-rc3 .../modules/gradle/api/execute/GradleDistributionManager.java | 2 +- extide/libs.gradle/external/binaries-list | 2 +- ...-api-8.1-license.txt => gradle-tooling-api-8.3-rc-1-license.txt} | 6 +++--- ...ng-api-8.1-notice.txt => gradle-tooling-api-8.3-rc-1-notice.txt} | 0 extide/libs.gradle/manifest.mf | 2 +- extide/libs.gradle/nbproject/project.properties | 2 +- extide/libs.gradle/nbproject/project.xml| 2 +- 7 files changed, 8 insertions(+), 8 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 release190 updated (4fe23f8f10 -> 9e004a08c6)
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a change to branch release190
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 4fe23f8f10 Merge pull request #6233 from apache/delivery
add e2bff3b719 Upgrade Gradle Tooling API to 8.3-rc-1
add 479bdef447 Merge pull request #6254 from
lkishalmi/gradle-tooling-api-8.3-rc-1
new 9e004a08c6 Merge pull request #6260 from apache/delivery
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:
.../modules/gradle/api/execute/GradleDistributionManager.java | 2 +-
extide/libs.gradle/external/binaries-list | 2 +-
...-api-8.1-license.txt => gradle-tooling-api-8.3-rc-1-license.txt} | 6 +++---
...ng-api-8.1-notice.txt => gradle-tooling-api-8.3-rc-1-notice.txt} | 0
extide/libs.gradle/manifest.mf | 2 +-
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml| 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
rename extide/libs.gradle/external/{gradle-tooling-api-8.1-license.txt =>
gradle-tooling-api-8.3-rc-1-license.txt} (99%)
rename extide/libs.gradle/external/{gradle-tooling-api-8.1-notice.txt =>
gradle-tooling-api-8.3-rc-1-notice.txt} (100%)
-
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 delivery updated: Upgrade Gradle Tooling API to 8.3-rc-1
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new e2bff3b719 Upgrade Gradle Tooling API to 8.3-rc-1
new 479bdef447 Merge pull request #6254 from
lkishalmi/gradle-tooling-api-8.3-rc-1
e2bff3b719 is described below
commit e2bff3b719d2ae71f29c3a48fbc3397aa13b4e38
Author: Laszlo Kishalmi
AuthorDate: Tue Jul 25 10:24:08 2023 -0700
Upgrade Gradle Tooling API to 8.3-rc-1
---
.../modules/gradle/api/execute/GradleDistributionManager.java | 2 +-
extide/libs.gradle/external/binaries-list | 2 +-
...-api-8.1-license.txt => gradle-tooling-api-8.3-rc-1-license.txt} | 6 +++---
...ng-api-8.1-notice.txt => gradle-tooling-api-8.3-rc-1-notice.txt} | 0
extide/libs.gradle/manifest.mf | 2 +-
extide/libs.gradle/nbproject/project.properties | 2 +-
extide/libs.gradle/nbproject/project.xml| 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
index 96d972734c..1cc156d0f6 100644
---
a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
+++
b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleDistributionManager.java
@@ -99,7 +99,7 @@ public final class GradleDistributionManager {
GradleVersion.version("7.3"), // JDK-17
GradleVersion.version("7.5"), // JDK-18
GradleVersion.version("7.6"), // JDK-19
-GradleVersion.version("8.1"), // JDK-20
+GradleVersion.version("8.3"), // JDK-20
};
final File gradleUserHome;
diff --git a/extide/libs.gradle/external/binaries-list
b/extide/libs.gradle/external/binaries-list
index 22ac09dde5..909e0bc2d8 100644
--- a/extide/libs.gradle/external/binaries-list
+++ b/extide/libs.gradle/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-3A673551814ABB3934516344F025B394C9BF7BD6
https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.1/gradle-tooling-api-8.1.jar
gradle-tooling-api-8.1.jar
+AEBBC4E42C325572B12B6CCE22AE30902037603A
https://repo.gradle.org/artifactory/libs-releases/org/gradle/gradle-tooling-api/8.3-rc-1/gradle-tooling-api-8.3-rc-1.jar
gradle-tooling-api-8.3-rc-1.jar
diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.1-license.txt
b/extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-license.txt
similarity index 99%
rename from extide/libs.gradle/external/gradle-tooling-api-8.1-license.txt
rename to extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-license.txt
index 17972b70bd..4b01033df4 100644
--- a/extide/libs.gradle/external/gradle-tooling-api-8.1-license.txt
+++ b/extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-license.txt
@@ -1,7 +1,7 @@
-Name: Gradle Wrapper
+Name: Gradle Tooling API
Description: Gradle Tooling API
-Version: 8.1
-Files: gradle-tooling-api-8.1.jar
+Version: 8.3-rc-1
+Files: gradle-tooling-api-8.3-rc-1.jar
License: Apache-2.0
Origin: Gradle Inc.
URL: https://gradle.org/
diff --git a/extide/libs.gradle/external/gradle-tooling-api-8.1-notice.txt
b/extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-notice.txt
similarity index 100%
rename from extide/libs.gradle/external/gradle-tooling-api-8.1-notice.txt
rename to extide/libs.gradle/external/gradle-tooling-api-8.3-rc-1-notice.txt
diff --git a/extide/libs.gradle/manifest.mf b/extide/libs.gradle/manifest.mf
index bef471a6e3..6e57bb9829 100644
--- a/extide/libs.gradle/manifest.mf
+++ b/extide/libs.gradle/manifest.mf
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.libs.gradle/8
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/libs/gradle/Bundle.properties
-OpenIDE-Module-Specification-Version: 8.2
+OpenIDE-Module-Specification-Version: 8.3
diff --git a/extide/libs.gradle/nbproject/project.properties
b/extide/libs.gradle/nbproject/project.properties
index ea5cdea54f..ab89a246ff 100644
--- a/extide/libs.gradle/nbproject/project.properties
+++ b/extide/libs.gradle/nbproject/project.properties
@@ -22,4 +22,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
# For more information, please see http://wiki.netbeans.org/SignatureTest
sigtest.gen.fail.on.error=false
-release.external/gradle-tooling-api-8.1.jar=modules/gradle/gradle-tooling-api.jar
+release.external/gradle-tooling-api-8.3-rc-1.jar=modules/gradle/gradle-tooling-api.jar
diff --git a/extide/libs.gradle/nbproject/project.xml
b/extide/libs.gradle/nbproject/project.xml
inde
[netbeans-jenkins-lib] branch master updated: Add metadata for 19-rc2.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 8053059 Add metadata for 19-rc2.
new 7a8e045 Merge pull request #96 from neilcsmith-net/nb190
8053059 is described below
commit 8053059186e46dd3b970273a01113b1c81b5333c
Author: Neil C Smith
AuthorDate: Wed Jul 26 09:20:05 2023 +0100
Add metadata for 19-rc2.
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index b4d8b9b..c73509c 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1057,6 +1057,10 @@
"8df65b70ed0d17f0e641b961b0ede8ef89ba640d": {
"version": "rc1",
"position": "1"
+},
+"4fe23f8f1057b3bf89ad2df330f64dc8128a0542": {
+"version": "rc2",
+"position": "2"
}
},
"releasedate": {
-
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 release190 updated (8df65b70ed -> 4fe23f8f10)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release190 in repository https://gitbox.apache.org/repos/asf/netbeans.git from 8df65b70ed Merge pull request #6216 from neilcsmith-net/rk-dialog-parent add f954a246d8 Revert "Use resolve() method that actually throws exception. Respect remote repository chaching." add cd844223fc Merge pull request #6228 from mbien/revert-maven-embedder-commit_delivery add 88dcee788e Add support for GlassFish 7.0.6 - Add support of the MicroProfile REST Client - Add a new way to start GlassFish - Add support for using @Inject to inject REST artifacts - Bug fixes and updates of various components - Bump the GlassFish version in some tests add de8dde74c1 Merge pull request #6221 from pepness/glassfish706 add 97438e5b35 Fix option import regression add 49b653966b Merge pull request #6220 from mbien/fix-option-import_delivery add 459c2d1511 Enable 'Rerun failed tests' button for JUnit5 add a4a69824ad Merge pull request #6217 from Atrament666/fix_rerun_failed_button add a067bcb581 Avoid getting all types with an empty type name #6039 add f052d630a9 Merge pull request #6237 from junichi11/php-gh-6039-fix-regression add 7d88fd1955 Investigate distribution sensitive ComputeImportsTest failures add d05aee81e3 Merge pull request #6235 from mbien/ci-change-coffee-brand add dbbe7979ca Add blank lines for formatting options(Between Use Types) when use statements are inserted by "Fix Imports" #6238 add 62f8c1aac3 Improve the `sort` method add e83c2e7f11 Merge pull request #6242 from junichi11/php-gh-6238-uses-psr12-blank-line add ac29761846 Set DB environment for java+ as well as for java add 9032ecc28e Merge pull request #6248 from jhorvath/db-env new 4fe23f8f10 Merge pull request #6233 from apache/delivery 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: .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java| 14 + .../glassfish/tooling/admin/AdminFactory.java | 1 + .../glassfish/tooling/data/GlassFishVersion.java | 10 +- .../server/config/ConfigBuilderProvider.java | 8 +- .../glassfish/tooling/admin/AdminFactoryTest.java | 4 +- .../tooling/data/GlassFishVersionTest.java | 8 +- .../glassfish/tooling/utils/EnumUtilsTest.java | 26 +- .../java/editor/imports/ComputeImportsTest.java| 4 +- .../vscode/src/dbConfigurationProvider.ts | 6 +- java/java.lsp.server/vscode/src/extension.ts | 5 +- .../modules/maven/embedder/MavenEmbedder.java | 22 +- .../maven/junit/JUnitOutputListenerProvider.java | 17 +- .../AbstractProjectClassPathImplTest.java | 7 +- .../modules/php/editor/actions/FixUsesAction.java | 21 +- .../php/editor/actions/FixUsesPerformer.java | 93 ++-- .../php/editor/actions/ImportDataCreator.java | 5 + .../modules/php/editor/indent/FmtOptions.java | 2 +- .../php/editor/parser/PHPDocCommentParser.java | 31 +- .../ReturnTypeArrayShapes01.pass | 9 + .../ReturnTypeArrayShapes02.pass | 9 + .../ReturnTypeGenerics01.pass | 9 + .../ReturnTypeGenerics02.pass | 9 + .../ReturnTypeGenerics03.pass | 9 + .../ReturnTypeGenerics04.pass | 9 + .../ReturnTypeGenerics05.pass | 9 + .../ReturnTypeObjectShapes01.pass | 9 + .../ReturnTypeObjectShapes02.pass | 9 + .../testGH4609PSR12_GroupUses01.php} | 0 .../testGH4609PSR12_GroupUses01.php.fixUses} | 0 .../testGH4609PSR12_GroupUses02.php} | 0 .../testGH4609PSR12_GroupUses02.php.fixUses} | 4 +- .../testGH4609PSR12_GroupUsesWithPSR12a01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12a02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a02.php.fixUses} | 2 +- .../testGH4609PSR12_GroupUsesWithPSR12b01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12b02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12c01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12c01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12c02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12c02.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12d01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12d01.php.fixUses} | 0 .../testGH4609PS
[netbeans] 01/01: Merge pull request #6233 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release190 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 4fe23f8f1057b3bf89ad2df330f64dc8128a0542 Merge: 8df65b70ed 9032ecc28e Author: Neil C Smith AuthorDate: Wed Jul 26 09:13:44 2023 +0100 Merge pull request #6233 from apache/delivery Sync delivery to release190 for 19-rc2 .../modules/glassfish/common/Bundle.properties | 1 + .../modules/glassfish/common/ServerDetails.java| 14 + .../glassfish/tooling/admin/AdminFactory.java | 1 + .../glassfish/tooling/data/GlassFishVersion.java | 10 +- .../server/config/ConfigBuilderProvider.java | 8 +- .../glassfish/tooling/admin/AdminFactoryTest.java | 4 +- .../tooling/data/GlassFishVersionTest.java | 8 +- .../glassfish/tooling/utils/EnumUtilsTest.java | 26 +- .../java/editor/imports/ComputeImportsTest.java| 4 +- .../vscode/src/dbConfigurationProvider.ts | 6 +- java/java.lsp.server/vscode/src/extension.ts | 5 +- .../modules/maven/embedder/MavenEmbedder.java | 22 +- .../maven/junit/JUnitOutputListenerProvider.java | 17 +- .../AbstractProjectClassPathImplTest.java | 7 +- .../modules/php/editor/actions/FixUsesAction.java | 21 +- .../php/editor/actions/FixUsesPerformer.java | 93 ++-- .../php/editor/actions/ImportDataCreator.java | 5 + .../modules/php/editor/indent/FmtOptions.java | 2 +- .../php/editor/parser/PHPDocCommentParser.java | 31 +- .../ReturnTypeArrayShapes01.pass | 9 + .../ReturnTypeArrayShapes02.pass | 9 + .../ReturnTypeGenerics01.pass | 9 + .../ReturnTypeGenerics02.pass | 9 + .../ReturnTypeGenerics03.pass | 9 + .../ReturnTypeGenerics04.pass | 9 + .../ReturnTypeGenerics05.pass | 9 + .../ReturnTypeObjectShapes01.pass | 9 + .../ReturnTypeObjectShapes02.pass | 9 + .../testGH4609PSR12_GroupUses01.php} | 0 .../testGH4609PSR12_GroupUses01.php.fixUses} | 0 .../testGH4609PSR12_GroupUses02.php} | 0 .../testGH4609PSR12_GroupUses02.php.fixUses} | 4 +- .../testGH4609PSR12_GroupUsesWithPSR12a01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12a02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a02.php.fixUses} | 2 +- .../testGH4609PSR12_GroupUsesWithPSR12b01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12b02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12c01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12c01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12c02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12c02.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12d01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12d01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12d02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12d02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12e01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12e01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12e02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12e02.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12f01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12f01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12f02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12f02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12g01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12g01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12g02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12g02.php.fixUses} | 0 .../testGH4609PSR12_MultipleUses01.php}| 0 .../testGH4609PSR12_MultipleUses01.php.fixUses}| 18 +- .../testGH4609PSR12_MultipleUses02.php}| 0 .../testGH4609PSR12_MultipleUses02.php.fixUses}| 18 +- .../testGH4609PSR12_MultipleUsesWithPSR12a01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12a01.php.fixUses} | 16 +- .../testGH4609PSR12_MultipleUsesWithPSR12a02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12a02.php.fixUses} | 18 +- .../testGH4609PSR12_MultipleUsesWithPSR12b01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12b01.php.fixUses} | 18 +- .../testGH4609PSR12_MultipleUsesWithPSR12b02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12b02.php.fixUses} | 8 +- .../testGH4609PSR12_MultipleUsesWithPSR12c01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12c01.php.fixUses} | 6 +- .../testGH4609PSR12_MultipleUsesWithPSR12c02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12c02.php.fixUses} | 6 +- .../testGH4609PSR12_MultipleUsesWithPSR12d01.php} | 0
[netbeans-nbpackage] branch master updated: Set topSiteUrl to stop site:stage building in root directory.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git
The following commit(s) were added to refs/heads/master by this push:
new 361a0ee Set topSiteUrl to stop site:stage building in root directory.
new 8f80806 Merge pull request #34 from neilcsmith-net/fix-staging-url
361a0ee is described below
commit 361a0eee5582a6d93b6f10f563184c6160e2ebb2
Author: Neil C Smith
AuthorDate: Mon Jul 24 16:38:15 2023 +0100
Set topSiteUrl to stop site:stage building in root directory.
See https://issues.apache.org/jira/projects/MSITE/issues/MSITE-948
---
pom.xml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index c570711..8faf788 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,6 +210,13 @@ under the License.
+
+org.apache.maven.plugins
+maven-site-plugin
+
+ ${project.distributionManagement.site.url}
+
+
-
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-nbpackage] branch master updated: Update to netbeans-parent v4
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git The following commit(s) were added to refs/heads/master by this push: new 27a24a9 Update to netbeans-parent v4 new 9430108 Merge pull request #33 from neilcsmith-net/update-pom 27a24a9 is described below commit 27a24a93feec6db1c10cb1ec45037b528dc064bb Author: Neil C Smith AuthorDate: Mon Jul 24 15:37:06 2023 +0100 Update to netbeans-parent v4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b3195b1..c570711 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.netbeans netbeans-parent -3 +4 org.apache.netbeans - 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-nbpackage] 01/01: Merge pull request #30 from apache/dependabot/maven/master/info.picocli-picocli-4.7.4
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git commit ca651a42258944d232727269337725025ae8b5fb Merge: ce9903f 6a2e1a7 Author: Neil C Smith AuthorDate: Mon Jul 24 15:34:39 2023 +0100 Merge pull request #30 from apache/dependabot/maven/master/info.picocli-picocli-4.7.4 Bump picocli from 4.7.3 to 4.7.4 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-nbpackage] branch master updated (ce9903f -> ca651a4)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git from ce9903f Merge pull request #27 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-surefire-plugin-3.1.0 add 6a2e1a7 Bump picocli from 4.7.3 to 4.7.4 new ca651a4 Merge pull request #30 from apache/dependabot/maven/master/info.picocli-picocli-4.7.4 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-nbpackage] branch master updated (8e0f109 -> ce9903f)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git from 8e0f109 Merge pull request #32 from neilcsmith-net/macos-arch add 3abf5bb Bump maven-surefire-plugin from 3.0.0 to 3.1.0 add ce9903f Merge pull request #27 from apache/dependabot/maven/master/org.apache.maven.plugins-maven-surefire-plugin-3.1.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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 delivery updated (d05aee81e3 -> e83c2e7f11)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git from d05aee81e3 Merge pull request #6235 from mbien/ci-change-coffee-brand new dbbe7979ca Add blank lines for formatting options(Between Use Types) when use statements are inserted by "Fix Imports" #6238 new 62f8c1aac3 Improve the `sort` method new e83c2e7f11 Merge pull request #6242 from junichi11/php-gh-6238-uses-psr12-blank-line The 8876 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: .../modules/php/editor/actions/FixUsesAction.java | 21 +- .../php/editor/actions/FixUsesPerformer.java | 93 ++-- .../modules/php/editor/indent/FmtOptions.java | 2 +- .../testGH4609PSR12_GroupUses01.php} | 0 .../testGH4609PSR12_GroupUses01.php.fixUses} | 0 .../testGH4609PSR12_GroupUses02.php} | 0 .../testGH4609PSR12_GroupUses02.php.fixUses} | 4 +- .../testGH4609PSR12_GroupUsesWithPSR12a01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12a02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12a02.php.fixUses} | 2 +- .../testGH4609PSR12_GroupUsesWithPSR12b01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12b02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12b02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12c01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12c01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12c02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12c02.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12d01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12d01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12d02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12d02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12e01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12e01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12e02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12e02.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12f01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12f01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12f02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12f02.php.fixUses} | 1 - .../testGH4609PSR12_GroupUsesWithPSR12g01.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12g01.php.fixUses} | 0 .../testGH4609PSR12_GroupUsesWithPSR12g02.php} | 0 ...tGH4609PSR12_GroupUsesWithPSR12g02.php.fixUses} | 0 .../testGH4609PSR12_MultipleUses01.php}| 0 .../testGH4609PSR12_MultipleUses01.php.fixUses}| 16 +- .../testGH4609PSR12_MultipleUses02.php}| 0 .../testGH4609PSR12_MultipleUses02.php.fixUses}| 18 +- .../testGH4609PSR12_MultipleUsesWithPSR12a01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12a01.php.fixUses} | 16 +- .../testGH4609PSR12_MultipleUsesWithPSR12a02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12a02.php.fixUses} | 16 +- .../testGH4609PSR12_MultipleUsesWithPSR12b01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12b01.php.fixUses} | 18 +- .../testGH4609PSR12_MultipleUsesWithPSR12b02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12b02.php.fixUses} | 17 +- .../testGH4609PSR12_MultipleUsesWithPSR12c01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12c01.php.fixUses} | 6 +- .../testGH4609PSR12_MultipleUsesWithPSR12c02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12c02.php.fixUses} | 6 +- .../testGH4609PSR12_MultipleUsesWithPSR12d01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12d01.php.fixUses} | 10 +- .../testGH4609PSR12_MultipleUsesWithPSR12d02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12d02.php.fixUses} | 11 +- .../testGH4609PSR12_MultipleUsesWithPSR12e01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12e01.php.fixUses} | 10 +- .../testGH4609PSR12_MultipleUsesWithPSR12e02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12e02.php.fixUses} | 10 +- .../testGH4609PSR12_MultipleUsesWithPSR12f01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12f01.php.fixUses} | 6 +- .../testGH4609PSR12_MultipleUsesWithPSR12f02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12f02.php.fixUses} | 7 +- .../testGH4609PSR12_MultipleUsesWithPSR12g01.php} | 0 ...4609PSR12_MultipleUsesWithPSR12g01.php.fixUses} | 0 .../testGH4609PSR12_MultipleUsesWithPSR12g02.php} | 0 ...4609PSR12_MultipleUsesWithPSR12g02.php.fixUses} | 0 .../testGH4609PSR12_SingleLineUses01.php} | 0 .../testGH4609PSR12_SingleLineUses01.php.fixUses} | 0 .../testGH4609PSR12_SingleLineUses02.php} | 0 .../testGH4609PSR12_Single
[netbeans] branch issues-nb19rc deleted (was f8cc9ddb4b)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch issues-nb19rc in repository https://gitbox.apache.org/repos/asf/netbeans.git was f8cc9ddb4b Update netbeans_bug_report.yml for 19-rc 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] 01/01: Merge pull request #6240 from apache/issues-nb19rc
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 84e52cb0b14089bc7d457133c6771a4f20e67d91 Merge: 9e68d3d963 f8cc9ddb4b Author: Neil C Smith AuthorDate: Fri Jul 21 09:49:40 2023 +0100 Merge pull request #6240 from apache/issues-nb19rc Update netbeans_bug_report.yml for 19-rc .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - 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 (9e68d3d963 -> 84e52cb0b1)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 9e68d3d963 Merge pull request #6219 from neilcsmith-net/spec-versions-nb200 add f8cc9ddb4b Update netbeans_bug_report.yml for 19-rc new 84e52cb0b1 Merge pull request #6240 from apache/issues-nb19rc 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: .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - 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: Update netbeans_bug_report.yml for 19-rc
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch issues-nb19rc in repository https://gitbox.apache.org/repos/asf/netbeans.git commit f8cc9ddb4bdb87c8638c24c03bf4b119fd2f1f07 Author: Neil C Smith AuthorDate: Fri Jul 21 09:47:42 2023 +0100 Update netbeans_bug_report.yml for 19-rc --- .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml index dce4d50cd5..c5b367fdd5 100644 --- a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml @@ -28,7 +28,7 @@ body: multiple: false options: - "Apache NetBeans 18" -#- "Apache NetBeans 19 release candidate" +- "Apache NetBeans 19 release candidate" - "Apache NetBeans latest daily build" validations: required: true @@ -64,6 +64,7 @@ body: multiple: false options: - "No / Don't know" +- "Apache NetBeans 18" - "Apache NetBeans 17" - "Apache NetBeans 16" - "Apache NetBeans 15" - 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 issues-nb19rc created (now f8cc9ddb4b)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch issues-nb19rc in repository https://gitbox.apache.org/repos/asf/netbeans.git at f8cc9ddb4b Update netbeans_bug_report.yml for 19-rc This branch includes the following new commits: new f8cc9ddb4b Update netbeans_bug_report.yml for 19-rc 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. - 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 delivery updated: Investigate distribution sensitive ComputeImportsTest failures
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 7d88fd1955 Investigate distribution sensitive ComputeImportsTest
failures
new d05aee81e3 Merge pull request #6235 from mbien/ci-change-coffee-brand
7d88fd1955 is described below
commit 7d88fd195598f2a3f07a39878584b7ecd3b9d461
Author: Michael Bien
AuthorDate: Thu Jul 20 15:09:49 2023 +0200
Investigate distribution sensitive ComputeImportsTest failures
- tests green on temurin 11
- setting -XX:AzCRSMode=off on zulu 11.0.20+8 didn't help
- updating the test to add com.azul.crs.* to the ignore list
---
.../org/netbeans/modules/java/editor/imports/ComputeImportsTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/java/java.editor/test/unit/src/org/netbeans/modules/java/editor/imports/ComputeImportsTest.java
b/java/java.editor/test/unit/src/org/netbeans/modules/java/editor/imports/ComputeImportsTest.java
index 871f326661..b17a2f6d8d 100644
---
a/java/java.editor/test/unit/src/org/netbeans/modules/java/editor/imports/ComputeImportsTest.java
+++
b/java/java.editor/test/unit/src/org/netbeans/modules/java/editor/imports/ComputeImportsTest.java
@@ -58,7 +58,6 @@ import org.netbeans.api.java.source.TestUtilities;
import org.netbeans.api.java.source.test.support.MemoryValidator;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.editor.imports.ComputeImports.Pair;
-import org.netbeans.modules.java.source.TestUtil;
import org.netbeans.modules.java.source.usages.IndexUtil;
import org.openide.cookies.EditorCookie;
import org.openide.filesystems.FileObject;
@@ -96,7 +95,8 @@ public class ComputeImportsTest extends NbTestCase {
private static final List IGNORE_PATTERNS =
Collections.unmodifiableList(Arrays.asList(
Pattern.compile("jdk\\..*\\.internal\\..*"),
-Pattern.compile("org\\.graalvm\\..*")
+Pattern.compile("org\\.graalvm\\..*"),
+Pattern.compile("com\\.azul\\.crs\\..*") //
https://docs.azul.com/vulnerability-detection/detailed-information/configuration-options
));
private FileObject testSource;
-
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 delivery updated: Avoid getting all types with an empty type name #6039
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new a067bcb581 Avoid getting all types with an empty type name #6039
new f052d630a9 Merge pull request #6237 from
junichi11/php-gh-6039-fix-regression
a067bcb581 is described below
commit a067bcb581f7ba619e7f70e6f4eddde419ad69d9
Author: Junichi Yamamoto
AuthorDate: Thu Jul 20 19:42:53 2023 +0900
Avoid getting all types with an empty type name #6039
- https://github.com/apache/netbeans/issues/6039
- Remove `<>` and `{}` from type name
- Ignore an empty type name to avoid getting all types
- Add unit tests
---
.../php/editor/actions/ImportDataCreator.java | 5 ++
.../php/editor/parser/PHPDocCommentParser.java | 31 ---
.../ReturnTypeArrayShapes01.pass | 9 +++
.../ReturnTypeArrayShapes02.pass | 9 +++
.../ReturnTypeGenerics01.pass | 9 +++
.../ReturnTypeGenerics02.pass | 9 +++
.../ReturnTypeGenerics03.pass | 9 +++
.../ReturnTypeGenerics04.pass | 9 +++
.../ReturnTypeGenerics05.pass | 9 +++
.../ReturnTypeObjectShapes01.pass | 9 +++
.../ReturnTypeObjectShapes02.pass | 9 +++
.../testfiles/actions/testGH6039/testGH6039_01.php | 64 ++
.../testGH6039/testGH6039_01.php.importData| 7 +++
.../php/editor/actions/ImportDataCreatorTest.java | 4 ++
.../php/editor/parser/PHPDocCommentParserTest.java | 45 +++
15 files changed, 230 insertions(+), 7 deletions(-)
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java
b/php/php.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java
index 60e1b6a5b1..6d9b1eb002 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/actions/ImportDataCreator.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeSet;
import org.netbeans.modules.php.api.PhpVersion;
+import org.netbeans.modules.php.api.util.StringUtils;
import org.netbeans.modules.php.editor.CodeUtils;
import org.netbeans.modules.php.editor.actions.FixUsesAction.Options;
import org.netbeans.modules.php.editor.actions.ImportData.DataItem;
@@ -87,6 +88,10 @@ public class ImportDataCreator {
}
private void processFQElementName(final String fqElementName) {
+// GH-6039: avoid getting all types
+if (!StringUtils.hasText(fqElementName)) {
+return;
+}
// GH-6075
String fqeName = CodeUtils.removeNullableTypePrefix(fqElementName);
Collection possibleFQElements =
fetchPossibleFQElements(fqeName);
diff --git
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
index 160df03925..64c9c3417e 100644
---
a/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
+++
b/php/php.editor/src/org/netbeans/modules/php/editor/parser/PHPDocCommentParser.java
@@ -263,6 +263,7 @@ public class PHPDocCommentParser {
List result = new ArrayList<>();
for (String stype : getTypes(description, isReturnTag)) {
stype = removeHTMLTags(stype);
+stype = sanitizeShapes(stype);
int startDocNode = findStartOfDocNode(originalComment,
originalCommentStart, stype, startDescription);
if (startDocNode == -1) {
continue;
@@ -377,17 +378,33 @@ public class PHPDocCommentParser {
private String removeHTMLTags(String text) {
String value = text;
-int index = value.indexOf('>');
-if (index > -1) {
-value = value.substring(index + 1);
-index = value.indexOf('<');
-if (index > -1) {
-value = value.substring(0, index);
-}
+int startTagIndex = value.indexOf('<');
+if (startTagIndex > -1) {
+value = value.substring(0, startTagIndex).trim();
}
return value;
}
+/**
+ * Remove `{'key': type}`.
+ *
+ * e.g. {@code array{'foo': int}}, {@code object{'foo': int, "bar":
string}}
+ *
+ * @see https://phpstan.org/writing-php-code/phpdoc-types#array-shapes
+ * @see https://phpstan.org/writing-php-code/phpdoc-types#object-shapes
+ *
+ * @param type the type
+ * @return the sanitized type
+ */
+private String sanitizeShapes(String type) {
+String sanitizedType = type;
+int startIndex = sanitizedType.indexOf
[netbeans] branch delivery updated: Enable 'Rerun failed tests' button for JUnit5
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 459c2d1511 Enable 'Rerun failed tests' button for JUnit5
new a4a69824ad Merge pull request #6217 from
Atrament666/fix_rerun_failed_button
459c2d1511 is described below
commit 459c2d151118d48bdc92a90155da5a5d8920db79
Author: Vladimír Machat
AuthorDate: Tue Jul 18 11:29:21 2023 +0100
Enable 'Rerun failed tests' button for JUnit5
Fixes #6199
---
.../maven/junit/JUnitOutputListenerProvider.java| 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git
a/java/maven.junit/src/org/netbeans/modules/maven/junit/JUnitOutputListenerProvider.java
b/java/maven.junit/src/org/netbeans/modules/maven/junit/JUnitOutputListenerProvider.java
index 4cda2cca62..2c04b7406d 100644
---
a/java/maven.junit/src/org/netbeans/modules/maven/junit/JUnitOutputListenerProvider.java
+++
b/java/maven.junit/src/org/netbeans/modules/maven/junit/JUnitOutputListenerProvider.java
@@ -470,7 +470,9 @@ public class JUnitOutputListenerProvider implements
OutputProcessor {
return
usingSurefire28(config.getMavenProject());
} else if
(usingJUnit4(config.getMavenProject())) { //#214334
return
usingSurefire2121(config.getMavenProject());
- }
+ } else if
(getJUnitVersion(config.getMavenProject()).equals("JUNIT5")){
+return
usingSurefire2220(config.getMavenProject());
+}
}
}
return false;
@@ -505,7 +507,12 @@ public class JUnitOutputListenerProvider implements
OutputProcessor {
private boolean usingSurefire28(MavenProject prj) {
String v = PluginPropertyUtils.getPluginVersion(prj,
Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_SUREFIRE);
return v != null && new ComparableVersion(v).compareTo(new
ComparableVersion("2.8")) >= 0;
-}
+}
+
+private boolean usingSurefire2220(MavenProject prj) {
+String v = PluginPropertyUtils.getPluginVersion(prj,
Constants.GROUP_APACHE_PLUGINS, Constants.PLUGIN_SUREFIRE);
+return v != null && new ComparableVersion(v).compareTo(new
ComparableVersion("2.22.0")) >= 0;
+}
private boolean usingTestNG(MavenProject prj) {
for (Artifact a : prj.getArtifacts()) {
@@ -528,6 +535,12 @@ public class JUnitOutputListenerProvider implements
OutputProcessor {
return "JUNIT3"; //NOI18N
}
}
+if ("org.junit.jupiter".equals(a.getGroupId()) &&
"junit-jupiter-api".equals(a.getArtifactId())) {
+String version = a.getVersion();
+if (version != null && new
ComparableVersion(version).compareTo(new ComparableVersion("5.0")) >= 0) {
+return "JUNIT5"; //NOI18N
+}
+}
}
return juVersion;
}
-
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 delivery updated: Fix option import regression
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 97438e5b35 Fix option import regression
new 49b653966b Merge pull request #6220 from
mbien/fix-option-import_delivery
97438e5b35 is described below
commit 97438e5b355ba6113cce48c49a1efbea3f94975d
Author: Michael Bien
AuthorDate: Tue Jul 18 17:00:13 2023 +0200
Fix option import regression
there was a bug in the boolean logic of checkIntegrity()
---
.../org/netbeans/modules/options/export/OptionsExportModel.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
b/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
index 7a48551aa5..f440ed0577 100644
---
a/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
+++
b/platform/options.api/src/org/netbeans/modules/options/export/OptionsExportModel.java
@@ -746,23 +746,24 @@ public final class OptionsExportModel {
Enumeration entries = zipFile.entries();
while (entries.hasMoreElements()) {
ZipEntry zipEntry = entries.nextElement();
-if (!zipEntry.isDirectory() && !checkIntegrity(zipEntry)) {
+if (!zipEntry.isDirectory() && checkIntegrity(zipEntry)) {
copyFile(zipEntry.getName());
}
}
}
}
+// true if ok
private boolean checkIntegrity(ZipEntry entry) throws IOException {
if (entry.getName().endsWith(".properties")) {
try (ZipFile zip = new ZipFile(source);
BufferedReader reader = new BufferedReader(new
InputStreamReader(zip.getInputStream(entry), StandardCharsets.UTF_8))) {
// invalid code point check JDK-8075156
-boolean corrupted = reader.lines().anyMatch(l ->
l.indexOf('\u') != -1);
-if (corrupted) {
+boolean ok = reader.lines().noneMatch(l -> l.indexOf('\u')
!= -1);
+if (!ok) {
LOGGER.log(Level.WARNING, "ignoring corrupted properties
file at {0}", entry.getName());
}
-return corrupted;
+return ok;
}
}
return true;
-
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 delivery updated: Add support for GlassFish 7.0.6 - Add support of the MicroProfile REST Client - Add a new way to start GlassFish - Add support for using @Inject to inject REST arti
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 88dcee788e Add support for GlassFish 7.0.6 - Add support of the
MicroProfile REST Client - Add a new way to start GlassFish - Add support for
using @Inject to inject REST artifacts - Bug fixes and updates of various
components - Bump the GlassFish version in some tests
new de8dde74c1 Merge pull request #6221 from pepness/glassfish706
88dcee788e is described below
commit 88dcee788e4bca2aed58ae9f0d5b97352f90b107
Author: José Contreras
AuthorDate: Tue Jul 18 17:24:03 2023 -0600
Add support for GlassFish 7.0.6
- Add support of the MicroProfile REST Client
- Add a new way to start GlassFish
- Add support for using @Inject to inject REST artifacts
- Bug fixes and updates of various components
- Bump the GlassFish version in some tests
---
.../modules/glassfish/common/Bundle.properties | 1 +
.../modules/glassfish/common/ServerDetails.java| 14
.../glassfish/tooling/admin/AdminFactory.java | 1 +
.../glassfish/tooling/data/GlassFishVersion.java | 10 -
.../server/config/ConfigBuilderProvider.java | 8 ++-
.../glassfish/tooling/admin/AdminFactoryTest.java | 4 ++--
.../tooling/data/GlassFishVersionTest.java | 8 +--
.../glassfish/tooling/utils/EnumUtilsTest.java | 26 +++---
8 files changed, 53 insertions(+), 19 deletions(-)
diff --git
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
index ba40e9cd3e..7babce535c 100644
---
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
+++
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/Bundle.properties
@@ -172,6 +172,7 @@ STR_702_SERVER_NAME=GlassFish Server 7.0.2
STR_703_SERVER_NAME=GlassFish Server 7.0.3
STR_704_SERVER_NAME=GlassFish Server 7.0.4
STR_705_SERVER_NAME=GlassFish Server 7.0.5
+STR_706_SERVER_NAME=GlassFish Server 7.0.6
# CommonServerSupport.java
MSG_FLAKEY_NETWORK=Network communication problemCould not establish
\
diff --git
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
index 36c0d30b05..0d8d14f6eb 100644
---
a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
+++
b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
@@ -356,6 +356,17 @@ public enum ServerDetails {
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip;,
// NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.5/glassfish-7.0.5.zip;,
// NOI18N
"http://www.eclipse.org/legal/epl-2.0; //NOI18N
+),
+
+/**
+ * details for an instance of GlassFish Server 7.0.6
+ */
+GLASSFISH_SERVER_7_0_6(NbBundle.getMessage(ServerDetails.class,
"STR_706_SERVER_NAME", new Object[]{}), // NOI18N
+"deployer:gfv700ee10", // NOI18N
+706,
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.6/glassfish-7.0.6.zip;,
// NOI18N
+
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/7.0.6/glassfish-7.0.6.zip;,
// NOI18N
+"http://www.eclipse.org/legal/epl-2.0; //NOI18N
);
/**
@@ -367,6 +378,7 @@ public enum ServerDetails {
public static WizardDescriptor.InstantiatingIterator
getInstantiatingIterator() {
return new ServerWizardIterator(new ServerDetails[]{
+GLASSFISH_SERVER_7_0_6,
GLASSFISH_SERVER_7_0_5,
GLASSFISH_SERVER_7_0_4,
GLASSFISH_SERVER_7_0_3,
@@ -396,6 +408,7 @@ public enum ServerDetails {
GLASSFISH_SERVER_3_0_1,
GLASSFISH_SERVER_3},
new ServerDetails[]{
+GLASSFISH_SERVER_7_0_6,
GLASSFISH_SERVER_7_0_5,
GLASSFISH_SERVER_7_0_4,
GLASSFISH_SERVER_7_0_3,
@@ -466,6 +479,7 @@ public enum ServerDetails {
case GF_7_0_3: return GLASSFISH_SERVER_7_0_3.getVersion();
case GF_7_0_4: return GLASSFISH_SERVER_7_0_4.getVersion();
case GF_7_0_5: return GLASSFISH_SERVER_7_0_5.getVersion();
+case GF_7_0_6: return GLASSFISH_SERVER_7_0_6.getVersion();
default: return -1;
}
}
diff --git
a/enterprise/gl
[netbeans] branch delivery updated: Revert "Use resolve() method that actually throws exception. Respect remote repository chaching."
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new f954a246d8 Revert "Use resolve() method that actually throws
exception. Respect remote repository chaching."
new cd844223fc Merge pull request #6228 from
mbien/revert-maven-embedder-commit_delivery
f954a246d8 is described below
commit f954a246d84d0846cedeaa308868031a577e1e46
Author: Michael Bien
AuthorDate: Wed Jul 19 05:03:41 2023 +0200
Revert "Use resolve() method that actually throws exception. Respect remote
repository chaching."
This reverts commit e2a14bf32a5bddabee71e0fc2e35f575f7d1aacc.
fixes #6222 ArtifactResolutionExceptions when working with maven projects
---
.../modules/maven/embedder/MavenEmbedder.java | 22 --
.../AbstractProjectClassPathImplTest.java | 7 +--
2 files changed, 13 insertions(+), 16 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 7608be2203..4bf4c38954 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
@@ -45,7 +45,6 @@ import
org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.cli.configuration.SettingsXmlConfigurationProcessor;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
@@ -94,7 +93,6 @@ 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.internal.impl.EnhancedLocalRepositoryManagerFactory;
import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
@@ -372,13 +370,17 @@ public final class MavenEmbedder {
*/
public void resolve(Artifact sources, List
remoteRepositories, ArtifactRepository localRepository) throws
ArtifactResolutionException, ArtifactNotFoundException {
setUpLegacySupport();
-
-// must call internal Resolver API directly, as the RepositorySystem
does not report an exception,
-// even in ArtifactResolutionResult: resolve(ArtifactResolutionRequest
request) catches the exception and
-// swallows ArtifactNotFoundException.
-// The existing calling code that handles these exception cannot work,
in fact, when using resolve(ArtifactResolutionRequest request) API.
-lookupComponent(ArtifactResolver.class).resolveAlways(sources,
remoteRepositories, localRepository);
+ArtifactResolutionRequest req = new ArtifactResolutionRequest();
+req.setLocalRepository(localRepository);
+req.setRemoteRepositories(remoteRepositories);
+req.setArtifact(sources);
+req.setOffline(isOffline());
+ArtifactResolutionResult result = repositorySystem.resolve(req);
normalizePath(sources);
+// XXX check result for exceptions and throw them now?
+for (Exception ex : result.getExceptions()) {
+LOG.log(Level.FINE, null, ex);
+}
}
//TODO possibly rename.. build sounds like something else..
@@ -509,7 +511,7 @@ public final class MavenEmbedder {
return req;
}
-
+
/**
* 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.)
@@ -522,7 +524,7 @@ public final class MavenEmbedder {
}
DefaultRepositorySystemSession session = new
DefaultRepositorySystemSession();
session.setOffline(isOffline());
-EnhancedLocalRepositoryManagerFactory f =
lookupComponent(EnhancedLocalRepositoryManagerFactory.class);
+SimpleLocalRepositoryManagerFactory f = new
SimpleLocalRepositoryManagerFactory();
try {
session.setLocalRepositoryManager(f.newInstance(session, new
LocalRepository(getLocalRepository().getBasedir(;
} catch (NoLocalRepositoryManagerException ex) {
diff --git
a/java/mav
[netbeans] annotated tag 19-rc1 updated (8df65b70ed -> 66bac7c89f)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 19-rc1 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 19-rc1 was modified! *** from 8df65b70ed (commit) to 66bac7c89f (tag) tagging 8df65b70ed0d17f0e641b961b0ede8ef89ba640d (commit) replaces 18-rc1 by Neil C Smith on Wed Jul 19 09:05:42 2023 +0100 - Log - Apache NetBeans 19-rc1 --- No new revisions were added by this update. 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-jenkins-lib] branch master updated: Add parameter to control VSIX build.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 8fded0e Add parameter to control VSIX build.
new f5aab2c Merge pull request #94 from neilcsmith-net/nb190
8fded0e is described below
commit 8fded0e57c00dd91af6c8e07d81561987047027a
Author: Neil C Smith
AuthorDate: Tue Jul 18 18:36:18 2023 +0100
Add parameter to control VSIX build.
---
vars/asfMainNetBeansBuild.groovy | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/vars/asfMainNetBeansBuild.groovy b/vars/asfMainNetBeansBuild.groovy
index ca1c9d3..1790829 100644
--- a/vars/asfMainNetBeansBuild.groovy
+++ b/vars/asfMainNetBeansBuild.groovy
@@ -71,6 +71,7 @@ def call(Map params = [:]) {
parameters {
booleanParam(name: 'INSTALLERS', defaultValue: false, description:
'Build installers?')
+booleanParam(name: 'VSIX', defaultValue: false, description:
'Build VSCode plugin?')
booleanParam(name: 'NIGHTLIES', defaultValue: false, description:
'Publish to nightlies.apache.org?')
}
@@ -428,9 +429,14 @@ def doParallelClusters(cconfigs) {
sh "mvn
org.apache.netbeans.utilities:nb-repository-plugin:${repopluginversion}:populate
${commonparam} -DnetbeansNbmDirectory=${netbeansbase}/nbms
-DnetbeansInstallDirectory=${netbeansbase}/netbeans
-DnetbeansSourcesDirectory=${netbeansbase}/build/source-zips
-DnetbeansJavadocDirectory=${netbeansbase}/build/javadoc
-DparentGAV=org.apache.netbeans:netbeans-parent:4
-DforcedVersion=${mavenVersion} -DskipInstall=true
-DdeployUrl=file://${env.WORK [...]
zip
zipFile:'mavenrepo.zip',dir:'mavenrepository',archive:'true'
}
-// make vsix available to dist to
pickup (only for main release) need a maven setup
-sh "ant -f
build-${clustername}-temp/java/java.lsp.server build-vscode-ext
-Dvsix.version=${vsixversion} -Dmetabuild.branch=${branch}"
-sh "cp -r
build-${clustername}-temp/java/java.lsp.server/build/*.vsix dist/vsix/"
+if (params.VSIX) {
+// make vsix available to dist to
pickup (only for main release) need a maven setup
+println "BUILDING VSCODE PLUGIN"
+sh "ant -f
build-${clustername}-temp/java/java.lsp.server build-vscode-ext
-Dvsix.version=${vsixversion} -Dmetabuild.branch=${branch}"
+sh "cp -r
build-${clustername}-temp/java/java.lsp.server/build/*.vsix dist/vsix/"
+} else {
+println "SKIPPING VSCODE PLUGIN"
+}
}
}
-
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-jenkins-lib] branch master updated: Add metadata for 19-rc1.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 236d8e0 Add metadata for 19-rc1.
new c07accb Merge pull request #93 from neilcsmith-net/nb190
236d8e0 is described below
commit 236d8e055588c05dcff38f85796599a88115f514
Author: Neil C Smith
AuthorDate: Tue Jul 18 15:00:00 2023 +0100
Add metadata for 19-rc1.
---
meta/netbeansrelease.json | 36 ++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 2cbcd6c..b4d8b9b 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1027,14 +1027,46 @@
"position": "4"
}
},
+"releasedate": {
+"day": "30",
+"month": "05",
+"year": "2023"
+},
+"previousreleasedate": {
+"day": "21",
+"month": "02",
+"year": "2023"
+}
+},
+"release190": {
+"position": "28",
+"ant": "ant_latest",
+"jdk": "jdk_11_latest",
+"jdktoolapidoc" : "jdk_20_latest",
+"jdk_apidoc": "https://docs.oracle.com/en/java/javase/11/docs/api/;,
+"maven": "maven_3_latest",
+"versionName": "19",
+"vsixVersion": "19.0.0",
+"mavenversion": "RELEASE190",
+"tlp": "true",
+"apidocurl": "https://bits.netbeans.org/19/javadoc;,
+"update_url":
"https://netbeans.apache.org/nb/updates/19/updates.xml.gz?{$netbeans.hash.code};,
+"plugin_url":
"https://netbeans.apache.org/nb/plugins/19/catalog.xml.gz;,
+"publish_apidoc":"true",
+"milestones": {
+"8df65b70ed0d17f0e641b961b0ede8ef89ba640d": {
+"version": "rc1",
+"position": "1"
+}
+},
"releasedate": {
"day": "-",
"month": "-",
"year": "-"
},
"previousreleasedate": {
-"day": "21",
-"month": "02",
+"day": "30",
+"month": "05",
"year": "2023"
}
},
-
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/01: Merge pull request #662 from apache/nb19-rc
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit 2945df46ced248591359a9ab89a33578cee779a5 Merge: cf52329d5 92182da53 Author: Neil C Smith AuthorDate: Tue Jul 18 14:52:35 2023 +0100 Merge pull request #662 from apache/nb19-rc Update .htaccess for NB19 RCs netbeans.apache.org/src/content/.htaccess | 2 ++ 1 file changed, 2 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-website] branch master updated (cf52329d5 -> 2945df46c)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-website.git from cf52329d5 Merge pull request #661 from ebarboni/formerblog add 92182da53 Update .htaccess for NB19 RCs new 2945df46c Merge pull request #662 from apache/nb19-rc 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: netbeans.apache.org/src/content/.htaccess | 2 ++ 1 file changed, 2 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-website] 01/01: Update .htaccess for NB19 RCs
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch nb19-rc in repository https://gitbox.apache.org/repos/asf/netbeans-website.git commit 92182da5339e84ddad36b0591839e2ef033c6c95 Author: Neil C Smith AuthorDate: Tue Jul 18 14:52:02 2023 +0100 Update .htaccess for NB19 RCs --- netbeans.apache.org/src/content/.htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbeans.apache.org/src/content/.htaccess b/netbeans.apache.org/src/content/.htaccess index 3e97d2aa4..514acb860 100644 --- a/netbeans.apache.org/src/content/.htaccess +++ b/netbeans.apache.org/src/content/.htaccess @@ -39,6 +39,8 @@ Redirect 302 /nb/updates/17/ https://netbeans-vm1.apache.org/uc/17/ Redirect 302 /nb/plugins/17/ https://plugins.netbeans.apache.org/data/17/ 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/18/ Redirect 302 /nb/updates/dev/ https://netbeans-vm1.apache.org/uc/dev/ Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/18/ 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-website] branch nb19-rc created (now 92182da53)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch nb19-rc in repository https://gitbox.apache.org/repos/asf/netbeans-website.git at 92182da53 Update .htaccess for NB19 RCs This branch includes the following new commits: new 92182da53 Update .htaccess for NB19 RCs 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. - 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 release190 created (now 8df65b70ed)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release190 in repository https://gitbox.apache.org/repos/asf/netbeans.git at 8df65b70ed Merge pull request #6216 from neilcsmith-net/rk-dialog-parent No new revisions were added by this update. - 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 delivery created (now 8df65b70ed)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git at 8df65b70ed Merge pull request #6216 from neilcsmith-net/rk-dialog-parent No new revisions were added by this update. - 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 (0bee9d3691 -> 8df65b70ed)
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
from 0bee9d3691 Merge pull request #6129 from
asbachb/jakarta-namespace-entity-sessionbeans
new d1ac3975b3 #5987: Use the currently active dialog as the presenter
parent.
new e9d3df1d17 Merge branch 'rk/5987/dialog-parent' of
https://github.com/rkeen-siemens/incubator-netbeans into rk-dialog-parent
new d7474cfcc7 Update dialog parent API, displayer impl and test.
new 8df65b70ed Merge pull request #6216 from
neilcsmith-net/rk-dialog-parent
The 8861 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:
.../core/windows/services/DialogDisplayerImpl.java | 113 -
.../netbeans/core/windows/services/NbDialog.java | 10 +-
.../core/windows/services/NbPresenter.java | 48 -
.../core/windows/services/NodeOperationImpl.java | 8 +-
.../windows/services/DialogDisplayerImplTest.java | 31 +-
...DialogDescriptorTest.java => NbDialogTest.java} | 36 ---
.../core/windows/services/NbPresenterTest.java | 25 -
.../core/windows/services/NotifyLaterTest.java | 2 +-
platform/openide.util.ui/apichanges.xml| 16 +++
.../src/org/openide/util/Utilities.java| 57 +--
10 files changed, 209 insertions(+), 137 deletions(-)
copy
platform/core.windows/test/unit/src/org/netbeans/core/windows/services/{NotifyLaterWithDialogDescriptorTest.java
=> NbDialogTest.java} (59%)
-
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-nbpackage] branch master updated: Provide arch option for macOS launcher, or attempt to parse from runtime filename when present.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git
The following commit(s) were added to refs/heads/master by this push:
new 7fc49b0 Provide arch option for macOS launcher, or attempt to parse
from runtime filename when present.
new 8e0f109 Merge pull request #32 from neilcsmith-net/macos-arch
7fc49b0 is described below
commit 7fc49b0531df8604e08b7e0eda04da6cf7fa914d
Author: Neil C Smith
AuthorDate: Fri Jun 30 17:35:25 2023 +0100
Provide arch option for macOS launcher, or attempt to parse from runtime
filename when present.
---
.../netbeans/nbpackage/macos/AppBundleTask.java| 73 +-
.../org/apache/netbeans/nbpackage/macos/MacOS.java | 8 +++
.../netbeans/nbpackage/macos/PkgPackager.java | 1 +
.../netbeans/nbpackage/macos/Messages.properties | 2 +
.../nbpackage/macos/Package.swift.template | 4 +-
5 files changed, 71 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/netbeans/nbpackage/macos/AppBundleTask.java
b/src/main/java/org/apache/netbeans/nbpackage/macos/AppBundleTask.java
index 560a5b6..ef79f6c 100644
--- a/src/main/java/org/apache/netbeans/nbpackage/macos/AppBundleTask.java
+++ b/src/main/java/org/apache/netbeans/nbpackage/macos/AppBundleTask.java
@@ -26,6 +26,7 @@ import java.nio.file.StandardOpenOption;
import java.text.MessageFormat;
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.netbeans.nbpackage.AbstractPackagerTask;
@@ -44,6 +45,9 @@ class AppBundleTask extends AbstractPackagerTask {
private static final String JAR_BIN_FILENAME = "jarBinaries";
private static final String ENTITLEMENTS_FILENAME = "sandbox.plist";
private static final String LAUNCHER_SRC_DIRNAME = "macos-launcher-src";
+private static final String ARCH_X86_64 = "x86_64";
+private static final String ARCH_ARM64 = "arm64";
+private static final String ARCH_UNIVERSAL = "universal";
private String bundleName;
@@ -55,9 +59,9 @@ class AppBundleTask extends AbstractPackagerTask {
protected void checkPackageRequirements() throws Exception {
String[] cmds;
if (context().getValue(MacOS.CODESIGN_ID).isEmpty()) {
-cmds = new String[] {"swift"};
+cmds = new String[]{"swift"};
} else {
-cmds = new String[] {"swift", "codesign"};
+cmds = new String[]{"swift", "codesign"};
}
validateTools(cmds);
}
@@ -94,7 +98,8 @@ class AppBundleTask extends AbstractPackagerTask {
.findFirst()
.map(path -> path.getFileName().toString())
.orElseThrow();
-Path launcher = compileLauncher(image.resolve(LAUNCHER_SRC_DIRNAME));
+String arch = findArch();
+Path launcher = compileLauncher(image.resolve(LAUNCHER_SRC_DIRNAME),
arch);
Files.copy(launcher, bundle.resolve("Contents")
.resolve("MacOS").resolve(execName),
StandardCopyOption.COPY_ATTRIBUTES);
@@ -172,7 +177,7 @@ class AppBundleTask extends AbstractPackagerTask {
}
private Path findLauncher(Path binDir) throws IOException {
-try ( var files = Files.list(binDir)) {
+try (var files = Files.list(binDir)) {
return files.filter(f ->
!f.getFileName().toString().endsWith(".exe"))
.findFirst().orElseThrow(IOException::new);
}
@@ -226,8 +231,8 @@ class AppBundleTask extends AbstractPackagerTask {
private void setupSigningConfiguration(Path image, Path bundle) throws
IOException {
Files.writeString(image.resolve(ENTITLEMENTS_FILENAME),
-MacOS.ENTITLEMENTS_TEMPLATE.load(context())
-, StandardOpenOption.CREATE_NEW);
+MacOS.ENTITLEMENTS_TEMPLATE.load(context()),
+ StandardOpenOption.CREATE_NEW);
var nativeBinaries = FileUtils.find(bundle,
context().getValue(MacOS.SIGNING_FILES).orElseThrow());
Files.writeString(image.resolve(NATIVE_BIN_FILENAME),
@@ -246,17 +251,55 @@ class AppBundleTask extends AbstractPackagerTask {
StandardOpenOption.CREATE_NEW);
}
-private Path compileLauncher(Path launcherProject) throws IOException,
InterruptedException {
-var pb = new ProcessBuilder("swift", "build",
-"--configuration", "release",
-"--arch", "x86_64");
+private Path compileLauncher(Path launcherProject, String arch) throws
IOException, InterruptedException {
+final Proce
[netbeans] branch master updated (3a61869b00 -> 68be4fcc5d)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 3a61869b00 Merge pull request #6171 from junichi11/php-gh-6119-incorrect-abstract-instantiation-hint new fed49d82a2 Fix FlatEditorTabCellRenderer to not return close button bounds when clipped and not painting it. new 8b712913e3 Fix WinFlatEditorTabCellRenderer to not return close button bounds when clipped and not painting it. new 68be4fcc5d Merge pull request #6164 from neilcsmith-net/flatlaf-tab-close The 8798 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: .../org/netbeans/swing/laf/flatlaf/ui/FlatEditorTabCellRenderer.java| 2 +- .../netbeans/swing/tabcontrol/plaf/WinFlatEditorTabCellRenderer.java| 2 +- 2 files changed, 2 insertions(+), 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 master updated: Update rounding in terminal font metrics to address GH5980.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 8e4287fd29 Update rounding in terminal font metrics to address GH5980.
new ca2d1fd386 Merge pull request #6163 from
neilcsmith-net/terminal-metrics
8e4287fd29 is described below
commit 8e4287fd2913ee8eacb0368e6aacacc74075df5a
Author: Neil C Smith
AuthorDate: Fri Jul 7 11:01:31 2023 +0100
Update rounding in terminal font metrics to address GH5980.
---
.../src/org/netbeans/lib/terminalemulator/MyFontMetrics.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/MyFontMetrics.java
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/MyFontMetrics.java
index 2eececf595..39a66a9c31 100644
---
a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/MyFontMetrics.java
+++
b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/MyFontMetrics.java
@@ -123,7 +123,7 @@ class MyFontMetrics {
public MyFontMetrics(Component component, Font font) {
fm = component.getFontMetrics(font);
-width = fm.charWidth('a');
+width = fm.charWidth('m');
height = fm.getHeight();
ascent = fm.getAscent();
leading = fm.getLeading();
@@ -178,19 +178,21 @@ class MyFontMetrics {
cell_width = 1;
} else {
-// round up pixel width to multiple of cell size
+// round pixel width to multiple of cell size
// then distill into a width in terms of cells.
int mod = pixel_width % width;
int rounded_width = pixel_width;
-if (mod != 0) {
+if (mod > (width / 2)) {
rounded_width = pixel_width + (width - mod);
+} else {
+rounded_width = pixel_width - mod;
}
cell_width = rounded_width / width;
if (cell_width == 0) {
cell_width = 1;
+} else if (cell_width > 1) {
+cwidth_cache.setMultiCell(true);
}
-
-cwidth_cache.setMultiCell(true);
}
cwidth_cache.cache[c] = (byte) cell_width;
-
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 (d29bbb336a -> 325c6d5fee)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from d29bbb336a Merge pull request #6152 from junichi11/revert-fix-import-changes new c426df76ae Add default shortcut (SO-S) for SystemOpenAction. new 2614f55370 Add SystemOpenAction to Editor Tab actions, just after CopyPathToClipboardAction. new f208ee163f Don't include .shadow files as openable by SystemOpenAction. new 325c6d5fee Merge pull request #6159 from neilcsmith-net/gh6043-1 The 8761 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: .../netbeans/core/ui/sysopen/SystemOpenAction.java | 20 1 file changed, 16 insertions(+), 4 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: Switch FlatLaf JTabbedPane tab type to card.
This is an automated email from the ASF dual-hosted git repository. neilcsmith 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 5fd13fcff9 Switch FlatLaf JTabbedPane tab type to card. new 79cc0034d4 Merge pull request #6070 from neilcsmith-net/flat-tab-cards 5fd13fcff9 is described below commit 5fd13fcff9538f27597873a2799c6c8372d7301e Author: Neil C Smith AuthorDate: Mon Jun 12 14:54:30 2023 +0100 Switch FlatLaf JTabbedPane tab type to card. --- .../src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties index fe3ced48fa..e72a2ab534 100644 --- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties +++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties @@ -43,7 +43,8 @@ SplitPaneDivider.style = plain # Windows LAF is 22 pixels tall. TabbedPane.tabHeight=30 TabbedPane.inactiveUnderlineColor = $TabbedContainer.editor.contentBorderColor - +TabbedPane.tabType=card +TabbedPane.tabAreaInsets=4,0,0,0 # Tree - 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-nbpackage] branch master updated: Remove debugging output from Windows launcher.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git
The following commit(s) were added to refs/heads/master by this push:
new 6d3df24 Remove debugging output from Windows launcher.
new bed510e Merge pull request #31 from neilcsmith-net/win-launcher
6d3df24 is described below
commit 6d3df247baed8f39f6f6b014c630f25f35a5711f
Author: Neil C Smith
AuthorDate: Mon Jun 12 13:55:40 2023 +0100
Remove debugging output from Windows launcher.
---
src/assembly/bin/nbpackage.cmd | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/assembly/bin/nbpackage.cmd b/src/assembly/bin/nbpackage.cmd
index d84170e..60508fa 100644
--- a/src/assembly/bin/nbpackage.cmd
+++ b/src/assembly/bin/nbpackage.cmd
@@ -63,9 +63,6 @@ goto repoSetup
:WinNTGetScriptDir
for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
-echo %~dp0
-echo %~dp0..
-echo %BASEDIR%
:repoSetup
set REPO=
-
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
svn commit: r62360 - in /release/netbeans: netbeans-installers/17/ netbeans-vscode-ext/17.0.301/ netbeans-vscode-ext/17.0/ netbeans/17/
Author: neilcsmith Date: Sat Jun 10 14:11:18 2023 New Revision: 62360 Log: Archive Apache NetBeans 17. Removed: release/netbeans/netbeans-installers/17/ release/netbeans/netbeans-vscode-ext/17.0/ release/netbeans/netbeans-vscode-ext/17.0.301/ release/netbeans/netbeans/17/ - 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: Archive Apache NetBeans 17.
This is an automated email from the ASF dual-hosted git repository. neilcsmith 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 8e9ec26d2 Archive Apache NetBeans 17. new e90a885e7 Merge pull request #656 from neilcsmith-net/nb17-archive 8e9ec26d2 is described below commit 8e9ec26d2446721418260fda7d57abddd5ea7b34 Author: Neil C Smith AuthorDate: Sat Jun 10 14:17:22 2023 +0100 Archive Apache NetBeans 17. --- netbeans.apache.org/src/content/download/nb17/index.adoc | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/netbeans.apache.org/src/content/download/nb17/index.adoc b/netbeans.apache.org/src/content/download/nb17/index.adoc index 6583958c1..4ddb2b4a7 100644 --- a/netbeans.apache.org/src/content/download/nb17/index.adoc +++ b/netbeans.apache.org/src/content/download/nb17/index.adoc @@ -37,10 +37,8 @@ for important requirements for download pages for Apache projects. :netbeans-version: 17 // base URLs - when archiving, delete the next 2 lines and uncomment the following 2 -:url-download: https://www.apache.org/dyn/closer.cgi/netbeans/ -:url-download-keychecksum: https://downloads.apache.org/netbeans/ -// :url-download: https://archive.apache.org/dist/netbeans/ -// :url-download-keychecksum: https://archive.apache.org/dist/netbeans/ +:url-download: https://archive.apache.org/dist/netbeans/ +:url-download-keychecksum: https://archive.apache.org/dist/netbeans/ url-download depends of release status archived or not - 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 update-issue-report-form-18 deleted (was 5d139ca9b3)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch update-issue-report-form-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git was 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) 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 delivery deleted (was bf19d75c7d)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git was bf19d75c7d Merge pull request #5939 from mbien/fix-binaries-embedded-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 issues-update-18 deleted (was b00e76948a)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch issues-update-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git was b00e76948a Update issue report template for NB18 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 master updated (4447e51670 -> d6c8b6f88d)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 4447e51670 Merge pull request #6009 from thurka/GCN-2645 add 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) new d6c8b6f88d Merge pull request #6013 from apache/update-issue-report-form-18 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: .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 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] 01/01: Merge pull request #6013 from apache/update-issue-report-form-18
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit d6c8b6f88dfcdf7ad7db6a3b397626753b31b29c Merge: 4447e51670 5d139ca9b3 Author: Neil C Smith AuthorDate: Fri Jun 2 09:06:46 2023 +0100 Merge pull request #6013 from apache/update-issue-report-form-18 Update netbeans_bug_report.yml for NB 18 (part 2!) .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 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] 01/01: Update netbeans_bug_report.yml for NB 18 (part 2!)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch update-issue-report-form-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 5d139ca9b3fe0b73250a63c0f7eab9b9773eb14d Author: Neil C Smith AuthorDate: Fri Jun 2 09:05:10 2023 +0100 Update netbeans_bug_report.yml for NB 18 (part 2!) --- .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml index d352da6a82..dce4d50cd5 100644 --- a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml @@ -64,11 +64,11 @@ body: multiple: false options: - "No / Don't know" +- "Apache NetBeans 17" - "Apache NetBeans 16" - "Apache NetBeans 15" - "Apache NetBeans 14" -- "Apache NetBeans 13" -- "Apache NetBeans 12.6 or earlier" +- "Apache NetBeans 13 or earlier" validations: required: true - type: input - 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 update-issue-report-form-18 created (now 5d139ca9b3)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch update-issue-report-form-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git at 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) This branch includes the following new commits: new 5d139ca9b3 Update netbeans_bug_report.yml for NB 18 (part 2!) 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. - 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 (69e21cd344 -> b23b564698)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 69e21cd344 Update external batik lib from 1.14 to 1.16. As official mentioned 1.15 and 1.16 are just bugfixes. Update external apache xmlgraphics-commons lib as requested. add b00e76948a Update issue report template for NB18 new b23b564698 Merge pull request #6008 from apache/issues-update-18 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: .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 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] 01/01: Merge pull request #6008 from apache/issues-update-18
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit b23b564698909e602163d812357dfd1b990b9bd1 Merge: 69e21cd344 b00e76948a Author: Neil C Smith AuthorDate: Thu Jun 1 16:58:23 2023 +0100 Merge pull request #6008 from apache/issues-update-18 Update issue report template for NB18 .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 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 issues-update-18 created (now b00e76948a)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch issues-update-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git at b00e76948a Update issue report template for NB18 This branch includes the following new commits: new b00e76948a Update issue report template for NB18 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. - 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: Update issue report template for NB18
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch issues-update-18 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit b00e76948ae6eb04e3de156a76d50df96d9a4638 Author: Neil C Smith AuthorDate: Thu Jun 1 10:10:32 2023 +0100 Update issue report template for NB18 Update the issue report form for release of Apache NetBeans 18. Can be merged as soon as the announcement and webpage are done. --- .github/ISSUE_TEMPLATE/netbeans_bug_report.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml index 5a61ea1128..d352da6a82 100644 --- a/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/netbeans_bug_report.yml @@ -27,8 +27,8 @@ body: Latest releases are always available from https://netbeans.apache.org/download/ multiple: false options: -- "Apache NetBeans 17" -- "Apache NetBeans 18 release candidate" +- "Apache NetBeans 18" +#- "Apache NetBeans 19 release candidate" - "Apache NetBeans latest daily build" validations: required: true - 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-nbpackage] branch master updated (2c124bf -> 7110ddd)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git from 2c124bf Merge pull request #26 from apache/dependabot/maven/master/junit.jupiter.version-5.9.3 new f506b32 Update workflow to also test on Windows and macOS, and with JDK 17. new 2fa83e1 Fix #28 - don't use Path to calculate depth of patterns in FileUtil::findDirs new 7110ddd Merge pull request #29 from neilcsmith-net/gh28 The 110 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: .github/workflows/test.yaml | 14 +- .../java/org/apache/netbeans/nbpackage/FileUtils.java | 15 +++ 2 files changed, 20 insertions(+), 9 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 revert-5709-GCN-1720 deleted (was cc41a83d4b)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch revert-5709-GCN-1720 in repository https://gitbox.apache.org/repos/asf/netbeans.git was cc41a83d4b Revert "Use wait node in VSCode for long running computation of children" 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] annotated tag 18 updated (7d33005615 -> 2288d04a46)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 18 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 18 was modified! *** from 7d33005615 (commit) to 2288d04a46 (tag) tagging 7d33005615b3c744564f3d38ab9ef14bf8c3ec44 (commit) replaces 18-rc3 by Neil C Smith on Tue May 30 09:55:07 2023 +0100 - Log - Apache NetBeans 18 --- No new revisions were added by this update. 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
svn commit: r62237 - /dev/netbeans/netbeans-installers/18/ /dev/netbeans/netbeans-vscode-ext/14.0.301/ /dev/netbeans/netbeans-vscode-ext/15.0.0/ /dev/netbeans/netbeans-vscode-ext/15.0.301/ /dev/netbea
Author: neilcsmith Date: Tue May 30 08:53:24 2023 New Revision: 62237 Log: Apache NetBeans 18. Added: release/netbeans/netbeans-installers/18/ - copied from r62236, dev/netbeans/netbeans-installers/18/ release/netbeans/netbeans-vscode-ext/18.0/ - copied from r62236, dev/netbeans/netbeans-vscode-ext/18.0/ release/netbeans/netbeans/18/ - copied from r62236, dev/netbeans/netbeans/18/ Removed: dev/netbeans/netbeans-installers/18/ dev/netbeans/netbeans-vscode-ext/14.0.301/ dev/netbeans/netbeans-vscode-ext/15.0.0/ dev/netbeans/netbeans-vscode-ext/15.0.301/ dev/netbeans/netbeans-vscode-ext/16.0/ dev/netbeans/netbeans-vscode-ext/16.0.301/ dev/netbeans/netbeans-vscode-ext/17.0.301/ dev/netbeans/netbeans-vscode-ext/18.0/ dev/netbeans/netbeans/18/ - 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
svn commit: r62024 - /dev/netbeans/netbeans-installers/18/
Author: neilcsmith Date: Mon May 22 16:57:34 2023 New Revision: 62024 Log: Apache NetBeans 18 Linux installers vote 1. Added: dev/netbeans/netbeans-installers/18/ dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm (with props) dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.asc dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.sha512 dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb (with props) dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.asc dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.sha512 Added: dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm == Binary file - no diff available. Propchange: dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.asc == --- dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.asc (added) +++ dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.asc Mon May 22 16:57:34 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJKBAABCgA0FiEEewN+6+Dw3t/uZbaYNwOsOJoSqdQFAmRrh0UWHG5laWxjc21p +dGhAYXBhY2hlLm9yZwAKCRA3A6w4mhKp1MunEACUUlNnhvfZ/DTPcONVCNRJ1+ta +S7h2SMWHqRxhVsKO/VqLEfae6Rdy94MbxFh1wsbIOscH301rtlkLfxGRJJ2zRq7s +o7KJ0udLRFruxHZUbpEqNVKBtyanQbdOGVFPDu++jo1AC+juPI/OTbE+fgu4tk7c +7rA0cNlyV9zssOOOgQEC1ezqozOmkdVCBE4iykpVl1BZAAxqWSF91dFZK3BQ+AYu +BF9tMrr/RWm6PZPQ0qHA2w49laoWcflJHSG7FnaOcEF+XrtfRRx1LIoNMD9Y58hR +LP5LeqOLYBpUPiBRXSzl/sx1BC5AEvzUbUIiFL87lBnBcUHoqSCLz/knmzUUhzQx +XwZ48cYLxPGIrZTFcOyzZi0v81gXAwadPQGsf6ArRPNlxRAVvpO2ca+39tw4DYX4 +Uq8ROzH9iSBEuXHRQ8npeqmWoEiOJtA1pUyuKi5EP98Gpnx0RfQbCnpgrxikWo+N +LexGfkfNSt7mLCbMMDEPXEi6VlntxhTQdMhdgZrpOnobpfOxLbzKCleJ2QCzILni +N1wycN4PZ90oyN+YnFJe1xX75qSWOGGpC4RGwsRh0CBLc7QXjVwiO/QKnwcVrGDD +GAsKF4LAy9TCV1RSKL7IVSAFslhoQA0FW2FFfuxnwOmo72JMldXIkzZQOrpVRNvm +p2LW7i3cJW7/S63oAA== +=1ooM +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.sha512 == --- dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.sha512 (added) +++ dev/netbeans/netbeans-installers/18/apache-netbeans-18-0.noarch.rpm.sha512 Mon May 22 16:57:34 2023 @@ -0,0 +1 @@ +01c7cd96858c284dbb3c5a5a0d13676228cd056beb83d1243655f5319f11fb84f8f75357625a0b63f6c951e9d24b17ebdfdd477576dfb1b6e02c5fa8ded3c18e apache-netbeans-18-0.noarch.rpm Added: dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb == Binary file - no diff available. Propchange: dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb -- svn:mime-type = application/octet-stream Added: dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.asc == --- dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.asc (added) +++ dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.asc Mon May 22 16:57:34 2023 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- + +iQJKBAABCgA0FiEEewN+6+Dw3t/uZbaYNwOsOJoSqdQFAmRrhyAWHG5laWxjc21p +dGhAYXBhY2hlLm9yZwAKCRA3A6w4mhKp1H4HEACnwBcxZnbEkS8IMx5kwfFOwFJc +rq81FJMwYtzornChz848B+8+JJK47T+O01LBvvkB0jHg+1QCEgUbIR60nk8SihZY +C4104Abd0nn6lEuj/1pFLA5AB229mnxttXdJOwbPyfZBbj+D8GARf5hNJPsk0jir +5mwY0kyXHeQKqwIi1fzfaM0jJQ7TJpURZqj7Lcjk4w/w/r390FcpkaASHw4Vu57p +5ksU4SbakuB7DsOKIWktHGG+zb4xUvR7aGUDZw6en5Jk7W2LhqXymF5p3oY+K59a +FaXY2pAm5O8UMOGxTjD1pBjJ8pShYpxlr9ONCYavPSopmTqAscMURyRF3T1ffpiD +Vb9IPr2e9UhyUykrLVO2E0I3COrIqSVJmucxauzIA+jt47vIhnUvSG+yvwcxiDE6 +tQMzDWypMD9IRsYLSK7U7PhXbllGnQVQacCQT4rYW1ugiQ7LHpFAIwJCwENAhXX/ +bV78xCWQUL+9mPK/beFJkfVDmhrnC/DuChDURif73h3/huNeqEm7bFhyPkX1ekL+ +sAyFsG9sLSloJZmiRs1SwXkYgr47nogIXKFajZEuXu9BLe8xv2oxoXZKTD3TFEre +nbTu6VloNjPdS3yqmifOKXOextgU9nT4VIaUsai+GJNrAS6W+Xb9Sd6ojxdBY2jP +1Z5xJHwpkCPnLWAFYA== +=Z/bV +-END PGP SIGNATURE- Added: dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.sha512 == --- dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.sha512 (added) +++ dev/netbeans/netbeans-installers/18/apache-netbeans_18-1_all.deb.sha512 Mon May 22 16:57:34 2023 @@ -0,0 +1 @@ +c705d92f53a46d4a089d62766722acfe354f4ad30a33cbbd41a6d710cf688af72ef2d5f216fe91f02090de519aea9fe3d704d6e113c247379cd1d5875f0690a5 apache-netbeans_18-1_all.deb
svn commit: r62023 - in /dev/netbeans/netbeans/18: ./ nbms/ nbms/apisupport/ nbms/cpplite/ nbms/enterprise/ nbms/ergonomics/ nbms/extide/ nbms/extra/ nbms/groovy/ nbms/harness/ nbms/ide/ nbms/java/ nb
Author: neilcsmith Date: Mon May 22 15:11:28 2023 New Revision: 62023 Log: Apache NetBeans 18 vote 1. [This commit notification would consist of 395 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - 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 (3354718cab -> 011da77cdf)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from 3354718cab VSCode: Stacktraces in test exceptions should be clickable. (#5938) add 2c3ee44f23 fix wrong maven dependencies in binariesembedded-list. add bf19d75c7d Merge pull request #5939 from mbien/fix-binaries-embedded-version new 011da77cdf Merge pull request #5945 from apache/delivery 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: java/maven.embedder/external/binariesembedded-list| 10 +- .../org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java | 11 +++ 2 files changed, 12 insertions(+), 9 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] 01/01: Merge pull request #5945 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 011da77cdfdd20be6c0f42f8945ab5e6deac0475 Merge: 3354718cab bf19d75c7d Author: Neil C Smith AuthorDate: Mon May 15 15:05:36 2023 +0100 Merge pull request #5945 from apache/delivery Sync delivery to master after 18-rc4 java/maven.embedder/external/binariesembedded-list| 10 +- .../org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java | 11 +++ 2 files changed, 12 insertions(+), 9 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] annotated tag 18-rc4 updated (7d33005615 -> 42d4ec9f50)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 18-rc4 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 18-rc4 was modified! *** from 7d33005615 (commit) to 42d4ec9f50 (tag) tagging 7d33005615b3c744564f3d38ab9ef14bf8c3ec44 (commit) replaces 18-rc3 by Neil C Smith on Mon May 15 14:53:23 2023 +0100 - Log - Apache NetBeans 18-rc4 --- No new revisions were added by this update. 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-jenkins-lib] branch master updated: Add metadata for 18-rc4.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new 7b6a2d4 Add metadata for 18-rc4.
new 74aea3a Merge pull request #92 from neilcsmith-net/nb180
7b6a2d4 is described below
commit 7b6a2d493ca29d8e3679bb6d459c0e84c7146b14
Author: Neil C Smith
AuthorDate: Mon May 15 09:29:59 2023 +0100
Add metadata for 18-rc4.
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index 28df0f7..a95bb00 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1021,6 +1021,10 @@
"c7b709c5c7eae44877c08c876b7dc2ba59e153fe": {
"version": "rc3",
"position": "3"
+},
+"7d33005615b3c744564f3d38ab9ef14bf8c3ec44": {
+"version": "rc4",
+"position": "4"
}
},
"releasedate": {
-
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: Merge pull request #5944 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release180 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit 7d33005615b3c744564f3d38ab9ef14bf8c3ec44 Merge: c7b709c5c7 bf19d75c7d Author: Neil C Smith AuthorDate: Mon May 15 09:23:24 2023 +0100 Merge pull request #5944 from apache/delivery Sync delivery to release180 for 18-rc4 java/maven.embedder/external/binariesembedded-list| 10 +- .../org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java | 11 +++ 2 files changed, 12 insertions(+), 9 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 release180 updated (c7b709c5c7 -> 7d33005615)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release180 in repository https://gitbox.apache.org/repos/asf/netbeans.git from c7b709c5c7 Merge pull request #5907 from apache/delivery add 2c3ee44f23 fix wrong maven dependencies in binariesembedded-list. add bf19d75c7d Merge pull request #5939 from mbien/fix-binaries-embedded-version new 7d33005615 Merge pull request #5944 from apache/delivery 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: java/maven.embedder/external/binariesembedded-list| 10 +- .../org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java | 11 +++ 2 files changed, 12 insertions(+), 9 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 delivery updated: fix wrong maven dependencies in binariesembedded-list.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 2c3ee44f23 fix wrong maven dependencies in binariesembedded-list.
new bf19d75c7d Merge pull request #5939 from
mbien/fix-binaries-embedded-version
2c3ee44f23 is described below
commit 2c3ee44f23c9fa7b5fa5b218f9ba94cde585ad0c
Author: Michael Bien
AuthorDate: Fri May 12 11:10:16 2023 +0200
fix wrong maven dependencies in binariesembedded-list.
update ant task a bit.
Co-authored-by: Neil C Smith
---
java/maven.embedder/external/binariesembedded-list| 10 +-
.../org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java | 11 +++
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/java/maven.embedder/external/binariesembedded-list
b/java/maven.embedder/external/binariesembedded-list
index 3f7283b549..1f6d2852a2 100644
--- a/java/maven.embedder/external/binariesembedded-list
+++ b/java/maven.embedder/external/binariesembedded-list
@@ -15,19 +15,19 @@
# specific language governing permissions and limitations
# under the License.
-0235BA8B489512805AC13A8F9EA77A1CA5EBE3E8;org.aopalliance:aopalliance:1.0
+0235BA8B489512805AC13A8F9EA77A1CA5EBE3E8;aopalliance:aopalliance:1.0
1194890E6F56EC29177673F2F12D0B8E627DEC98;org.apache.httpcomponents:httpclient:4.5.14
-7F2E0C573EAA7A74BAC2E89B359E1F73D92A0A1D;org.apache.httpcomponents:httpcore:4.5.15
+7F2E0C573EAA7A74BAC2E89B359E1F73D92A0A1D;org.apache.httpcomponents:httpcore:4.4.15
1DCF1DE382A0BF95A3D8B0849546C88BAC1292C9;com.google.guava:failureaccess:1.0.1
C51C00206BB913CD8612B24ABD9FA98AE89719B1;commons-cli:commons-cli:1.4
-3ACB4705652E16236558F0F4F2192CC33C3BD189;org.apache.commons:commons-codec:1.11
+3ACB4705652E16236558F0F4F2192CC33C3BD189;commons-codec:commons-codec:1.11
6505A72A097D9270F7A9E7BF42C4238283247755;org.apache.commons:commons-lang3:3.8.1
00D0C3CE2311C9E36E73228DA25A6E99B2AB826F;com.google.guava:guava:30.1-jre
DA25056C694C54BA16E78E4FC35F17FC60F0D1B4;com.google.inject:guice:5.1.0
321C614F85F1DEA6BB08C1817C60D53B7F3552FD;org.fusesource.jansi:jansi:2.4.0
6975DA39A7040257BD51D21A231B76C915872D38;javax.inject:javax.inject:1
D877E195A05ACA4A2F1AD2FF14BFEC1393AF4B5E;org.slf4j:jcl-over-slf4j:1.7.36
-934C04D3CFEF185A8008E7BF34331B79730A9D43;javax.annotation:javax.annotation.api:1.3.2
+934C04D3CFEF185A8008E7BF34331B79730A9D43;javax.annotation:javax.annotation-api:1.3.2
09F8307F12F2E65066DCC4122D92126F46A6EA40;org.apache.maven:maven-artifact:3.9.1
C473898FB22699AA713FFA2C9192F911E281FF9D;org.apache.maven:maven-builder-support:3.9.1
1F9608E1146F5239DCE9068263B2D6C6D584D0BD;org.apache.maven:maven-compat:3.9.1
@@ -41,7 +41,7 @@
C44B96287CFAEC6049349C4E9A549389CC5D39AF;org.apache.maven:maven-plugin-api:3.9.1
3F1523254B400F89E290C3274C4458BA111E6D57;org.apache.maven.resolver:maven-resolver-connector-basic:1.9.7
56F6BABFB1FA6D34849E834433B572FB743E7F4D;org.apache.maven.resolver:maven-resolver-impl:1.9.7
8F6C65FF4C677E45B0907BBA3CEC3449D21135FF;org.apache.maven.resolver:maven-resolver-named-locks:1.9.7
-52247F9AD0371371A4ACA00E4AC10602E876846B;org.apache.maven:resolver:maven-resolver-provider:3.9.1
+52247F9AD0371371A4ACA00E4AC10602E876846B;org.apache.maven:maven-resolver-provider:3.9.1
5E273840DAF376DC188C0F71D027DF400DE215C2;org.apache.maven.resolver:maven-resolver-spi:1.9.7
6690B4934DE8D3A448CC5649776C2B326A10F614;org.apache.maven.resolver:maven-resolver-transport-http:1.9.7
BCCD6C18A08EFCDBF662DCE7A0FABCF0F0D2A694;org.apache.maven.resolver:maven-resolver-transport-wagon:1.9.7
diff --git
a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
index dad1b2bb27..a936b7a46e 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/CheckEmbeddedBinaries.java
@@ -87,7 +87,7 @@ public class CheckEmbeddedBinaries extends Task {
if (MavenCoordinate.isMavenFile(hashAndFile[1])) {
MavenCoordinate mc =
MavenCoordinate.fromGradleFormat(hashAndFile[1]);
-shamap.put(hashAndFile[0], hashAndFile[1]);
+shamap.put(hashAndFile[0], mc.toArtifactFilename());
} else {
throw new BuildException("Invalid manifest entry
should be Maven coordinate", getLocation());
}
@@ -101,9 +101,12 @@ public class CheckEmbeddedBinaries extends Task {
StringBuilder errorList = new StringBuilder();
list.forEach((t) -> {
String sha1 = hash(t.toFile());
-if (!shamap.containsKey(sha1)) {
-errorList.append("
[netbeans] branch master updated (a39124cc3e -> fef19b00a6)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git from a39124cc3e Merge pull request #5925 from pepness/glassfish-7.0.4 add d1fef512b8 Add metabuild json link via netbeans.apache.org add cfc7e62395 Merge pull request #5906 from neilcsmith-net/metabuild-redirect add e188e685e0 Fix kotlin source/target version. add 2470c07ccc Merge pull request #5899 from sdedic/gradle/kotlinCompilerFix add 15811ec850 Allow java and (system) package dependencies for eager modules. Provider autoloads with failed dependencies have problems reported. add c78397b737 Treat failed assumeXXX as test success in JUnit3-style tests. add 8de4a28cd0 Mask out Polyglot, JS and Truffle from JDK. Construct a special "dependent" classloader to allow ServiceLoader to find implementations add 592d7bfde3 New module that bridges GraalVM JDK implementations to ScriptEngineManager. add e406bae7fd Tests adjusted to work under GraalVM and OpenJDK add b51686e706 Merge pull request #5842 from sdedic/graal/graaljs-priority-fix add 9bc4c8db44 Fix running and debugging single integration test (GH4513) add 59d48b8d54 Merge pull request #5911 from neilcsmith-net/gh4513 add 7b755b85e3 Fix unit test on single file being reported as integration test in some cases (GH4587) add 52cb43c8c2 Merge pull request #5912 from neilcsmith-net/gh4587 add 6a58e3405b add gradle JDK compatibility notice to readme build section. add 2eb417e791 Merge pull request #5913 from mbien/update-readme_delivery add 0a5b2ae044 Support assume in setUp too to bypass everything add 630d06367e Execute tests in module suite; added assume preconditions. add 5c81e4e62e Set context classloader before calling Polyglot to bylass module CL add c9cebf5673 Merge pull request #5924 from sdedic/graal/libs-classloader-fix add 23ea44704d Do not attempt to remove unused binding variables for now. add 42c5790ae6 Merge pull request #5902 from jlahoda/unused-binding-1 add 5ce63e97a4 bump delete-action git submodule to v2 to be node 16 compatible. add cf168c1bfd Merge pull request #5927 from mbien/ci-update-delete-action add 4dbdb209e7 lower the OS level memory consumption of NBLSP add fbdd7993a3 Merge pull request #5914 from thurka/GCN-2138-18 add fef19b00a6 Merge pull request #5908 from apache/delivery No new revisions were added by this update. Summary of changes: .github/actions/delete-artifact| 2 +- .github/workflows/main.yml | 1 - .gitignore | 14 +- README.md | 4 +- .../gradle/tooling/NbProjectInfoBuilder.java | 35 +- .../nbjunit/src/org/netbeans/junit/NbTestCase.java | 11 +- .../apichanges.xml | 0 .../arch.xml | 0 ide/libs.graalsdk.system/build.xml | 25 ++ .../external/binaries-list | 0 .../external/graal-sdk-20.3.0-license.txt | 0 ide/libs.graalsdk.system/manifest.mf | 7 + .../nbproject/org-netbeans-libs-graalsdk.sig | 0 .../nbproject/project.properties | 23 ++ .../nbproject/project.xml | 30 +- .../libs/graalsdk/system/Bundle.properties | 18 + .../libs/graalsdk/system}/GraalContext.java| 47 ++- .../netbeans/libs/graalsdk/system/GraalEngine.java | 206 ++ .../libs/graalsdk/system/GraalEngineFactory.java | 113 ++ .../system/GraalSystemEnginesProvider.java}| 23 +- .../netbeans/libs/graalsdk/system/LangContext.java | 152 +++ .../libs/graalsdk/system/WriterOutputStream.java | 131 ++ .../libs/graalsdk/system/GraalEnginesTest.java | 51 +++ .../libs/graalsdk/system/GraalEnginesTest2.java} | 122 -- .../src/org/netbeans/libs/graalsdk/system/Sum.java | 23 +- ide/libs.graalsdk/manifest.mf | 2 + ide/libs.graalsdk/nbproject/project.xml| 16 + .../netbeans/libs/graalsdk/impl/GraalContext.java | 30 +- .../libs/graalsdk/impl/GraalEnginesProvider.java | 110 - .../libs/graalsdk/JavaScriptEnginesTest.java | 447 + ...nginesTest.java => JavaScriptEnginesTest2.java} | 51 ++- .../netbeans/libs/graalsdk/ScriptingTutorial.java | 10 + .../libs/graalsdk/ScriptingTutorialTest.java | 7 +- .../libs/graalsdk/impl/GraalContextTest.java | 49 +++ .../GraalContextTest2.java}| 14 +- .../libs/graalsdk/impl/GraalEnginesTest.java | 47 +++ .../GraalEnginesTest2.java}| 56 +-- .../src/org/netbeans/libs/graalsdk/impl/Sum.java | 23 +- ide/libs.truffleapi/manifest.mf
[netbeans-website] branch master updated: Update .htaccess plugins redirect for NB18
This is an automated email from the ASF dual-hosted git repository. neilcsmith 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 1831c143f Update .htaccess plugins redirect for NB18 1831c143f is described below commit 1831c143fe13db7563c17025ddd0b4dbfb2e7712 Author: Neil C Smith AuthorDate: Wed May 10 10:19:08 2023 +0100 Update .htaccess plugins redirect for NB18 --- netbeans.apache.org/src/content/.htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbeans.apache.org/src/content/.htaccess b/netbeans.apache.org/src/content/.htaccess index 0b129edba..3e97d2aa4 100644 --- a/netbeans.apache.org/src/content/.htaccess +++ b/netbeans.apache.org/src/content/.htaccess @@ -38,9 +38,9 @@ Redirect 302 /nb/plugins/16/ https://plugins.netbeans.apache.org/data/16/ Redirect 302 /nb/updates/17/ https://netbeans-vm1.apache.org/uc/17/ Redirect 302 /nb/plugins/17/ https://plugins.netbeans.apache.org/data/17/ Redirect 302 /nb/updates/18/ https://netbeans-vm1.apache.org/uc/18/ -Redirect 302 /nb/plugins/18/ https://plugins.netbeans.apache.org/data/17/ +Redirect 302 /nb/plugins/18/ https://plugins.netbeans.apache.org/data/18/ Redirect 302 /nb/updates/dev/ https://netbeans-vm1.apache.org/uc/dev/ -Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/17/ +Redirect 302 /nb/plugins/dev/ https://plugins.netbeans.apache.org/data/18/ 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 - 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] annotated tag 18-rc3 updated (c7b709c5c7 -> 03a7858988)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to annotated tag 18-rc3 in repository https://gitbox.apache.org/repos/asf/netbeans.git *** WARNING: tag 18-rc3 was modified! *** from c7b709c5c7 (commit) to 03a7858988 (tag) tagging c7b709c5c7eae44877c08c876b7dc2ba59e153fe (commit) replaces 18-rc2 by Neil C Smith on Wed May 10 09:25:09 2023 +0100 - Log - Apache NetBeans 18-rc3 --- No new revisions were added by this update. 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-nbpackage] 01/01: Merge pull request #26 from apache/dependabot/maven/master/junit.jupiter.version-5.9.3
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git commit 2c124bf2be048210ee161fb8c56310e963406b80 Merge: 75374c6 141f292 Author: Neil C Smith AuthorDate: Tue May 9 17:03:50 2023 +0100 Merge pull request #26 from apache/dependabot/maven/master/junit.jupiter.version-5.9.3 Bump junit.jupiter.version from 5.9.2 to 5.9.3 pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-nbpackage] branch master updated (75374c6 -> 2c124bf)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git from 75374c6 Merge pull request #25 from apache/dependabot/maven/master/info.picocli-picocli-4.7.3 add 141f292 Bump junit.jupiter.version from 5.9.2 to 5.9.3 new 2c124bf Merge pull request #26 from apache/dependabot/maven/master/junit.jupiter.version-5.9.3 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-nbpackage] branch master updated (62ffb8f -> 75374c6)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/netbeans-nbpackage.git from 62ffb8f Merge pull request #23 from neilcsmith-net/fix-stackoverflow add 2d59694 Bump picocli from 4.7.1 to 4.7.3 add 75374c6 Merge pull request #25 from apache/dependabot/maven/master/info.picocli-picocli-4.7.3 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - 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-jenkins-lib] branch master updated: Add metadata for 18-rc3.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-jenkins-lib.git
The following commit(s) were added to refs/heads/master by this push:
new e26c41c Add metadata for 18-rc3.
new b5ae0a2 Merge pull request #91 from neilcsmith-net/nb180
e26c41c is described below
commit e26c41c29d64ef1db21256871de2eb49f814ac84
Author: Neil C Smith
AuthorDate: Tue May 9 16:17:00 2023 +0100
Add metadata for 18-rc3.
---
meta/netbeansrelease.json | 4
1 file changed, 4 insertions(+)
diff --git a/meta/netbeansrelease.json b/meta/netbeansrelease.json
index a8c1b5f..28df0f7 100644
--- a/meta/netbeansrelease.json
+++ b/meta/netbeansrelease.json
@@ -1017,6 +1017,10 @@
"50323577f0f05669590725c1523e68b5f0f7a27c": {
"version": "rc2",
"position": "2"
+},
+"c7b709c5c7eae44877c08c876b7dc2ba59e153fe": {
+"version": "rc3",
+"position": "3"
}
},
"releasedate": {
-
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 release180 updated (cfc6e5b509 -> c7b709c5c7)
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a change to branch release180 in repository https://gitbox.apache.org/repos/asf/netbeans.git from cfc6e5b509 Merge pull request #5903 from apache/delivery add d1fef512b8 Add metabuild json link via netbeans.apache.org add cfc7e62395 Merge pull request #5906 from neilcsmith-net/metabuild-redirect add e188e685e0 Fix kotlin source/target version. add 2470c07ccc Merge pull request #5899 from sdedic/gradle/kotlinCompilerFix add 15811ec850 Allow java and (system) package dependencies for eager modules. Provider autoloads with failed dependencies have problems reported. add c78397b737 Treat failed assumeXXX as test success in JUnit3-style tests. add 8de4a28cd0 Mask out Polyglot, JS and Truffle from JDK. Construct a special "dependent" classloader to allow ServiceLoader to find implementations add 592d7bfde3 New module that bridges GraalVM JDK implementations to ScriptEngineManager. add e406bae7fd Tests adjusted to work under GraalVM and OpenJDK add b51686e706 Merge pull request #5842 from sdedic/graal/graaljs-priority-fix add 9bc4c8db44 Fix running and debugging single integration test (GH4513) add 59d48b8d54 Merge pull request #5911 from neilcsmith-net/gh4513 add 7b755b85e3 Fix unit test on single file being reported as integration test in some cases (GH4587) add 52cb43c8c2 Merge pull request #5912 from neilcsmith-net/gh4587 add 6a58e3405b add gradle JDK compatibility notice to readme build section. add 2eb417e791 Merge pull request #5913 from mbien/update-readme_delivery add 0a5b2ae044 Support assume in setUp too to bypass everything add 630d06367e Execute tests in module suite; added assume preconditions. add 5c81e4e62e Set context classloader before calling Polyglot to bylass module CL add c9cebf5673 Merge pull request #5924 from sdedic/graal/libs-classloader-fix add 23ea44704d Do not attempt to remove unused binding variables for now. add 42c5790ae6 Merge pull request #5902 from jlahoda/unused-binding-1 add 5ce63e97a4 bump delete-action git submodule to v2 to be node 16 compatible. add cf168c1bfd Merge pull request #5927 from mbien/ci-update-delete-action add 4dbdb209e7 lower the OS level memory consumption of NBLSP add fbdd7993a3 Merge pull request #5914 from thurka/GCN-2138-18 new c7b709c5c7 Merge pull request #5907 from apache/delivery 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: .github/actions/delete-artifact| 2 +- .github/workflows/main.yml | 1 - .gitignore | 14 +- README.md | 4 +- .../gradle/tooling/NbProjectInfoBuilder.java | 35 +- .../nbjunit/src/org/netbeans/junit/NbTestCase.java | 11 +- .../apichanges.xml | 0 .../arch.xml | 0 ide/libs.graalsdk.system/build.xml | 25 ++ .../external/binaries-list | 0 .../external/graal-sdk-20.3.0-license.txt | 0 ide/libs.graalsdk.system/manifest.mf | 7 + .../nbproject/org-netbeans-libs-graalsdk.sig | 0 .../nbproject/project.properties | 23 ++ .../nbproject/project.xml | 30 +- .../libs/graalsdk/system/Bundle.properties | 18 + .../libs/graalsdk/system}/GraalContext.java| 47 ++- .../netbeans/libs/graalsdk/system/GraalEngine.java | 206 ++ .../libs/graalsdk/system/GraalEngineFactory.java | 113 ++ .../system/GraalSystemEnginesProvider.java}| 23 +- .../netbeans/libs/graalsdk/system/LangContext.java | 152 +++ .../libs/graalsdk/system/WriterOutputStream.java | 131 ++ .../libs/graalsdk/system/GraalEnginesTest.java | 51 +++ .../libs/graalsdk/system/GraalEnginesTest2.java} | 122 -- .../src/org/netbeans/libs/graalsdk/system/Sum.java | 23 +- ide/libs.graalsdk/manifest.mf | 2 + ide/libs.graalsdk/nbproject/project.xml| 16 + .../netbeans/libs/graalsdk/impl/GraalContext.java | 30 +- .../libs/graalsdk/impl/GraalEnginesProvider.java | 110 - .../libs/graalsdk/JavaScriptEnginesTest.java | 447 + ...nginesTest.java => JavaScriptEnginesTest2.java} | 51 ++- .../netbeans/libs/graalsdk/ScriptingTutorial.java | 10 + .../libs/graalsdk/ScriptingTutorialTest.java | 7 +- .../libs/graalsdk/impl/GraalContextTest.java | 49 +++ .../GraalContextTest2.java}| 14 +- .../libs/graalsdk/impl/
[netbeans] 01/01: Merge pull request #5907 from apache/delivery
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch release180 in repository https://gitbox.apache.org/repos/asf/netbeans.git commit c7b709c5c7eae44877c08c876b7dc2ba59e153fe Merge: cfc6e5b509 fbdd7993a3 Author: Neil C Smith AuthorDate: Tue May 9 16:11:29 2023 +0100 Merge pull request #5907 from apache/delivery Sync delivery to release180 for 18-rc3 .github/actions/delete-artifact|2 +- .github/workflows/main.yml |1 - .gitignore | 14 +- README.md |4 +- .../gradle/tooling/NbProjectInfoBuilder.java | 35 +- .../nbjunit/src/org/netbeans/junit/NbTestCase.java | 11 +- ide/libs.graalsdk.system/apichanges.xml| 87 ++ ide/libs.graalsdk.system/arch.xml | 1163 +++ ide/libs.graalsdk.system/build.xml | 25 + ide/libs.graalsdk.system/external/binaries-list| 18 + .../external/graal-sdk-20.3.0-license.txt | 25 + ide/libs.graalsdk.system/manifest.mf |7 + .../nbproject/org-netbeans-libs-graalsdk.sig | 1524 .../nbproject/project.properties | 23 + .../nbproject/project.xml | 30 +- .../libs/graalsdk/system/Bundle.properties | 18 + .../libs/graalsdk/system}/GraalContext.java| 47 +- .../netbeans/libs/graalsdk/system/GraalEngine.java | 206 +++ .../libs/graalsdk/system/GraalEngineFactory.java | 113 ++ .../system/GraalSystemEnginesProvider.java}| 23 +- .../netbeans/libs/graalsdk/system/LangContext.java | 152 ++ .../libs/graalsdk/system/WriterOutputStream.java | 131 ++ .../libs/graalsdk/system/GraalEnginesTest.java | 51 + .../libs/graalsdk/system/GraalEnginesTest2.java} | 122 +- .../src/org/netbeans/libs/graalsdk/system/Sum.java | 23 +- ide/libs.graalsdk/manifest.mf |2 + ide/libs.graalsdk/nbproject/project.xml| 16 + .../netbeans/libs/graalsdk/impl/GraalContext.java | 30 +- .../libs/graalsdk/impl/GraalEnginesProvider.java | 110 +- .../libs/graalsdk/JavaScriptEnginesTest.java | 447 +- ...nginesTest.java => JavaScriptEnginesTest2.java} | 51 +- .../netbeans/libs/graalsdk/ScriptingTutorial.java | 10 + .../libs/graalsdk/ScriptingTutorialTest.java |7 +- .../libs/graalsdk/impl/GraalContextTest.java | 49 + .../GraalContextTest2.java}| 14 +- .../libs/graalsdk/impl/GraalEnginesTest.java | 47 + .../GraalEnginesTest2.java}| 56 +- .../src/org/netbeans/libs/graalsdk/impl/Sum.java | 23 +- ide/libs.truffleapi/manifest.mf|2 + .../netbeans/modules/java/hints/bugs/Unused.java |5 +- .../modules/java/hints/bugs/UnusedTest.java| 15 + java/java.lsp.server/script/etc/nbcode.conf|2 +- .../maven/execute/DefaultReplaceTokenProvider.java | 11 +- .../maven/execute/defaultActionMappings.xml|2 + .../execute/DefaultReplaceTokenProviderTest.java | 26 + .../org/netbeans/nbbuild/extlibs/ignored-overlaps |4 + nbbuild/build.xml |2 +- nbbuild/cluster.properties |1 + platform/api.scripting/nbproject/project.xml |5 + .../src/org/netbeans/api/scripting/Scripting.java |3 + .../api/scripting/ScriptingTutorialTest.java |3 +- .../netbeans/core/startup/ConsistencyVerifier.java |2 + platform/libs.junit4/nbproject/project.xml |1 + .../src/org/netbeans/ModuleManager.java| 49 +- .../src/org/netbeans/ProxyClassLoader.java | 20 +- webcommon/libs.graaljs/manifest.mf |2 + webcommon/libs.graaljs/nbproject/project.xml |4 + .../src/org/netbeans/libs/graaljs/GraalJSTest.java | 117 +- .../org/netbeans/libs/graaljs/GraalJSTest2.java| 206 +++ 59 files changed, 4497 insertions(+), 702 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 delivery updated: lower the OS level memory consumption of NBLSP
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 4dbdb209e7 lower the OS level memory consumption of NBLSP
new fbdd7993a3 Merge pull request #5914 from thurka/GCN-2138-18
4dbdb209e7 is described below
commit 4dbdb209e7c533cdda5e21f08b42be54303e2f9c
Author: Tomas Hurka
AuthorDate: Tue May 2 13:29:33 2023 +0200
lower the OS level memory consumption of NBLSP
(cherry picked from commit 879061efcae9c68081feae717c0517c975057237)
---
java/java.lsp.server/script/etc/nbcode.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/java.lsp.server/script/etc/nbcode.conf
b/java/java.lsp.server/script/etc/nbcode.conf
index 899da0d941..879725aa40 100644
--- a/java/java.lsp.server/script/etc/nbcode.conf
+++ b/java/java.lsp.server/script/etc/nbcode.conf
@@ -58,7 +58,7 @@ default_cachedir="${DEFAULT_CACHEDIR_ROOT}/dev"
# options used by the launcher by default, can be overridden by explicit
# command line switches
-default_options="--nogui --nosplash --branding nbcode
-J-Djava.awt.headless=true -J--add-opens=java.base/java.net=ALL-UNNAMED
-J--add-opens=java.base/java.lang.ref=ALL-UNNAMED
-J--add-opens=java.base/java.lang=ALL-UNNAMED
-J--add-opens=java.base/java.security=ALL-UNNAMED
-J--add-opens=java.base/java.util=ALL-UNNAMED
-J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
-J--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED
-J--add-opens=java.desktop/javax.swing=ALL-UNNAMED -J--a [...]
+default_options="--nogui --nosplash --branding nbcode -J-Xmx1G
-J-XX:+UseParallelGC -J-XX:GCTimeRatio=4 -J-XX:AdaptiveSizePolicyWeight=90
-J-Djava.awt.headless=true -J--add-opens=java.base/java.net=ALL-UNNAMED
-J--add-opens=java.base/java.lang.ref=ALL-UNNAMED
-J--add-opens=java.base/java.lang=ALL-UNNAMED
-J--add-opens=java.base/java.security=ALL-UNNAMED
-J--add-opens=java.base/java.util=ALL-UNNAMED
-J--add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED
-J--add-opens=java.desktop/j [...]
# for development purposes you may wish to append:
-J-Dnetbeans.logger.console=true -J-ea
-
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 delivery updated: bump delete-action git submodule to v2 to be node 16 compatible.
This is an automated email from the ASF dual-hosted git repository. neilcsmith pushed a commit to branch delivery in repository https://gitbox.apache.org/repos/asf/netbeans.git The following commit(s) were added to refs/heads/delivery by this push: new 5ce63e97a4 bump delete-action git submodule to v2 to be node 16 compatible. new cf168c1bfd Merge pull request #5927 from mbien/ci-update-delete-action 5ce63e97a4 is described below commit 5ce63e97a46c751c3d10a9f7a91a2b684d063632 Author: Michael Bien AuthorDate: Thu Feb 9 04:00:15 2023 +0100 bump delete-action git submodule to v2 to be node 16 compatible. + updated git ignore to ignore all private folders by default --- .github/actions/delete-artifact | 2 +- .gitignore | 14 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/actions/delete-artifact b/.github/actions/delete-artifact index 56e063d7d8..54ab544f12 16 --- a/.github/actions/delete-artifact +++ b/.github/actions/delete-artifact @@ -1 +1 @@ -Subproject commit 56e063d7d8bf9972ac54aca4454d3a6675917f44 +Subproject commit 54ab544f12cdb7b71613a16a2b5a37a9ade990af diff --git a/.gitignore b/.gitignore index 7eeb90f2a5..947a17a673 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,7 @@ /*/build/ -/*/nbproject/private/ -/*/*/nbproject/private/ +**/nbproject/private/ /*/*/build/ /*/*/dist/ -/*/*/*/nbproject/private/ /*/*/*/build/ /*/*/*/dist/ /*/external/*.zip @@ -35,7 +33,6 @@ /nbbuild/netbeansrelease.json /nbi/engine/native/*/*/dist/ /nb-javac/ -/java.source.nbjavac/test/test-nb-javac/nbproject/private/ /java/java.lsp.server/vscode/.vscode-test/ /harness/apisupport.harness/windows-launcher-src/*.exe /harness/apisupport.harness/windows-launcher-src/*.res @@ -49,13 +46,10 @@ # Various files that may be generated if the launcher projects are opened in NetBeans 8.2. /harness/apisupport.harness/windows-launcher-src/nbproject/Makefile-*.mk /harness/apisupport.harness/windows-launcher-src/nbproject/Package-*.bash -/harness/apisupport.harness/windows-launcher-src/nbproject/private/ /nb/ide.launcher/windows/nbproject/Makefile-*.mk /nb/ide.launcher/windows/nbproject/Package-*.bash -/nb/ide.launcher/windows/nbproject/private/ /platform/o.n.bootstrap/launcher/windows/nbproject/Makefile-*.mk /platform/o.n.bootstrap/launcher/windows/nbproject/Package-*.bash -/platform/o.n.bootstrap/launcher/windows/nbproject/private/ # Database logs derby.log @@ -78,16 +72,10 @@ derby.log /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/jaxb/ /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/oauth/ /websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/ -/javafx2.samples/FXML-LoginDemo/nbproject/private/ # OS generated files - test related # # -/debugger.jpda.ui/test/qa-functional/data/debugTestProject/nbproject/private/ -/debugger.jpda.ui/test/qa-functional/data/debugTestProjectAnt/nbproject/private/ /platform/o.n.bootstrap/test/unit/data/jars -/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/ -/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/ -/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/ # Snapcraft Generated files # ### - 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 delivery updated: Do not attempt to remove unused binding variables for now.
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 23ea44704d Do not attempt to remove unused binding variables for now.
new 42c5790ae6 Merge pull request #5902 from jlahoda/unused-binding-1
23ea44704d is described below
commit 23ea44704d3af52e060e14511510b795de2b1203
Author: Jan Lahoda
AuthorDate: Sun Apr 30 08:14:49 2023 +0200
Do not attempt to remove unused binding variables for now.
---
.../src/org/netbeans/modules/java/hints/bugs/Unused.java | 5 -
.../org/netbeans/modules/java/hints/bugs/UnusedTest.java | 15 +++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unused.java
b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unused.java
index 23ac810033..207bbf4e54 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unused.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/bugs/Unused.java
@@ -87,7 +87,10 @@ public class Unused {
case NOT_WRITTEN: message = Bundle.ERR_NotWritten(name);
break;
case NOT_READ: message = Bundle.ERR_NotRead(name);
-fix = JavaFixUtilities.safelyRemoveFromParent(ctx,
Bundle.FIX_RemoveUsedElement(name), ud.unusedElementPath);
+//unclear what can be done with unused binding variables
currently (before "_"):
+if (ud.unusedElementPath.getParentPath().getLeaf().getKind()
!= Kind.BINDING_PATTERN) {
+fix = JavaFixUtilities.safelyRemoveFromParent(ctx,
Bundle.FIX_RemoveUsedElement(name), ud.unusedElementPath);
+}
break;
case NOT_USED:
if (ud.unusedElement.getKind() == ElementKind.CONSTRUCTOR) {
diff --git
a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnusedTest.java
b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnusedTest.java
index 2b41dba167..b00212fe31 100644
---
a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnusedTest.java
+++
b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/bugs/UnusedTest.java
@@ -50,4 +50,19 @@ public class UnusedTest extends NbTestCase {
"5:26-5:37:verifier:" +
Bundle.ERR_NotRead("unusedParam"),
"7:12-7:16:verifier:" +
Bundle.ERR_NotUsedConstructor());
}
+
+public void testNoFixForBindings() throws Exception {
+HintTest
+.create()
+.sourceLevel("17")
+.input("package test;\n" +
+ "public class Test {\n" +
+ "boolean test(Object o) {\n" +
+ "return o instanceof String s;\n" +
+ "}\n" +
+ "}\n")
+.run(Unused.class)
+.findWarning("3:35-3:36:verifier:Variable s is never read")
+.assertFixes();
+}
}
-
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
