Revert "Merge pull request #256 from Achal1607/nb-23-upgrade" (#260)

Awaiting BA for NB-rc3. That will be merged via PR #259.

This reverts commit a6ce838, reversing
changes made to b124094.

Signed-off-by: Siddharth Srinivasan <[email protected]>

Author: sid-srini

.github/workflows/main.yml

@@ -62,7 +62,7 @@ jobs:
         with:
           repository: apache/netbeans
           path: netbeans
-          ref: 23-rc2
+          ref: 22
 
       - name: Apply NetBeans patches
         run: ant apply-patches

BUILD.md

@@ -39,7 +39,7 @@ $ git clone https://github.com/oracle/javavscode.git
 $ cd javavscode/
 $ git clone https://github.com/apache/netbeans.git
 $ cd netbeans/
-$ git checkout 23-rc2
+$ git checkout 22
 $ cd ..
 # the following target requires git executable to be on PATH:
 $ ant apply-patches

build.xml

@@ -34,14 +34,23 @@
     <loadresource property="patch-files">
         <string>
             patches/6330.diff
-            patches/7491.diff
+            patches/7001.diff
+            patches/7271.diff
+            patches/7353.diff
+            patches/7368.diff
+            patches/7370.diff
+            patches/7382.diff
+            patches/7390.diff
+            patches/7491-preliminary.diff
+            patches/7497.diff
+            patches/7548_source-1.8.diff
+            patches/7583_source-1.8.diff
             patches/7610.diff
+            patches/7621.diff
             patches/7641.diff
             patches/7654.diff
-            patches/7670.diff
             patches/7690.diff
             patches/7722.diff
-            patches/7733.diff
             patches/mvn-sh.diff
             patches/generate-dependencies.diff
             patches/rename-debugger.diff

nbcode/branding/modules/org-netbeans-modules-java-testrunner.jar/org/netbeans/modules/java/testrunner/Bundle.properties

@@ -1,3 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
 <filesystem>
     <folder name="Preferences">
@@ -31,16 +52,12 @@
                 <attr name="instanceCreate" methodvalue="org.netbeans.modules.java.lsp.server.explorer.NodeActionsProvider.forFile"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.DownloadWalletAction" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.AddADBAction" stringvalue="Tools"/>
-                <attr name="action:org.netbeans.modules.cloud.oracle.actions.AddDbConnectionToVault" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.CreateAutonomousDBAction" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.OpenServiceConsoleAction" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.CloudRefresh" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.AddToProject" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.CreateBuildRun" stringvalue="Tools"/>
                 <attr name="action:org.netbeans.modules.cloud.oracle.actions.AddRepository" stringvalue="Tools"/>
-                <attr name="action:org.netbeans.modules.cloud.oracle.actions.AddSuggestedItemAction" stringvalue="Tools"/>
-                <attr name="action:org.netbeans.modules.cloud.oracle.actions.RemoveFromProject" stringvalue="Tools"/>
-                <attr name="action:org.netbeans.modules.cloud.oracle.actions.SetReferenceName" stringvalue="Tools"/>
             </file>
         </folder>
         <folder name="AutoupdateType">
@@ -58,9 +75,6 @@
         <folder name="foundProjects">
             <file name="project-cookies.contextValues" url="project-cookies.contextValues"/>
         </folder>
-        <folder name="cloud.assets">
-            <file name="cloud-cookies.contextValues" url="cloud-cookies.contextValues"/>
-        </folder>
     </folder>
     <folder name="Debugger">
         <file name="org-netbeans-modules-debugger-jpda-ui-CurrentThreadAnnotationListener.instance_hidden"/>
@@ -109,29 +123,4 @@
         </folder>
         <folder name="Persistence_hidden"/>
     </folder>
-    <folder name="Projects">
-        <folder name="org-netbeans-modules-maven">
-            <folder name="Lookup">
-                <file name="maven-actions-override.instance">
-                    <attr name="position" intvalue="10000"/>
-                    <attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
-                    <attr name="instanceCreate" methodvalue="org.netbeans.api.maven.MavenActions.forProjectLayer"/>
-                    <attr name="resource" stringvalue="nbres:/org/netbeans/modules/nbcode/integration/maven-actions-override.xml"/>
-                </file>
-            </folder>
-        </folder>
-    </folder>
-    <folder name="Editors">
-        <file name="org-netbeans-modules-editor-hints-lsp-HintsDiagnosticsProvider.instance">
-            <!--org.netbeans.modules.editor.hints.lsp.HintsDiagnosticsProvider-->
-            <attr name="instanceOf" stringvalue="org.netbeans.spi.lsp.ErrorProvider"/>
-        </file>
-        <folder name="text">
-            <folder name="x-java">
-                <file name="org-netbeans-modules-java-hints-infrastructure-JavaErrorProvider.instance">
-                    <attr name="instanceOf" stringvalue="org.netbeans.spi.lsp.ErrorProvider"/>
-                </file>
-            </folder>
-        </folder>
-    </folder>
-</filesystem>
+</filesystem>