Merge branch 'apache:master' into g2

.asf.yaml

@@ -30,12 +30,14 @@ github:
     issues: true
     projects: true
   enabled_merge_buttons:
-    squash:  true
+    squash:  false
     merge:   true
     rebase:  true
   protected_branches:
     # no force push to master
     master: {}
+  collaborators:
+    - asbachb
 
 notifications:
     commits:      commits@netbeans.apache.org

.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 19"
+#       - "Apache NetBeans 20 release candidate"
         - "Apache NetBeans latest daily build"
     validations:
       required: true
@@ -64,11 +64,12 @@ body:
       multiple: false
       options:
         - "No / Don't know"
+        - "Apache NetBeans 18"
+        - "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