From 3005b2c5c7beb0583a64564cedd5eb4e595e818a Mon Sep 17 00:00:00 2001
From: Jan Lahoda <jan.lahoda@oracle.com>
Date: Tue, 24 Oct 2023 11:28:28 +0200
Subject: [PATCH 1/2] Adding workflow to build the extension on push and pull
 request.

---
 .github/workflows/main.yml | 73 ++++++++++++++++++++++++++++++++++++++
 vscode/package-lock.json   |  4 +--
 2 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..4b07737
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,73 @@
+# 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.
+
+# This file has been modified for Oracle Java SE extension
+
+name: Java Platform Support for Visual Studio Code
+
+on:
+  push:
+  pull_request:
+    # unlocked event is used as super secret restart button
+    types: [opened, synchronize, unlocked]
+
+# cancel other PR workflow run in the same head-base group if it exists (e.g. during PR syncs)
+# if this is not a PR run (no github.head_ref and github.base_ref defined), use an UID as group
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}-${{ github.base_ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  # primary build job, most other jobs use the artifact produced here
+  # artifact is only produced once in the matrix
+  base-build:
+    name: Base Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    strategy:
+      matrix:
+        java: [ '17' ]
+      fail-fast: false
+    steps:
+
+      - name: Set up JDK ${{ matrix.java }}
+        uses: oracle-actions/setup-java@v1
+        with:
+          release: ${{ matrix.java }}
+
+      - name: Checkout ${{ github.ref }} ( ${{ github.sha }} )
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+          submodules: false
+
+      - name: Checkout NetBeans
+        uses: actions/checkout@v3
+        with:
+          repository: apache/netbeans
+          path: netbeans
+          ref: f48f91e6c197d8a40bd82fc2f2d12a4e71242afe
+
+      - name: Apply NetBeans patches
+        run: ant apply-patches
+
+      - name: Build NetBeans
+        run: ant build-netbeans
+
+      - name: Build the Visual Studio Extension
+        run: ant build-vscode-ext
diff --git a/vscode/package-lock.json b/vscode/package-lock.json
index 05f99bc..02dfb71 100644
--- a/vscode/package-lock.json
+++ b/vscode/package-lock.json
@@ -1133,7 +1133,7 @@
 		},
 		"node_modules/jsonc-parser": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/obdx-npm-virtual/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
 			"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
 		},
 		"node_modules/locate-path": {
@@ -2395,7 +2395,7 @@
 		},
 		"jsonc-parser": {
 			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/obdx-npm-virtual/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+			"resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
 			"integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
 		},
 		"locate-path": {

From b6a4200259ac3a174b617f20ddbfa00296805d98 Mon Sep 17 00:00:00 2001
From: Jan Lahoda <51319204+lahodaj@users.noreply.github.com>
Date: Tue, 24 Oct 2023 15:11:45 +0200
Subject: [PATCH 2/2] Upgrading checkout action, as suggested.

Co-authored-by: Christian Stein <sormuras@gmail.com>
---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4b07737..3a39665 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,13 +51,13 @@ jobs:
           release: ${{ matrix.java }}
 
       - name: Checkout ${{ github.ref }} ( ${{ github.sha }} )
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: false
 
       - name: Checkout NetBeans
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: apache/netbeans
           path: netbeans