Skip to content

Commit 7c8df21

Browse files
Achal1607Achal1607
committed
Initial sketch of NB-23 upgrade
1 parent 2f9b2f4 commit 7c8df21

File tree

24 files changed

+2821
-3714
lines changed

24 files changed

+2821
-3714
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: 22
65+
ref: 23-rc2
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
@@ -39,7 +39,7 @@ $ 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-rc2
4343
$ cd ..
4444
# the following target requires git executable to be on PATH:
4545
$ ant apply-patches

‎build.xml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,13 @@
3434
<loadresource property="patch-files">
3535
<string>
3636
patches/6330.diff
37-
patches/7001.diff
38-
patches/7271.diff
39-
patches/7353.diff
40-
patches/7368.diff
41-
patches/7370.diff
42-
patches/7382.diff
43-
patches/7390.diff
44-
patches/7491-preliminary.diff
45-
patches/7497.diff
46-
patches/7548_source-1.8.diff
47-
patches/7583_source-1.8.diff
37+
patches/7491.diff
4838
patches/7610.diff
49-
patches/7621.diff
5039
patches/7641.diff
5140
patches/7654.diff
41+
patches/7670.diff
5242
patches/7690.diff
43+
patches/7733.diff
5344
patches/mvn-sh.diff
5445
patches/generate-dependencies.diff
5546
patches/rename-debugger.diff

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
PROP_generate_setUp_default=false
19+
PROP_generate_tearDown_default=false
20+
PROP_generate_class_setUp_default=false
21+
PROP_generate_class_tearDown_default=false

‎nbcode/integration/src/org/netbeans/modules/nbcode/integration/layer.xml

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,3 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
4-
Licensed to the Apache Software Foundation (ASF) under one
5-
or more contributor license agreements. See the NOTICE file
6-
distributed with this work for additional information
7-
regarding copyright ownership. The ASF licenses this file
8-
to you under the Apache License, Version 2.0 (the
9-
"License"); you may not use this file except in compliance
10-
with the License. You may obtain a copy of the License at
11-
12-
http://www.apache.org/licenses/LICENSE-2.0
13-
14-
Unless required by applicable law or agreed to in writing,
15-
software distributed under the License is distributed on an
16-
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17-
KIND, either express or implied. See the License for the
18-
specific language governing permissions and limitations
19-
under the License.
20-
21-
-->
221
<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.2//EN" "http://www.netbeans.org/dtds/filesystem-1_2.dtd">
232
<filesystem>
243
<folder name="Preferences">
@@ -52,12 +31,16 @@
5231
<attr name="instanceCreate" methodvalue="org.netbeans.modules.java.lsp.server.explorer.NodeActionsProvider.forFile"/>
5332
<attr name="action:org.netbeans.modules.cloud.oracle.actions.DownloadWalletAction" stringvalue="Tools"/>
5433
<attr name="action:org.netbeans.modules.cloud.oracle.actions.AddADBAction" stringvalue="Tools"/>
34+
<attr name="action:org.netbeans.modules.cloud.oracle.actions.AddDbConnectionToVault" stringvalue="Tools"/>
5535
<attr name="action:org.netbeans.modules.cloud.oracle.actions.CreateAutonomousDBAction" stringvalue="Tools"/>
5636
<attr name="action:org.netbeans.modules.cloud.oracle.actions.OpenServiceConsoleAction" stringvalue="Tools"/>
5737
<attr name="action:org.netbeans.modules.cloud.oracle.actions.CloudRefresh" stringvalue="Tools"/>
5838
<attr name="action:org.netbeans.modules.cloud.oracle.actions.AddToProject" stringvalue="Tools"/>
5939
<attr name="action:org.netbeans.modules.cloud.oracle.actions.CreateBuildRun" stringvalue="Tools"/>
6040
<attr name="action:org.netbeans.modules.cloud.oracle.actions.AddRepository" stringvalue="Tools"/>
41+
<attr name="action:org.netbeans.modules.cloud.oracle.actions.AddSuggestedItemAction" stringvalue="Tools"/>
42+
<attr name="action:org.netbeans.modules.cloud.oracle.actions.RemoveFromProject" stringvalue="Tools"/>
43+
<attr name="action:org.netbeans.modules.cloud.oracle.actions.SetReferenceName" stringvalue="Tools"/>
6144
</file>
6245
</folder>
6346
<folder name="AutoupdateType">
@@ -75,6 +58,9 @@
7558
<folder name="foundProjects">
7659
<file name="project-cookies.contextValues" url="project-cookies.contextValues"/>
7760
</folder>
61+
<folder name="cloud.assets">
62+
<file name="cloud-cookies.contextValues" url="cloud-cookies.contextValues"/>
63+
</folder>
7864
</folder>
7965
<folder name="Debugger">
8066
<file name="org-netbeans-modules-debugger-jpda-ui-CurrentThreadAnnotationListener.instance_hidden"/>
@@ -123,4 +109,29 @@
123109
</folder>
124110
<folder name="Persistence_hidden"/>
125111
</folder>
126-
</filesystem>
112+
<folder name="Projects">
113+
<folder name="org-netbeans-modules-maven">
114+
<folder name="Lookup">
115+
<file name="maven-actions-override.instance">
116+
<attr name="position" intvalue="10000"/>
117+
<attr name="instanceOf" stringvalue="org.netbeans.spi.project.LookupProvider"/>
118+
<attr name="instanceCreate" methodvalue="org.netbeans.api.maven.MavenActions.forProjectLayer"/>
119+
<attr name="resource" stringvalue="nbres:/org/netbeans/modules/nbcode/integration/maven-actions-override.xml"/>
120+
</file>
121+
</folder>
122+
</folder>
123+
</folder>
124+
<folder name="Editors">
125+
<file name="org-netbeans-modules-editor-hints-lsp-HintsDiagnosticsProvider.instance">
126+
<!--org.netbeans.modules.editor.hints.lsp.HintsDiagnosticsProvider-->
127+
<attr name="instanceOf" stringvalue="org.netbeans.spi.lsp.ErrorProvider"/>
128+
</file>
129+
<folder name="text">
130+
<folder name="x-java">
131+
<file name="org-netbeans-modules-java-hints-infrastructure-JavaErrorProvider.instance">
132+
<attr name="instanceOf" stringvalue="org.netbeans.spi.lsp.ErrorProvider"/>
133+
</file>
134+
</folder>
135+
</folder>
136+
</folder>
137+
</filesystem>

‎nbcode/integration/src/org/netbeans/modules/nbcode/integration/maven-actions-override.xml

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
http://www.apache.org/licenses/LICENSE-2.0
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+
19+
<actions>
20+
<action>
21+
<actionName>build</actionName>
22+
<packagings>
23+
<packaging>*</packaging>
24+
</packagings>
25+
<goals>
26+
<goal>install</goal>
27+
</goals>
28+
<reactor>also-make</reactor>
29+
</action>
30+
<action>
31+
<actionName>rebuild</actionName>
32+
<packagings>
33+
<packaging>*</packaging>
34+
</packagings>
35+
<goals>
36+
<goal>clean</goal>
37+
<goal>install</goal>
38+
</goals>
39+
<reactor>also-make</reactor>
40+
</action>
41+
<action>
42+
<actionName>test.single</actionName>
43+
<packagings>
44+
<packaging>*</packaging>
45+
</packagings>
46+
<goals>
47+
<goal>process-test-classes</goal>
48+
<goal>surefire:test</goal>
49+
</goals>
50+
<properties>
51+
<test>${packageClassName}</test>
52+
</properties>
53+
</action>
54+
55+
<action>
56+
<actionName>run</actionName>
57+
<packagings>
58+
<packaging>jar</packaging>
59+
</packagings>
60+
<goals>
61+
<goal>process-classes</goal>
62+
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
63+
</goals>
64+
<properties>
65+
<exec.vmArgs></exec.vmArgs>
66+
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
67+
<exec.appArgs></exec.appArgs>
68+
<exec.mainClass>${packageClassName}</exec.mainClass>
69+
<exec.executable>java</exec.executable>
70+
</properties>
71+
<preAction>build-with-dependencies</preAction>
72+
</action>
73+
<action>
74+
<actionName>debug</actionName>
75+
<packagings>
76+
<packaging>jar</packaging>
77+
</packagings>
78+
<goals>
79+
<goal>process-classes</goal>
80+
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
81+
</goals>
82+
<properties>
83+
<exec.vmArgs>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
84+
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
85+
<exec.appArgs></exec.appArgs>
86+
<exec.mainClass>${packageClassName}</exec.mainClass>
87+
<exec.executable>java</exec.executable>
88+
<jpda.listen>true</jpda.listen>
89+
</properties>
90+
<preAction>build-with-dependencies</preAction>
91+
</action>
92+
<action>
93+
<actionName>run.single.main</actionName>
94+
<packagings>
95+
<packaging>*</packaging>
96+
</packagings>
97+
<goals>
98+
<goal>process-classes</goal>
99+
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
100+
</goals>
101+
<properties>
102+
<exec.vmArgs></exec.vmArgs>
103+
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
104+
<exec.executable>java</exec.executable>
105+
<exec.mainClass>${packageClassName}</exec.mainClass>
106+
<exec.classpathScope>${classPathScope}</exec.classpathScope>
107+
</properties>
108+
<preAction>build-with-dependencies</preAction>
109+
</action>
110+
111+
<action>
112+
<actionName>debug.single.main</actionName>
113+
<packagings>
114+
<packaging>*</packaging>
115+
</packagings>
116+
<goals>
117+
<goal>process-test-classes</goal>
118+
<goal>org.codehaus.mojo:exec-maven-plugin:3.1.0:exec</goal>
119+
</goals>
120+
<properties>
121+
<exec.vmArgs>-agentlib:jdwp=transport=dt_socket,server=n,address=${jpda.address}</exec.vmArgs>
122+
<exec.args>${exec.vmArgs} -classpath %classpath ${exec.mainClass} ${exec.appArgs}</exec.args>
123+
<exec.executable>java</exec.executable>
124+
<exec.mainClass>${packageClassName}</exec.mainClass>
125+
<exec.classpathScope>${classPathScope}</exec.classpathScope>
126+
<jpda.listen>true</jpda.listen>
127+
</properties>
128+
<preAction>build-with-dependencies</preAction>
129+
</action>
130+
</actions>

0 commit comments

Comments
 (0)