Skip to content

Commit 6dacac4

Browse files
Achal1607Achal1607
authored
Merge branch 'main' into javavscode-95
2 parents 4771e58 + 4310c65 commit 6dacac4

Some content is hidden

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

43 files changed

+5233
-10767
lines changed

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
with:
6363
repository: apache/netbeans
6464
path: netbeans
65-
ref: 20
65+
ref: 21
6666

6767
- name: Apply NetBeans patches
6868
run: ant apply-patches

‎BUILD.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
```bash
3939
$ git clone https://github.com/apache/netbeans.git
4040
$ cd netbeans/
41-
$ git checkout 20
41+
$ git checkout 21
4242
$ cd ..
4343
# the following target requires git executable to be on PATH:
4444
$ ant apply-patches

‎THIRD_PARTY_LICENSES.txt‎

Lines changed: 2451 additions & 4337 deletions
Large diffs are not rendered by default.

‎build.xml‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<property name="nbplatform.default.harness.dir" location="${nbplatform.default.netbeans.dest.dir}/harness" />
3232
<property name="nbantext.jar" location="netbeans/nbbuild/build/nbantext.jar" />
3333
<property name="nb_all" location="netbeans" />
34-
<property name="patches" value="patches/6133.diff 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/6834.diff patches/upgrade-codec.diff patches/7001.diff patches/7158.diff patches/mvn-sh.diff patches/rename-debugger.diff" />
34+
<property name="patches" value="patches/6330.diff patches/6760.diff patches/6834.diff patches/7001.diff patches/6968.diff patches/7158.diff patches/mvn-sh.diff patches/rename-debugger.diff patches/generate-dependencies.diff" />
3535
<condition property="cmd.suffix" value=".cmd" else="">
3636
<os family="windows"/>
3737
</condition>
@@ -134,6 +134,8 @@
134134
<exec executable="${build.dir}/vsce/node_modules/.bin/vsce${cmd.suffix}" failonerror="true" dir="${basedir}/vscode">
135135
<arg value="package" />
136136
<arg line="${vsce.extra.args}" />
137+
<arg value="--baseContentUrl" />
138+
<arg value="https://github.com/oracle/javavscode/blob/${metabuild.hash}/vscode" />
137139
<arg value="--baseImagesUrl" />
138140
<arg value="https://github.com/oracle/javavscode/raw/${metabuild.hash}/vscode" />
139141
<arg value="--out" />
@@ -215,4 +217,52 @@
215217
<target name="build-netbeans">
216218
<ant dir="netbeans" inheritAll="false" inheritRefs="false" useNativeBasedir="true"/>
217219
</target>
220+
221+
<target name="generate-netbeans-license-summary" depends="-set-use-jdk-javac,proxy-setup" description="Generate license summary">
222+
<delete dir="${build.dir}/nblic" />
223+
<mkdir dir="${build.dir}/nblic/nbcode" />
224+
<mkdir dir="${build.dir}/nblic/summary" />
225+
226+
<ant dir="nbcode" target="build-zip" inheritall="false" inheritrefs="false">
227+
<property name="nbplatform.default.netbeans.dest.dir" location="${nbplatform.default.netbeans.dest.dir}" />
228+
<property name="nbplatform.default.harness.dir" location="${nbplatform.default.harness.dir}" />
229+
<property name="nbantext.jar" location="${nbantext.jar}" />
230+
</ant>
231+
<unzip src="nbcode/dist/nbcode.zip" dest="${build.dir}/nblic/">
232+
</unzip>
233+
234+
<delete dir="${build.dir}/nblic/nbcode/nbcode" />
235+
236+
<taskdef name="createlicensesummary" classname="org.netbeans.nbbuild.extlibs.CreateLicenseSummary" classpath="${nbantext.jar}"/>
237+
238+
<property name="config.javadoc.all" value="" />
239+
240+
<property file="${nb_all}/nbbuild/cluster.properties" />
241+
242+
<taskdef name="resolvelist" classname="org.netbeans.nbbuild.ResolveList" classpath="${nbantext.jar}" />
243+
<resolvelist name="allmodules" path="modules.fullpath" dir="${nb_all}" list="${clusters.config.full.list}"/>
244+
245+
<createlicensesummary licenseStub="${nb_all}/LICENSE"
246+
noticeStub="${nb_all}/nbbuild/notice-stub.txt"
247+
report="${build.dir}/createlicensesummary.xml"
248+
nball="${nb_all}"
249+
build="${build.dir}/nblic/nbcode"
250+
license="${build.dir}/nblic/summary/LICENSE"
251+
notice="${build.dir}/nblic/summary/NOTICE"
252+
dependencies="${build.dir}/nblic/DEPENDENCIES"
253+
binary="true"
254+
excludes="${nb-extra-files}"
255+
includeAllFiles="true"
256+
/>
257+
<concat destfile="${build.dir}/nblic/summary/NOTICE-ext">
258+
<header>Content of the NOTICE file:
259+
260+
</header>
261+
<filelist dir="${build.dir}/nblic/summary" files="NOTICE"/>
262+
</concat>
263+
<concat destfile="${build.dir}/nblic/netbeans-third-party.txt">
264+
<filelist dir="${build.dir}/nblic/summary" files="LICENSE,NOTICE-ext"/>
265+
</concat>
266+
</target>
267+
218268
</project>

‎nbcode/branding/modules/org-netbeans-modules-java-file-launcher.jar/org/netbeans/modules/java/file/launcher/queries/Bundle.properties‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
SETTING_AutoRegisterAsRoot=true

‎nbcode/integration/nbproject/project.xml‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@
9494
<specification-version>1.7.3</specification-version>
9595
</run-dependency>
9696
</dependency>
97+
<dependency>
98+
<code-name-base>org.netbeans.modules.java.file.launcher</code-name-base>
99+
<build-prerequisite/>
100+
<compile-dependency/>
101+
<run-dependency>
102+
<specification-version>1.0</specification-version>
103+
</run-dependency>
104+
</dependency>
97105
<dependency>
98106
<code-name-base>org.netbeans.modules.java.lsp.server</code-name-base>
99107
<build-prerequisite/>
@@ -112,6 +120,14 @@
112120
<specification-version>9.24.0.8</specification-version>
113121
</run-dependency>
114122
</dependency>
123+
<dependency>
124+
<code-name-base>org.netbeans.modules.project.dependency</code-name-base>
125+
<build-prerequisite/>
126+
<compile-dependency/>
127+
<run-dependency>
128+
<implementation-version/>
129+
</run-dependency>
130+
</dependency>
115131
<dependency>
116132
<code-name-base>org.netbeans.modules.projectapi</code-name-base>
117133
<build-prerequisite/>
@@ -130,6 +146,14 @@
130146
<specification-version>1.104.0.8</specification-version>
131147
</run-dependency>
132148
</dependency>
149+
<dependency>
150+
<code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
151+
<build-prerequisite/>
152+
<compile-dependency/>
153+
<run-dependency>
154+
<specification-version>1.70.0.1</specification-version>
155+
</run-dependency>
156+
</dependency>
133157
<dependency>
134158
<code-name-base>org.netbeans.modules.updatecenters</code-name-base>
135159
<run-dependency>
@@ -184,35 +208,35 @@
184208
</run-dependency>
185209
</dependency>
186210
<dependency>
187-
<code-name-base>org.openide.util</code-name-base>
211+
<code-name-base>org.openide.nodes</code-name-base>
188212
<build-prerequisite/>
189213
<compile-dependency/>
190214
<run-dependency>
191-
<specification-version>9.18</specification-version>
215+
<specification-version>7.68</specification-version>
192216
</run-dependency>
193217
</dependency>
194218
<dependency>
195-
<code-name-base>org.openide.util.lookup</code-name-base>
219+
<code-name-base>org.openide.util</code-name-base>
196220
<build-prerequisite/>
197221
<compile-dependency/>
198222
<run-dependency>
199-
<specification-version>8.44</specification-version>
223+
<specification-version>9.18</specification-version>
200224
</run-dependency>
201225
</dependency>
202226
<dependency>
203-
<code-name-base>org.openide.util.ui</code-name-base>
227+
<code-name-base>org.openide.util.lookup</code-name-base>
204228
<build-prerequisite/>
205229
<compile-dependency/>
206230
<run-dependency>
207-
<specification-version>9.24</specification-version>
231+
<specification-version>8.44</specification-version>
208232
</run-dependency>
209233
</dependency>
210234
<dependency>
211-
<code-name-base>org.netbeans.modules.project.dependency</code-name-base>
235+
<code-name-base>org.openide.util.ui</code-name-base>
212236
<build-prerequisite/>
213237
<compile-dependency/>
214238
<run-dependency>
215-
<implementation-version/>
239+
<specification-version>9.24</specification-version>
216240
</run-dependency>
217241
</dependency>
218242
</module-dependencies>

0 commit comments

Comments
 (0)