Skip to content

Commit fd8c7ae

Browse files
authored
Merge pull request #7637 from mbien/nb-javac-2335
Update nb-javac to jdk-23+35.
2 parents 1495ec9 + 14c9119 commit fd8c7ae

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

java/libs.javacapi/external/binaries-list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
C251D126090F6362D805B1987372BF4963B3782C com.dukescript.nbjavac:nb-javac:jdk-23+30
18-
A9105543E5EB96B9705D338A4C42A3A89E25A19A com.dukescript.nbjavac:nb-javac:jdk-23+30:api
17+
1B70EC8A5230901C0EEE6EDF9829B43EAFAE9CC9 com.dukescript.nbjavac:nb-javac:jdk-23+35
18+
B3CB7A425EC7AAADA60754E6DF2E5E2D990E91AE com.dukescript.nbjavac:nb-javac:jdk-23+35:api

java/libs.javacapi/external/nb-javac-jdk-23+30-license.txt renamed to java/libs.javacapi/external/nb-javac-jdk-23+35-license.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: Javac Compiler Implementation
22
Description: Javac Compiler Implementation
3-
Version: 23+30
4-
Files: nb-javac-jdk-23+30-api.jar nb-javac-jdk-23+30.jar
3+
Version: 23+35
4+
Files: nb-javac-jdk-23+35-api.jar nb-javac-jdk-23+35.jar
55
License: GPL-2-CP
66
Origin: OpenJDK (https://github.com/openjdk/jdk)
77
Source: https://github.com/openjdk/jdk

java/libs.javacapi/nbproject/project.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@
4040
</public-packages>
4141
<class-path-extension>
4242
<runtime-relative-path />
43-
<binary-origin>external/nb-javac-jdk-23+30-api.jar</binary-origin>
43+
<binary-origin>external/nb-javac-jdk-23+35-api.jar</binary-origin>
4444
</class-path-extension>
4545
<class-path-extension>
4646
<runtime-relative-path />
47-
<binary-origin>external/nb-javac-jdk-23+30.jar</binary-origin>
47+
<binary-origin>external/nb-javac-jdk-23+35.jar</binary-origin>
4848
</class-path-extension>
4949
</data>
5050
</configuration>

java/libs.nbjavacapi/external/binaries-list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
C251D126090F6362D805B1987372BF4963B3782C com.dukescript.nbjavac:nb-javac:jdk-23+30
18-
A9105543E5EB96B9705D338A4C42A3A89E25A19A com.dukescript.nbjavac:nb-javac:jdk-23+30:api
17+
1B70EC8A5230901C0EEE6EDF9829B43EAFAE9CC9 com.dukescript.nbjavac:nb-javac:jdk-23+35
18+
B3CB7A425EC7AAADA60754E6DF2E5E2D990E91AE com.dukescript.nbjavac:nb-javac:jdk-23+35:api

java/libs.nbjavacapi/external/nb-javac-jdk-23+30-license.txt renamed to java/libs.nbjavacapi/external/nb-javac-jdk-23+35-license.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Name: Javac Compiler Implementation
22
Description: Javac Compiler Implementation
3-
Version: 23+30
4-
Files: nb-javac-jdk-23+30-api.jar nb-javac-jdk-23+30.jar
3+
Version: 23+35
4+
Files: nb-javac-jdk-23+35-api.jar nb-javac-jdk-23+35.jar
55
License: GPL-2-CP
66
Origin: OpenJDK (https://github.com/openjdk/jdk)
77
Source: https://github.com/openjdk/jdk

java/libs.nbjavacapi/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
javac.source=1.8
1919
javac.compilerargs=-Xlint -Xlint:-serial
2020
license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
21-
release.external/nb-javac-jdk-23+30-api.jar=modules/ext/nb-javac-jdk-23-30-api.jar
22-
release.external/nb-javac-jdk-23+30.jar=modules/ext/nb-javac-jdk-23-30.jar
21+
release.external/nb-javac-jdk-23+35-api.jar=modules/ext/nb-javac-jdk-23-30-api.jar
22+
release.external/nb-javac-jdk-23+35.jar=modules/ext/nb-javac-jdk-23-30.jar
2323

2424
# for tests
2525
requires.nb.javac=true

java/libs.nbjavacapi/nbproject/project.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
<public-packages/>
4747
<class-path-extension>
4848
<runtime-relative-path>ext/nb-javac-jdk-23-30-api.jar</runtime-relative-path>
49-
<binary-origin>external/nb-javac-jdk-23+30-api.jar</binary-origin>
49+
<binary-origin>external/nb-javac-jdk-23+35-api.jar</binary-origin>
5050
</class-path-extension>
5151
<class-path-extension>
5252
<runtime-relative-path>ext/nb-javac-jdk-23-30.jar</runtime-relative-path>
53-
<binary-origin>external/nb-javac-jdk-23+30.jar</binary-origin>
53+
<binary-origin>external/nb-javac-jdk-23+35.jar</binary-origin>
5454
</class-path-extension>
5555
</data>
5656
</configuration>

nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip platform/o.n.b
9696
nb/ide.launcher/external/launcher-external-binaries-1-94a19f0.zip harness/apisupport.harness/external/launcher-external-binaries-1-94a19f0.zip
9797

9898
# only one is part of the product:
99-
java/libs.javacapi/external/nb-javac-jdk-23+30-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-23+30-api.jar
100-
java/libs.javacapi/external/nb-javac-jdk-23+30.jar java/libs.nbjavacapi/external/nb-javac-jdk-23+30.jar
99+
java/libs.javacapi/external/nb-javac-jdk-23+35-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-23+35-api.jar
100+
java/libs.javacapi/external/nb-javac-jdk-23+35.jar java/libs.nbjavacapi/external/nb-javac-jdk-23+35.jar
101101

102102
# Used only in unittests for mysql db specific tests
103103
ide/db.metadata.model/external/mysql-connector-j-8.0.31.jar ide/db.mysql/external/mysql-connector-j-8.0.31.jar

0 commit comments

Comments
 (0)