Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to NetBeans 20 #92

Merged
merged 1 commit into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
with:
repository: apache/netbeans
path: netbeans
ref: f48f91e6c197d8a40bd82fc2f2d12a4e71242afe
ref: 20

- name: Apply NetBeans patches
run: ant apply-patches
Expand Down
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
```bash
$ git clone https://github.com/apache/netbeans.git
$ cd netbeans/
$ git checkout f48f91e6c197d8a40bd82fc2f2d12a4e71242afe
$ git checkout 20
$ cd ..
# the following target requires git executable to be on PATH:
$ ant apply-patches
Expand Down
8,761 changes: 4,499 additions & 4,262 deletions THIRD_PARTY_LICENSES.txt

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
<property name="nbplatform.default.harness.dir" location="${nbplatform.default.netbeans.dest.dir}/harness" />
<property name="nbantext.jar" location="netbeans/nbbuild/build/nbantext.jar" />
<property name="nb_all" location="netbeans" />
<property name="patches" value="patches/6218.diff patches/6330.diff patches/6478-6480.diff patches/6481.diff patches/6771.diff patches/mvn-sh.diff patches/rename-debugger.diff" />
<property name="patches" value="patches/6330.diff patches/6481.diff patches/6615.diff patches/6631.diff patches/6637.diff patches/6642.diff patches/6649.diff patches/6690.diff patches/6771.diff patches/6329.diff patches/6742.diff patches/6780.diff patches/mvn-sh.diff patches/rename-debugger.diff" />

<condition property="cmd.suffix" value=".cmd" else="">
<os family="windows"/>
</condition>
Expand Down Expand Up @@ -214,4 +215,4 @@
<target name="build-netbeans">
<ant dir="netbeans" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
</target>
</project>
</project>
2,384 changes: 0 additions & 2,384 deletions patches/6218.diff

This file was deleted.

Loading