Skip to content

Commit 9191366

Browse files
authored
Merge pull request #275 from oracle/23.0.0
Merging feature branch - 23.0.0 into main
2 parents ba5de48 + 5425193 commit 9191366

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6114
-4610
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ jobs:
6262
with:
6363
repository: apache/netbeans
6464
path: netbeans
65-
ref: 22
65+
ref: 23-rc3
66+
67+
- name: Checkout NetBeans l10n
68+
uses: actions/checkout@v4
69+
with:
70+
repository: apache/netbeans-l10n
71+
path: netbeans-l10n
72+
ref: ece00239dc7a208fba60703c2256ffd818da1646
6673

6774
- name: Apply NetBeans patches
6875
run: ant apply-patches

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
build/
22
netbeans/
33
.DS_STORE
4+
.idea/

BUILD.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,22 @@ $ git clone https://github.com/oracle/javavscode.git
3939
$ cd javavscode/
4040
$ git clone https://github.com/apache/netbeans.git
4141
$ cd netbeans/
42-
$ git checkout 22
42+
$ git checkout 23-rc3
43+
$ cd ..
44+
$ git clone https://github.com/apache/netbeans-l10n.git
45+
$ cd netbeans-l10n
46+
$ git checkout ece00239dc7a208fba60703c2256ffd818da1646 # head commit in master
4347
$ cd ..
4448
# the following target requires git executable to be on PATH:
4549
$ ant apply-patches
4650
$ ant build-netbeans
51+
52+
#Note if you do not wish to have l10n in scope then add no-l10n before any ant invocation target at beginning as below, by default l10n is enabled
53+
$ ant no-l10n apply-patches
54+
$ ant no-l10n build-netbeans
4755
```
4856

57+
4958
## Building VS Code extension
5059

5160
To build the VS Code extension invoke:

NOTICE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ This product includes software developed at
22
The Apache Software Foundation (http://www.apache.org/).
33

44
Oracle Java Platform Extension for Visual Studio Code
5-
Copyright (c) 2023, Oracle and/or its affiliates.
5+
Copyright (c) 2023-2024, Oracle and/or its affiliates.
66

77
Apache NetBeans
8-
Copyright 2017-2023 The Apache Software Foundation
8+
Copyright 2017-2024 The Apache Software Foundation
99

1010
The code is based on NetBeans, that has been kindly donated to the Apache
1111
Software Foundation by Oracle.

README.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@
2828
[![Build Status](https://img.shields.io/github/actions/workflow/status/oracle/javavscode/main.yml?branch=main&style=for-the-badge&logo=github)](https://github.com/oracle/javavscode/actions?query=workflow:Java%20Platform%20Support%20for%20Visual%20Studio%20Code)
2929
[![License](https://img.shields.io/github/license/oracle/javavscode?style=for-the-badge&logo=apache)](https://github.com/oracle/javavscode/blob/main/LICENSE.txt)
3030

31-
Java Platform extension from Oracle brings full featured development support (edit-compile-debug & test cycle) to VS Code. It offers support for Maven and Gradle projects.
32-
31+
Java Platform extension from Oracle brings full featured development support (edit-compile-debug & test cycle) to VS Code. It also offers support for Maven and Gradle projects. Applications using JDK 8 and above are supported.
3332
## Getting Started
34-
1. Set JDK in `View | Command Palette | Preferences:Open User Settings (JSON) ...` __jdk: Jdkhome__ setting to point to JDK which Language Server will run on and projects will be compiled with. More below in section [Selecting the JDK](#selecting-the-jdk)
35-
2. If no JDK is present in your system then extension can setup things for you. More below in section [JDK Downloader](#jdk-downloader)
36-
3. Use __Java: New Project...__ " command to start creating new project, or
37-
4. Open the folder with existing __pom.xml__ for Maven or ___Gradle___ project files (_build.gradle, gradle.properties_). Language Server opens the project, resolves dependencies if any and performs priming build, or
38-
5. Simply create a new Java class file with `public static void main(String[] args)` method in opened folder and start coding, compiling, debugging. Works on JDK 11 and newer.
33+
1. Setting up the JDK
34+
- If no JDK is present in your system then the extension can set things up for you. For more details refer to [JDK Downloader](#jdk-downloader) section.
35+
- Set the JDK in the `View | Command Palette | Preferences: Open User Settings | Jdk: Jdkhome` setting to point to the JDK that the Language Server will run on and also by default use for running and compiling projects.
36+
- The extension requires JDK 17 or newer to run.
37+
- Optionally, set a different JDK to compile and run projects in the `View | Command Palette | Preferences: Open User Settings | Jdk › Project: Jdkhome` setting.
38+
- By default, the __jdk.jdkhome__ setting is used.
39+
- Projects can run on JDK 8 and above.
40+
- For more information, see the section [Selecting the JDK](#selecting-the-jdk).
41+
4. Use any one of the following ways to start coding, compiling and debugging in Java.
42+
- Simply create a new Java class with `public static void main(String[] args)` method.
43+
- Use the __Java: New From Template...__ command to create a new Java file.
44+
- Use the __Java: New Project...__ command to create a new project.
45+
- Open the folder with existing __Maven__ or __Gradle__ project files (_pom.xml_ or _build.gradle, gradle.properties_).
3946

4047
## Supported Actions
4148
In the VS Code command palette :
@@ -159,19 +166,11 @@ When adding JavaDoc to code Oracle Java Platform extension assists by suggesting
159166
Oracle Java Platform extension provides Test Explorer view which allows to run all tests in a project, examine the results, go to source code and run particular test.
160167
![Test Explorer](vscode/images/Test_explorer.png)
161168

162-
## Supported Options
163-
164-
* __jdk.jdkhome__ - path to the JDK, see dedicated section below
165-
* __jdk.verbose__ - enables verbose extension logging
166-
167169
## Selecting the JDK
170+
The JDK to build, run and debug projects is being searched in the following locations:
168171

169-
The user projects are built, run and debugged using the same JDK which runs the
170-
Oracle Java Platform extension. The JDK is being searched in
171-
following locations:
172-
172+
- `jdk.project.jdkhome` setting (workspace then user settings)
173173
- `jdk.jdkhome` setting (workspace then user settings)
174-
- `java.home` setting (workspace then user settings)
175174
- `JDK_HOME` environment variable
176175
- `JAVA_HOME` environment variable
177176
- current system path

0 commit comments

Comments
 (0)