[netbeans-website] branch master updated: add more entry to blog with former entry name

2023-07-21 Thread skygo
This is an automated email from the ASF dual-hosted git repository.

skygo 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 7350eedde add more entry to blog with former entry name
 new 74925778f Merge pull request #665 from ebarboni/netbeansblogentry
7350eedde is described below

commit 7350eeddea61fb9c806030954b354b209f3057b0
Author: Eric Barboni 
AuthorDate: Fri Jul 21 12:25:37 2023 +0200

add more entry to blog with former entry name
---
 ...c => announce-apache-netbeans-13-released.adoc} |  25 +++---
 ...c => announce-apache-netbeans-14-released.adoc} |  17 ++--
 ...c => announce-apache-netbeans-15-released.adoc} |  17 ++--
 ...c => announce-apache-netbeans-16-released.adoc} |  15 ++--
 ...c => announce-apache-netbeans-17-released.adoc} |   2 +-
 ...c => announce-apache-netbeans-18-released.adoc} |   2 +-
 ...annnb18.adoc => log4j-and-apache-netbeans.adoc} |  29 ++-
 .../blogs/netbeans-pub-hangout-in-prague-pic1.png  | Bin 0 -> 2519822 bytes
 ...18.adoc => netbeans-pub-hangout-in-prague.adoc} |  32 ++-
 .../blogs/towards-fair-trade-for-foss-pic1.png | Bin 0 -> 496786 bytes
 .../blogs/towards-fair-trade-for-foss-pic2.png | Bin 0 -> 506916 bytes
 .../blogs/towards-fair-trade-for-foss-pic3.png | Bin 0 -> 439696 bytes
 .../content/blogs/towards-fair-trade-for-foss.adoc |  96 +
 .../src/content/wiki/DevFaqPropertySheetTabs.adoc  |   1 -
 14 files changed, 153 insertions(+), 83 deletions(-)

diff --git a/netbeans.apache.org/src/content/blogs/annnb17.adoc 
b/netbeans.apache.org/src/content/blogs/announce-apache-netbeans-13-released.adoc
similarity index 72%
copy from netbeans.apache.org/src/content/blogs/annnb17.adoc
copy to 
netbeans.apache.org/src/content/blogs/announce-apache-netbeans-13-released.adoc
index 40725a813..09a93d281 100644
--- a/netbeans.apache.org/src/content/blogs/annnb17.adoc
+++ 
b/netbeans.apache.org/src/content/blogs/announce-apache-netbeans-13-released.adoc
@@ -17,9 +17,9 @@
 // under the License.
 //
 
-= [ANNOUNCE] Apache NetBeans 17 Released
+= [ANNOUNCE] Apache NetBeans 13 Released
 Geertjan Wielenga
-2023-02-21
+2022-03-04
 :jbake-type: post
 :jbake-tags: blogentry
 :jbake-status: published
@@ -30,26 +30,27 @@ Geertjan Wielenga
 :syntax: true
 
 
-The Apache NetBeans team is pleased to announce that Apache NetBeans 17 was 
released on February 21, 2023.
+The Apache NetBeans team is pleased to announce that Apache NetBeans 13 is 
released today on March 4, 2022. Apache NetBeans is a full IDE for Java SE, 
Java EE, PHP, JavaScript, HTML5 and more, including some support for Groovy and 
C/C++.
 
-What's in the Apache NetBeans 17 release:
+Our schedule is publicly available here:
 
-https://github.com/apache/netbeans/releases/tag/17
+https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule
 
-With thanks to 36 contributors, including 7 who have contributed for the first 
time. Thank you!
+New & noteworthy features of the 13 release:
 
-Downloads:
+xref:../download/nb13/index.adoc[Apache NetBeans 13 Features page]
 
-https://netbeans.apache.org/download/nb17/
+Downloads:
 
-See our release schedule:
-
-https://cwiki.apache.org/confluence/display/NETBEANS/Release+Schedule
+xref:../download/nb13/nb13.adoc[Apache NetBeans 13 Download page]
 
 Feel free to share the good news!
 
 Thanks everyone, and best wishes,
 
-Neil, Eric, Martin, Geertjan
+Neil, Eric, and Geertjan
+
+Release Manager for Apache NetBeans 13
 
 on behalf of Apache NetBeans PMC
+
diff --git a/netbeans.apache.org/src/content/blogs/annnb17.adoc 
b/netbeans.apache.org/src/content/blogs/announce-apache-netbeans-14-released.adoc
similarity index 71%
copy from netbeans.apache.org/src/content/blogs/annnb17.adoc
copy to 
netbeans.apache.org/src/content/blogs/announce-apache-netbeans-14-released.adoc
index 40725a813..7ced21fc2 100644
--- a/netbeans.apache.org/src/content/blogs/annnb17.adoc
+++ 
b/netbeans.apache.org/src/content/blogs/announce-apache-netbeans-14-released.adoc
@@ -17,9 +17,9 @@
 // under the License.
 //
 
-= [ANNOUNCE] Apache NetBeans 17 Released
+= [ANNOUNCE] Apache NetBeans 14 Released
 Geertjan Wielenga
-2023-02-21
+2022-06-17
 :jbake-type: post
 :jbake-tags: blogentry
 :jbake-status: published
@@ -30,17 +30,17 @@ Geertjan Wielenga
 :syntax: true
 
 
-The Apache NetBeans team is pleased to announce that Apache NetBeans 17 was 
released on February 21, 2023.
+The Apache NetBeans team is pleased to announce that Apache NetBeans 14 was 
released on June 9, 2022 (though there's been a delay in announcing the 
release).
 
-What's in the Apache NetBeans 17 release:
+What's in the Apache NetBeans 14 release:
 
-https://github.com/apache/netbeans/releases/tag/17
+https://github.com/apache/netbeans/releases/tag/14
 
-With thanks to 36 contributors, including 7 who have contributed for the first 
time. Thank you!
+Note it

[netbeans] branch issues-nb19rc deleted (was f8cc9ddb4b)

2023-07-21 Thread neilcsmith
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

2023-07-21 Thread neilcsmith
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)

2023-07-21 Thread neilcsmith
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

2023-07-21 Thread neilcsmith
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)

2023-07-21 Thread neilcsmith
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

2023-07-21 Thread neilcsmith
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

2023-07-21 Thread neilcsmith
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("{"); // NOI18N
+if (startIndex > -1

[netbeans] branch delivery updated: Enable 'Rerun failed tests' button for JUnit5

2023-07-21 Thread neilcsmith
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