You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by db...@apache.org on 2022/03/21 16:06:50 UTC
[netbeans] branch master updated: Updating nb-javac to version 18. (#3729)
This is an automated email from the ASF dual-hosted git repository.
dbalek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new e041446 Updating nb-javac to version 18. (#3729)
e041446 is described below
commit e041446a3bad6615fe6c258489d482f103e096ef
Author: Dusan Balek <du...@oracle.com>
AuthorDate: Mon Mar 21 17:06:28 2022 +0100
Updating nb-javac to version 18. (#3729)
---
.../java/hints/errors/DifferentCaseKindsFix.java | 2 +-
.../java/hints/errors/CreateMethodTest.java | 42 +++++++++----------
.../api/java/source/DocTreePathHandle.java | 7 ++--
.../modules/java/source/save/CasualDiff.java | 2 +-
java/libs.javacapi/external/binaries-list | 4 +-
.../external/nb-javac-jdk-18+36-license.txt} | 8 ++--
.../nbproject/org-netbeans-libs-javacapi.sig | 47 +++++++++++++++++-----
java/libs.javacapi/nbproject/project.xml | 4 +-
java/libs.nbjavacapi/external/binaries-list | 4 +-
.../external/nb-javac-jdk-18+36-license.txt} | 8 ++--
java/libs.nbjavacapi/nbproject/project.properties | 4 +-
java/libs.nbjavacapi/nbproject/project.xml | 8 ++--
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 8 ++--
13 files changed, 88 insertions(+), 60 deletions(-)
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java
index a1df80a..3afb93e 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/DifferentCaseKindsFix.java
@@ -70,7 +70,7 @@ public class DifferentCaseKindsFix implements ErrorRule<Void> {
caseTrees = ((SwitchExpressionTree) parentPath.getLeaf()).getCases();
} else {
flag = true;
- caseTrees = ((SwitchTree) treePath.getParentPath().getLeaf()).getCases();
+ caseTrees = ((SwitchTree) parentPath.getLeaf()).getCases();
}
boolean completesNormally = false;
boolean wasDefault = false;
diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/CreateMethodTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/CreateMethodTest.java
index 73b341d..99b5fdf 100644
--- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/CreateMethodTest.java
+++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/CreateMethodTest.java
@@ -86,14 +86,14 @@ public class CreateMethodTest extends ErrorHintsTestBase {
performFixTest("test/Test.java",
"package test; public class Test {public void test() {test2(null);}}", 82 - 25,
"CreateMethodFix:test2(java.lang.Object object)void:test.Test",
- "package test; public class Test {public void test() {test2(null);} private void test2(Object object) { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test; public class Test {public void test() {test2(null);} private void test2(Object object) { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethod77038() throws Exception {
performFixTest("test/Test.java",
"package test; public class Test {public void test() {b(test2() ? true : false);} void t(boolean b){}}", 82 - 25,
"CreateMethodFix:test2()boolean:test.Test",
- "package test; public class Test {public void test() {b(test2() ? true : false);} void t(boolean b){} private boolean test2() { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test; public class Test {public void test() {b(test2() ? true : false);} void t(boolean b){} private boolean test2() { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethod82923() throws Exception {
@@ -105,7 +105,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
"package test; import java.util.Collection; public class Test {public static void test() {fff(getStrings());} private static Collection<String> getStrings() {return null;}}",
116 - 25,
"CreateMethodFix:fff(java.util.Collection<java.lang.String> strings)void:test.Test",
- "package test; import java.util.Collection; public class Test {public static void test() {fff(getStrings());} private static Collection<String> getStrings() {return null;} private static void fff(Collection<String> strings) { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test; import java.util.Collection; public class Test {public static void test() {fff(getStrings());} private static Collection<String> getStrings() {return null;} private static void fff(Collection<String> strings) { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethod74129() throws Exception {
@@ -113,7 +113,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
performFixTest("test/Test.java",
"package test; public class Test {public void test() {TopLevel.f|ff();}} class TopLevel {}",
"CreateMethodFix:fff()void:test.TopLevel",
- "package test; public class Test {public void test() {TopLevel.fff();}} class TopLevel { static void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test; public class Test {public void test() {TopLevel.fff();}} class TopLevel { static void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethod76498() throws Exception {
@@ -121,7 +121,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
"package test; public class Test {public static class T extends Test {public void test() {super.fff();}}}",
122 - 25,
"CreateMethodFix:fff()void:test.Test",
- "package test; public class Test { private void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } public static class T extends Test {public void test() {super.fff();}}}");
+ "package test; public class Test { private void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } public static class T extends Test {public void test() {super.fff();}}}");
}
@RandomlyFails
public void testCreateMethod75069() throws Exception {
@@ -129,35 +129,35 @@ public class CreateMethodTest extends ErrorHintsTestBase {
"package test; public class Test<T> {public void test() {this.fff();}}",
88 - 25,
"CreateMethodFix:fff()void:test.Test",
- "package test; public class Test<T> {public void test() {this.fff();} private void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test; public class Test<T> {public void test() {this.fff();} private void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethod119037() throws Exception {
performFixTest("test/Test.java",
"package test; public class Test {static {f|ff();}}",
"CreateMethodFix:fff()void:test.Test",
- "package test; public class Test {static {fff();} private static void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test; public class Test {static {fff();} private static void fff() { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethodWithAnonymousParameter104820() throws Exception {
performFixTest("test/Test.java",
"package test;public class Test {public static void method() {final Test ac = new Test();new Runnable() {public void run() {ac.a|ction(this);}};}}",
"CreateMethodFix:action(java.lang.Runnable aThis)void:test.Test",
- "package test;public class Test {public static void method() {final Test ac = new Test();new Runnable() {public void run() {ac.action(this);}};} private void action(Runnable aThis) { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } }");
+ "package test;public class Test {public static void method() {final Test ac = new Test();new Runnable() {public void run() {ac.action(this);}};} private void action(Runnable aThis) { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } }");
}
@RandomlyFails
public void testCreateMethodWithEnumParam() throws Exception {
performFixTest("test/Test.java",
"package test; public class Test { enum Paddle{UP, DOWN} public void foo() {f|ff(Paddle.UP);}}",
"CreateMethodFix:fff(test.Test.Paddle paddle)void:test.Test",
- "package test; public class Test { private void fff(Paddle paddle) { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } enum Paddle{UP, DOWN} public void foo() {fff(Paddle.UP);}}");
+ "package test; public class Test { private void fff(Paddle paddle) { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } enum Paddle{UP, DOWN} public void foo() {fff(Paddle.UP);}}");
}
@RandomlyFails
public void testCreateMethodWithParamOfEnumType199793() throws Exception {
performFixTest("test/Test.java",
"package test; public class Test { enum Paddle{UP, DOWN} public void foo(Paddle test) {f|ff(test);}}",
"CreateMethodFix:fff(test.Test.Paddle test)void:test.Test",
- "package test; public class Test { private void fff(Paddle test) { throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. } enum Paddle{UP, DOWN} public void foo(Paddle test) {fff(test);}}");
+ "package test; public class Test { private void fff(Paddle test) { throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody } enum Paddle{UP, DOWN} public void foo(Paddle test) {fff(test);}}");
}
@RandomlyFails
public void test220582() throws Exception {
@@ -179,7 +179,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" }\n" +
" }\n" +
" private boolean isNew(String name) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates.\n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody\n" +
" }\n" +
"}\n").replaceAll("[ \n\t\r]+", " "));
}
@@ -201,7 +201,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" Field f = method(c);\n" +
" }\n" +
" private Field method(Class<?> c) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates.\n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody\n" +
" }\n" +
"}\n").replaceAll("[ \n\t\r]+", " "));
}
@@ -223,7 +223,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" Field f = method(c1, c2);\n" +
" }\n" +
" private <T extends Number & CharSequence, E extends Integer> Field method(Class<E> c1, Class<T> c2) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates.\n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody\n" +
" }\n" +
"}\n").replaceAll("[ \n\t\r]+", " "));
}
@@ -245,7 +245,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" Class<E> cr = method(c);\n" +
" }\n" +
" private <T extends Number & CharSequence, E> Class<E> method(Class<T> c) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates.\n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody\n" +
" }\n" +
"}\n").replaceAll("[ \n\t\r]+", " "));
}
@@ -271,7 +271,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" getName(undefined());\n" +
" }\n" +
" private String undefined() {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
"}\n" +
"class Aux {\n" +
@@ -297,7 +297,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" }\n" +
" public static void m(String str) {}\n" +
" private static void m(Number str) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
"}\n").replaceAll("[ \n\t\r]+", " "));
}
@@ -319,7 +319,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" test(this::undef);\n" +
" }\n" +
" private void undef() {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
"}\n").replaceAll("[ \n\t\r]+", " "));
}
@@ -338,7 +338,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
("package test;\n" +
"public class Test {\n" +
" private static void undef() {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
" public void test(Runnable r) {\n" +
" test(Test::undef);\n" +
@@ -367,7 +367,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" test(Test::undef);\n" +
" }\n" +
" private void undef() {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
" public interface I<T> {\n" +
" public void run(T t);\n" +
@@ -394,7 +394,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
("package test;\n" +
"public class Test {\n" +
" private static void undef(Test t) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
" public void test(I<Test> r) {\n" +
" test(Test::undef);\n" +
@@ -427,7 +427,7 @@ public class CreateMethodTest extends ErrorHintsTestBase {
" test(this::undef);\n" +
" }\n" +
" private void undef(Test t) {\n" +
- " throw new UnsupportedOperationException(\"Not supported yet.\"); //To change body of generated methods, choose Tools | Templates. \n" +
+ " throw new UnsupportedOperationException(\"Not supported yet.\"); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody \n" +
" }\n" +
" public interface I<T> {\n" +
" public void run(T t);\n" +
diff --git a/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java b/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java
index 16e8203..a6a79ec 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/DocTreePathHandle.java
@@ -26,6 +26,7 @@ import com.sun.source.util.DocTreePathScanner;
import com.sun.source.util.DocTreeScanner;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.tree.DCTree;
+import com.sun.tools.javac.util.JCDiagnostic;
import java.io.IOException;
import java.util.ArrayList;
@@ -164,8 +165,8 @@ public final class DocTreePathHandle {
if(treePathHandle.getFileObject() == null) {
return null;
}
- int position = (int) ((DCTree) docTreePath.getLeaf()).getSourcePosition((DCTree.DCDocComment)docTreePath.getDocComment());
- if (position == (-1)) {
+ JCDiagnostic.DiagnosticPosition position = ((DCTree) docTreePath.getLeaf()).pos((DCTree.DCDocComment)docTreePath.getDocComment());
+ if (position == null) {
DocTree docTree = docTreePath.getLeaf();
if(docTree == docTreePath.getDocComment()) {
return new DocTreePathHandle(new DocCommentDelegate(treePathHandle));
@@ -174,7 +175,7 @@ public final class DocTreePathHandle {
assert index != (-1);
return new DocTreePathHandle(new CountingDelegate(treePathHandle, index, docTreePath.getLeaf().getKind()));
}
- Position pos = createPositionRef(treePathHandle.getFileObject(), position, Bias.Forward);
+ Position pos = createPositionRef(treePathHandle.getFileObject(), position.getPreferredPosition(), Bias.Forward);
return new DocTreePathHandle(new DocTreeDelegate(pos, new DocTreeDelegate.KindPath(docTreePath), treePathHandle));
}
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
index 9d0ed6b..37ba99a 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/CasualDiff.java
@@ -5312,7 +5312,7 @@ public class CasualDiff {
}
private int getOldPos(DCTree oldT, DCDocComment doc) {
- return (int) oldT.getSourcePosition(doc);
+ return oldT.pos(doc).getStartPosition();
}
public int endPos(DCTree oldT, DCDocComment doc) {
diff --git a/java/libs.javacapi/external/binaries-list b/java/libs.javacapi/external/binaries-list
index 053e13a..a6c5b19 100644
--- a/java/libs.javacapi/external/binaries-list
+++ b/java/libs.javacapi/external/binaries-list
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-D201700827FE5767B2022E284E796E3F2614007E com.dukescript.nbjavac:nb-javac:jdk-17.0.1-ga:api
-9D66EEDA42EEBFEB17FEABE51DB92438AB71D934 com.dukescript.nbjavac:nb-javac:jdk-17.0.1-ga
+2449F4A630A5493F55CC013CF452632AE93007CA com.dukescript.nbjavac:nb-javac:jdk-18+36:api
+DC722E7A5691677C02F315A7E669BE20C47E70B1 com.dukescript.nbjavac:nb-javac:jdk-18+36
diff --git a/java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga-license.txt b/java/libs.javacapi/external/nb-javac-jdk-18+36-license.txt
similarity index 99%
rename from java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga-license.txt
rename to java/libs.javacapi/external/nb-javac-jdk-18+36-license.txt
index f5ea486..6b27fab 100644
--- a/java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga-license.txt
+++ b/java/libs.javacapi/external/nb-javac-jdk-18+36-license.txt
@@ -1,10 +1,10 @@
Name: Javac Compiler Implementation
Description: Javac Compiler Implementation
-Version: jdk-17.0.1-ga
-Files: nb-javac-jdk-17.0.1-ga-api.jar nb-javac-jdk-17.0.1-ga.jar
+Version: jdk-18+36
+Files: nb-javac-jdk-18+36-api.jar nb-javac-jdk-18+36.jar
License: GPL-2-CP
-Origin: OpenJDK (https://github.com/openjdk/jdk17)
-Source: https://github.com/openjdk/jdk17
+Origin: OpenJDK (https://github.com/openjdk/jdk18)
+Source: https://github.com/openjdk/jdk18
Type: optional,reviewed
Comment: The binary has been reviewed to be under the Classpath Exception as a whole. Optional at runtime, but used by default.
diff --git a/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig b/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig
index b97eb72..e66d8b6 100644
--- a/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig
+++ b/java/libs.javacapi/nbproject/org-netbeans-libs-javacapi.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 8.37.0
+#Version 8.38.0
CLSS public abstract interface com.sun.source.doctree.AttributeTree
innr public final static !enum ValueKind
@@ -83,6 +83,7 @@ fld public final static com.sun.source.doctree.DocTree$Kind SERIAL
fld public final static com.sun.source.doctree.DocTree$Kind SERIAL_DATA
fld public final static com.sun.source.doctree.DocTree$Kind SERIAL_FIELD
fld public final static com.sun.source.doctree.DocTree$Kind SINCE
+fld public final static com.sun.source.doctree.DocTree$Kind SNIPPET
fld public final static com.sun.source.doctree.DocTree$Kind START_ELEMENT
fld public final static com.sun.source.doctree.DocTree$Kind SUMMARY
fld public final static com.sun.source.doctree.DocTree$Kind SYSTEM_PROPERTY
@@ -131,6 +132,7 @@ meth public {com.sun.source.doctree.DocTreeVisitor%0} visitDocType(com.sun.sourc
meth public {com.sun.source.doctree.DocTreeVisitor%0} visitHidden(com.sun.source.doctree.HiddenTree,{com.sun.source.doctree.DocTreeVisitor%1})
meth public {com.sun.source.doctree.DocTreeVisitor%0} visitIndex(com.sun.source.doctree.IndexTree,{com.sun.source.doctree.DocTreeVisitor%1})
meth public {com.sun.source.doctree.DocTreeVisitor%0} visitProvides(com.sun.source.doctree.ProvidesTree,{com.sun.source.doctree.DocTreeVisitor%1})
+meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSnippet(com.sun.source.doctree.SnippetTree,{com.sun.source.doctree.DocTreeVisitor%1})
meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSummary(com.sun.source.doctree.SummaryTree,{com.sun.source.doctree.DocTreeVisitor%1})
meth public {com.sun.source.doctree.DocTreeVisitor%0} visitSystemProperty(com.sun.source.doctree.SystemPropertyTree,{com.sun.source.doctree.DocTreeVisitor%1})
meth public {com.sun.source.doctree.DocTreeVisitor%0} visitUses(com.sun.source.doctree.UsesTree,{com.sun.source.doctree.DocTreeVisitor%1})
@@ -223,6 +225,11 @@ CLSS public abstract interface com.sun.source.doctree.SinceTree
intf com.sun.source.doctree.BlockTagTree
meth public abstract java.util.List<? extends com.sun.source.doctree.DocTree> getBody()
+CLSS public abstract interface com.sun.source.doctree.SnippetTree
+intf com.sun.source.doctree.InlineTagTree
+meth public abstract com.sun.source.doctree.TextTree getBody()
+meth public abstract java.util.List<? extends com.sun.source.doctree.DocTree> getAttributes()
+
CLSS public abstract interface com.sun.source.doctree.StartElementTree
intf com.sun.source.doctree.DocTree
meth public abstract boolean isSelfClosing()
@@ -912,6 +919,7 @@ meth public abstract com.sun.source.doctree.SerialDataTree newSerialDataTree(jav
meth public abstract com.sun.source.doctree.SerialFieldTree newSerialFieldTree(com.sun.source.doctree.IdentifierTree,com.sun.source.doctree.ReferenceTree,java.util.List<? extends com.sun.source.doctree.DocTree>)
meth public abstract com.sun.source.doctree.SerialTree newSerialTree(java.util.List<? extends com.sun.source.doctree.DocTree>)
meth public abstract com.sun.source.doctree.SinceTree newSinceTree(java.util.List<? extends com.sun.source.doctree.DocTree>)
+meth public abstract com.sun.source.doctree.SnippetTree newSnippetTree(java.util.List<? extends com.sun.source.doctree.DocTree>,com.sun.source.doctree.TextTree)
meth public abstract com.sun.source.doctree.StartElementTree newStartElementTree(javax.lang.model.element.Name,java.util.List<? extends com.sun.source.doctree.DocTree>,boolean)
meth public abstract com.sun.source.doctree.SystemPropertyTree newSystemPropertyTree(javax.lang.model.element.Name)
meth public abstract com.sun.source.doctree.TextTree newTextTree(java.lang.String)
@@ -981,6 +989,7 @@ meth public {com.sun.source.util.DocTreeScanner%0} visitSerial(com.sun.source.do
meth public {com.sun.source.util.DocTreeScanner%0} visitSerialData(com.sun.source.doctree.SerialDataTree,{com.sun.source.util.DocTreeScanner%1})
meth public {com.sun.source.util.DocTreeScanner%0} visitSerialField(com.sun.source.doctree.SerialFieldTree,{com.sun.source.util.DocTreeScanner%1})
meth public {com.sun.source.util.DocTreeScanner%0} visitSince(com.sun.source.doctree.SinceTree,{com.sun.source.util.DocTreeScanner%1})
+meth public {com.sun.source.util.DocTreeScanner%0} visitSnippet(com.sun.source.doctree.SnippetTree,{com.sun.source.util.DocTreeScanner%1})
meth public {com.sun.source.util.DocTreeScanner%0} visitStartElement(com.sun.source.doctree.StartElementTree,{com.sun.source.util.DocTreeScanner%1})
meth public {com.sun.source.util.DocTreeScanner%0} visitSummary(com.sun.source.doctree.SummaryTree,{com.sun.source.util.DocTreeScanner%1})
meth public {com.sun.source.util.DocTreeScanner%0} visitSystemProperty(com.sun.source.doctree.SystemPropertyTree,{com.sun.source.util.DocTreeScanner%1})
@@ -1071,6 +1080,7 @@ meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSerial(com.sun.sou
meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSerialData(com.sun.source.doctree.SerialDataTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSerialField(com.sun.source.doctree.SerialFieldTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSince(com.sun.source.doctree.SinceTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
+meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSnippet(com.sun.source.doctree.SnippetTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitStartElement(com.sun.source.doctree.StartElementTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSummary(com.sun.source.doctree.SummaryTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
meth public {com.sun.source.util.SimpleDocTreeVisitor%0} visitSystemProperty(com.sun.source.doctree.SystemPropertyTree,{com.sun.source.util.SimpleDocTreeVisitor%1})
@@ -1502,6 +1512,12 @@ meth public abstract void printMessage(javax.tools.Diagnostic$Kind,java.lang.Cha
meth public abstract void printMessage(javax.tools.Diagnostic$Kind,java.lang.CharSequence,javax.lang.model.element.Element)
meth public abstract void printMessage(javax.tools.Diagnostic$Kind,java.lang.CharSequence,javax.lang.model.element.Element,javax.lang.model.element.AnnotationMirror)
meth public abstract void printMessage(javax.tools.Diagnostic$Kind,java.lang.CharSequence,javax.lang.model.element.Element,javax.lang.model.element.AnnotationMirror,javax.lang.model.element.AnnotationValue)
+meth public void printError(java.lang.CharSequence)
+meth public void printError(java.lang.CharSequence,javax.lang.model.element.Element)
+meth public void printNote(java.lang.CharSequence)
+meth public void printNote(java.lang.CharSequence,javax.lang.model.element.Element)
+meth public void printWarning(java.lang.CharSequence)
+meth public void printWarning(java.lang.CharSequence,javax.lang.model.element.Element)
CLSS public abstract interface javax.annotation.processing.ProcessingEnvironment
meth public abstract java.util.Locale getLocale()
@@ -1567,6 +1583,7 @@ fld public final static javax.lang.model.SourceVersion RELEASE_14
fld public final static javax.lang.model.SourceVersion RELEASE_15
fld public final static javax.lang.model.SourceVersion RELEASE_16
fld public final static javax.lang.model.SourceVersion RELEASE_17
+fld public final static javax.lang.model.SourceVersion RELEASE_18
fld public final static javax.lang.model.SourceVersion RELEASE_2
fld public final static javax.lang.model.SourceVersion RELEASE_3
fld public final static javax.lang.model.SourceVersion RELEASE_4
@@ -1575,6 +1592,7 @@ fld public final static javax.lang.model.SourceVersion RELEASE_6
fld public final static javax.lang.model.SourceVersion RELEASE_7
fld public final static javax.lang.model.SourceVersion RELEASE_8
fld public final static javax.lang.model.SourceVersion RELEASE_9
+meth public nbjavac.RuntimeWR$Version runtimeVersion()
meth public static boolean isIdentifier(java.lang.CharSequence)
meth public static boolean isKeyword(java.lang.CharSequence)
meth public static boolean isKeyword(java.lang.CharSequence,javax.lang.model.SourceVersion)
@@ -1583,6 +1601,7 @@ meth public static boolean isName(java.lang.CharSequence,javax.lang.model.Source
meth public static javax.lang.model.SourceVersion latest()
meth public static javax.lang.model.SourceVersion latestSupported()
meth public static javax.lang.model.SourceVersion valueOf(java.lang.String)
+meth public static javax.lang.model.SourceVersion valueOf(nbjavac.RuntimeWR$Version)
meth public static javax.lang.model.SourceVersion[] values()
supr java.lang.Enum<javax.lang.model.SourceVersion>
hfds latestSupported
@@ -1684,6 +1703,7 @@ meth public abstract java.util.List<? extends javax.lang.model.element.TypeParam
meth public abstract java.util.List<? extends javax.lang.model.element.VariableElement> getParameters()
meth public abstract java.util.List<? extends javax.lang.model.type.TypeMirror> getThrownTypes()
meth public abstract javax.lang.model.element.AnnotationValue getDefaultValue()
+meth public abstract javax.lang.model.element.Element getEnclosingElement()
meth public abstract javax.lang.model.element.Name getSimpleName()
meth public abstract javax.lang.model.type.TypeMirror asType()
meth public abstract javax.lang.model.type.TypeMirror getReceiverType()
@@ -2004,7 +2024,7 @@ meth public abstract javax.lang.model.type.TypeMirror getExtendsBound()
meth public abstract javax.lang.model.type.TypeMirror getSuperBound()
CLSS public abstract javax.lang.model.util.AbstractAnnotationValueVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
supr javax.lang.model.util.AbstractAnnotationValueVisitor9<{javax.lang.model.util.AbstractAnnotationValueVisitor14%0},{javax.lang.model.util.AbstractAnnotationValueVisitor14%1}>
@@ -2035,7 +2055,7 @@ cons protected init()
supr javax.lang.model.util.AbstractAnnotationValueVisitor8<{javax.lang.model.util.AbstractAnnotationValueVisitor9%0},{javax.lang.model.util.AbstractAnnotationValueVisitor9%1}>
CLSS public abstract javax.lang.model.util.AbstractElementVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
meth public abstract {javax.lang.model.util.AbstractElementVisitor14%0} visitRecordComponent(javax.lang.model.element.RecordComponentElement,{javax.lang.model.util.AbstractElementVisitor14%1})
supr javax.lang.model.util.AbstractElementVisitor9<{javax.lang.model.util.AbstractElementVisitor14%0},{javax.lang.model.util.AbstractElementVisitor14%1}>
@@ -2070,7 +2090,7 @@ meth public abstract {javax.lang.model.util.AbstractElementVisitor9%0} visitModu
supr javax.lang.model.util.AbstractElementVisitor8<{javax.lang.model.util.AbstractElementVisitor9%0},{javax.lang.model.util.AbstractElementVisitor9%1}>
CLSS public abstract javax.lang.model.util.AbstractTypeVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
supr javax.lang.model.util.AbstractTypeVisitor9<{javax.lang.model.util.AbstractTypeVisitor14%0},{javax.lang.model.util.AbstractTypeVisitor14%1}>
@@ -2128,7 +2148,7 @@ supr java.lang.Object
hfds CONSTRUCTOR_KIND,FIELD_KINDS,METHOD_KIND,MODULE_KIND,PACKAGE_KIND,RECORD_COMPONENT_KIND,TYPE_KINDS
CLSS public javax.lang.model.util.ElementKindVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
cons protected init({javax.lang.model.util.ElementKindVisitor14%0})
meth public {javax.lang.model.util.ElementKindVisitor14%0} visitRecordComponent(javax.lang.model.element.RecordComponentElement,{javax.lang.model.util.ElementKindVisitor14%1})
@@ -2188,7 +2208,7 @@ meth public {javax.lang.model.util.ElementKindVisitor9%0} visitModule(javax.lang
supr javax.lang.model.util.ElementKindVisitor8<{javax.lang.model.util.ElementKindVisitor9%0},{javax.lang.model.util.ElementKindVisitor9%1}>
CLSS public javax.lang.model.util.ElementScanner14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
cons protected init({javax.lang.model.util.ElementScanner14%0})
meth public {javax.lang.model.util.ElementScanner14%0} visitExecutable(javax.lang.model.element.ExecutableElement,{javax.lang.model.util.ElementScanner14%1})
@@ -2261,10 +2281,12 @@ meth public javax.lang.model.element.ModuleElement getModuleElement(java.lang.Ch
meth public javax.lang.model.element.ModuleElement getModuleOf(javax.lang.model.element.Element)
meth public javax.lang.model.element.PackageElement getPackageElement(javax.lang.model.element.ModuleElement,java.lang.CharSequence)
meth public javax.lang.model.element.RecordComponentElement recordComponentFor(javax.lang.model.element.ExecutableElement)
+meth public javax.lang.model.element.TypeElement getOutermostTypeElement(javax.lang.model.element.Element)
meth public javax.lang.model.element.TypeElement getTypeElement(javax.lang.model.element.ModuleElement,java.lang.CharSequence)
meth public javax.lang.model.util.Elements$Origin getOrigin(javax.lang.model.AnnotatedConstruct,javax.lang.model.element.AnnotationMirror)
meth public javax.lang.model.util.Elements$Origin getOrigin(javax.lang.model.element.Element)
meth public javax.lang.model.util.Elements$Origin getOrigin(javax.lang.model.element.ModuleElement,javax.lang.model.element.ModuleElement$Directive)
+meth public javax.tools.JavaFileObject getFileObjectOf(javax.lang.model.element.Element)
CLSS public final static !enum javax.lang.model.util.Elements$Origin
outer javax.lang.model.util.Elements
@@ -2277,7 +2299,7 @@ meth public static javax.lang.model.util.Elements$Origin[] values()
supr java.lang.Enum<javax.lang.model.util.Elements$Origin>
CLSS public javax.lang.model.util.SimpleAnnotationValueVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
cons protected init({javax.lang.model.util.SimpleAnnotationValueVisitor14%0})
supr javax.lang.model.util.SimpleAnnotationValueVisitor9<{javax.lang.model.util.SimpleAnnotationValueVisitor14%0},{javax.lang.model.util.SimpleAnnotationValueVisitor14%1}>
@@ -2326,7 +2348,7 @@ cons protected init({javax.lang.model.util.SimpleAnnotationValueVisitor9%0})
supr javax.lang.model.util.SimpleAnnotationValueVisitor8<{javax.lang.model.util.SimpleAnnotationValueVisitor9%0},{javax.lang.model.util.SimpleAnnotationValueVisitor9%1}>
CLSS public javax.lang.model.util.SimpleElementVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
cons protected init({javax.lang.model.util.SimpleElementVisitor14%0})
meth public {javax.lang.model.util.SimpleElementVisitor14%0} visitRecordComponent(javax.lang.model.element.RecordComponentElement,{javax.lang.model.util.SimpleElementVisitor14%1})
@@ -2370,7 +2392,7 @@ meth public {javax.lang.model.util.SimpleElementVisitor9%0} visitModule(javax.la
supr javax.lang.model.util.SimpleElementVisitor8<{javax.lang.model.util.SimpleElementVisitor9%0},{javax.lang.model.util.SimpleElementVisitor9%1}>
CLSS public javax.lang.model.util.SimpleTypeVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
cons protected init({javax.lang.model.util.SimpleTypeVisitor14%0})
supr javax.lang.model.util.SimpleTypeVisitor9<{javax.lang.model.util.SimpleTypeVisitor14%0},{javax.lang.model.util.SimpleTypeVisitor14%1}>
@@ -2417,7 +2439,7 @@ cons protected init({javax.lang.model.util.SimpleTypeVisitor9%0})
supr javax.lang.model.util.SimpleTypeVisitor8<{javax.lang.model.util.SimpleTypeVisitor9%0},{javax.lang.model.util.SimpleTypeVisitor9%1}>
CLSS public javax.lang.model.util.TypeKindVisitor14<%0 extends java.lang.Object, %1 extends java.lang.Object>
- anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_17)
+ anno 0 javax.annotation.processing.SupportedSourceVersion(javax.lang.model.SourceVersion value=RELEASE_18)
cons protected init()
cons protected init({javax.lang.model.util.TypeKindVisitor14%0})
supr javax.lang.model.util.TypeKindVisitor9<{javax.lang.model.util.TypeKindVisitor14%0},{javax.lang.model.util.TypeKindVisitor14%1}>
@@ -2542,6 +2564,7 @@ CLSS public final static !enum javax.tools.DocumentationTool$Location
outer javax.tools.DocumentationTool
fld public final static javax.tools.DocumentationTool$Location DOCLET_PATH
fld public final static javax.tools.DocumentationTool$Location DOCUMENTATION_OUTPUT
+fld public final static javax.tools.DocumentationTool$Location SNIPPET_PATH
fld public final static javax.tools.DocumentationTool$Location TAGLET_PATH
intf javax.tools.JavaFileManager$Location
meth public boolean isOutputLocation()
@@ -2580,6 +2603,8 @@ CLSS public javax.tools.ForwardingJavaFileManager<%0 extends javax.tools.JavaFil
cons protected init({javax.tools.ForwardingJavaFileManager%0})
fld protected final {javax.tools.ForwardingJavaFileManager%0} fileManager
intf javax.tools.JavaFileManager
+meth public !varargs javax.tools.FileObject getFileForOutputForOriginatingFiles(javax.tools.JavaFileManager$Location,java.lang.String,java.lang.String,javax.tools.FileObject[]) throws java.io.IOException
+meth public !varargs javax.tools.JavaFileObject getJavaFileForOutputForOriginatingFiles(javax.tools.JavaFileManager$Location,java.lang.String,javax.tools.JavaFileObject$Kind,javax.tools.FileObject[]) throws java.io.IOException
meth public <%0 extends java.lang.Object> java.util.ServiceLoader<{%%0}> getServiceLoader(javax.tools.JavaFileManager$Location,java.lang.Class<{%%0}>) throws java.io.IOException
meth public boolean contains(javax.tools.JavaFileManager$Location,javax.tools.FileObject) throws java.io.IOException
meth public boolean handleOption(java.lang.String,java.util.Iterator<java.lang.String>)
@@ -2630,6 +2655,8 @@ innr public abstract interface static Location
intf java.io.Closeable
intf java.io.Flushable
intf javax.tools.OptionChecker
+meth public !varargs javax.tools.FileObject getFileForOutputForOriginatingFiles(javax.tools.JavaFileManager$Location,java.lang.String,java.lang.String,javax.tools.FileObject[]) throws java.io.IOException
+meth public !varargs javax.tools.JavaFileObject getJavaFileForOutputForOriginatingFiles(javax.tools.JavaFileManager$Location,java.lang.String,javax.tools.JavaFileObject$Kind,javax.tools.FileObject[]) throws java.io.IOException
meth public <%0 extends java.lang.Object> java.util.ServiceLoader<{%%0}> getServiceLoader(javax.tools.JavaFileManager$Location,java.lang.Class<{%%0}>) throws java.io.IOException
meth public abstract boolean handleOption(java.lang.String,java.util.Iterator<java.lang.String>)
meth public abstract boolean hasLocation(javax.tools.JavaFileManager$Location)
diff --git a/java/libs.javacapi/nbproject/project.xml b/java/libs.javacapi/nbproject/project.xml
index ad48489..da8430a 100644
--- a/java/libs.javacapi/nbproject/project.xml
+++ b/java/libs.javacapi/nbproject/project.xml
@@ -40,11 +40,11 @@
</public-packages>
<class-path-extension>
<runtime-relative-path />
- <binary-origin>external/nb-javac-jdk-17.0.1-ga-api.jar</binary-origin>
+ <binary-origin>external/nb-javac-jdk-18+36-api.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path />
- <binary-origin>external/nb-javac-jdk-17.0.1-ga.jar</binary-origin>
+ <binary-origin>external/nb-javac-jdk-18+36.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/java/libs.nbjavacapi/external/binaries-list b/java/libs.nbjavacapi/external/binaries-list
index 053e13a..a6c5b19 100644
--- a/java/libs.nbjavacapi/external/binaries-list
+++ b/java/libs.nbjavacapi/external/binaries-list
@@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-D201700827FE5767B2022E284E796E3F2614007E com.dukescript.nbjavac:nb-javac:jdk-17.0.1-ga:api
-9D66EEDA42EEBFEB17FEABE51DB92438AB71D934 com.dukescript.nbjavac:nb-javac:jdk-17.0.1-ga
+2449F4A630A5493F55CC013CF452632AE93007CA com.dukescript.nbjavac:nb-javac:jdk-18+36:api
+DC722E7A5691677C02F315A7E669BE20C47E70B1 com.dukescript.nbjavac:nb-javac:jdk-18+36
diff --git a/java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga-license.txt b/java/libs.nbjavacapi/external/nb-javac-jdk-18+36-license.txt
similarity index 99%
rename from java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga-license.txt
rename to java/libs.nbjavacapi/external/nb-javac-jdk-18+36-license.txt
index 1ed629f..f4b2392 100644
--- a/java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga-license.txt
+++ b/java/libs.nbjavacapi/external/nb-javac-jdk-18+36-license.txt
@@ -1,10 +1,10 @@
Name: Javac Compiler Implementation
Description: Javac Compiler Implementation
-Files: nb-javac-jdk-17.0.1-ga-api.jar nb-javac-jdk-17.0.1-ga.jar
-Version: jdk-17.0.1-ga
+Files: nb-javac-jdk-18+36-api.jar nb-javac-jdk-18+36.jar
+Version: jdk-18+36
License: GPL-2-CP
-Origin: OpenJDK (https://github.com/openjdk/jdk17)
-Source: https://github.com/openjdk/jdk17
+Origin: OpenJDK (https://github.com/openjdk/jdk18)
+Source: https://github.com/openjdk/jdk18
Type: compile-time,optional
Comment: Used at compile and design time to compile against; optional at runtime.
diff --git a/java/libs.nbjavacapi/nbproject/project.properties b/java/libs.nbjavacapi/nbproject/project.properties
index 679004e..eb02b90 100644
--- a/java/libs.nbjavacapi/nbproject/project.properties
+++ b/java/libs.nbjavacapi/nbproject/project.properties
@@ -18,5 +18,5 @@
javac.source=1.7
javac.compilerargs=-Xlint -Xlint:-serial
license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP
-release.external/nb-javac-jdk-17.0.1-ga-api.jar=modules/ext/nb-javac-jdk-17-api.jar
-release.external/nb-javac-jdk-17.0.1-ga.jar=modules/ext/nb-javac-jdk-17.jar
+release.external/nb-javac-jdk-18+36-api.jar=modules/ext/nb-javac-jdk-18-api.jar
+release.external/nb-javac-jdk-18+36.jar=modules/ext/nb-javac-jdk-18.jar
diff --git a/java/libs.nbjavacapi/nbproject/project.xml b/java/libs.nbjavacapi/nbproject/project.xml
index 6134279..d52072e 100644
--- a/java/libs.nbjavacapi/nbproject/project.xml
+++ b/java/libs.nbjavacapi/nbproject/project.xml
@@ -36,12 +36,12 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
- <runtime-relative-path>ext/nb-javac-jdk-17-api.jar</runtime-relative-path>
- <binary-origin>external/nb-javac-jdk-17-api.jar</binary-origin>
+ <runtime-relative-path>ext/nb-javac-jdk-18-api.jar</runtime-relative-path>
+ <binary-origin>external/nb-javac-jdk-18+36-api.jar</binary-origin>
</class-path-extension>
<class-path-extension>
- <runtime-relative-path>ext/nb-javac-jdk-17.jar</runtime-relative-path>
- <binary-origin>external/nb-javac-jdk-17.jar</binary-origin>
+ <runtime-relative-path>ext/nb-javac-jdk-18.jar</runtime-relative-path>
+ <binary-origin>external/nb-javac-jdk-18+36.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
index 14fb118..d1633da 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
@@ -40,8 +40,8 @@ nbbuild/external/langtools-9.zip nbbuild/external/langtools-9.zip
nbbuild/external/json-simple-1.1.1.jar ide/libs.json_simple/external/json-simple-1.1.1.jar
# Compile only nb-javac
-java/libs.nbjavacapi/external/nb-javac-jdk-17+35-api.jar nbbuild/external/nb-javac-jdk-17+35-api.jar
-java/libs.nbjavacapi/external/nb-javac-jdk-17+35.jar nbbuild/external/nb-javac-jdk-17+35.jar
+java/libs.nbjavacapi/external/nb-javac-jdk-18+36-api.jar nbbuild/external/nb-javac-jdk-17+36-api.jar
+java/libs.nbjavacapi/external/nb-javac-jdk-18+36.jar nbbuild/external/nb-javac-jdk-17+36.jar
# JFlex is used by multiple modules.
webcommon/javascript2.jade/external/jflex-1.4.3.jar webcommon/javascript2.lexer/external/jflex-1.4.3.jar
@@ -120,8 +120,8 @@ webcommon/javascript2.jsdoc/external/testfiles-jsdoc-1.zip webcommon/javascript2
harness/apisupport.harness/external/launcher-12.5-distribution.zip platform/o.n.bootstrap/external/launcher-12.5-distribution.zip
# only one is part of the product:
-java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga-api.jar
-java/libs.javacapi/external/nb-javac-jdk-17.0.1-ga.jar java/libs.nbjavacapi/external/nb-javac-jdk-17.0.1-ga.jar
+java/libs.javacapi/external/nb-javac-jdk-18+36-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-18+36-api.jar
+java/libs.javacapi/external/nb-javac-jdk-18+36.jar java/libs.nbjavacapi/external/nb-javac-jdk-18+36.jar
# Maven and Gradle are self-contained distributions - ignoring overlaps
platform/o.apache.commons.lang3/external/commons-lang3-3.8.1.jar java/maven.embedder/external/apache-maven-3.8.4-bin.zip
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists