diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Bundle_test.properties b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Bundle_test.properties index 6bd8a6ec9cba..c0a0acced6e2 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Bundle_test.properties +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/Bundle_test.properties @@ -61,7 +61,3 @@ LBL_FIX_Make_Class_Abstract=LBL_FIX_Make_Class_Abstract LBL_FIX_Impl_Abstract_Methods=LBL_FIX_Impl_Abstract_Methods WARN_FoundConflictingMethods1=WARN_FoundConflictingMethods1 WARN_FoundConflictingMethodsMany=WARN_FoundConflictingMethodsMany - -LBL_NotInitializedVariable_fix=FIX_InitializeVariable -LBL_NotInitializedVariableCtor_fix=FIX_InitializeVariableInCtor -LBL_AddCtorParameter_fix=FIX_AddConstructorParameter \ No newline at end of file diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/NotInitializedVariableTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/NotInitializedVariableTest.java index 0eb938368eaa..7d16987761a0 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/NotInitializedVariableTest.java +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/errors/NotInitializedVariableTest.java @@ -42,7 +42,7 @@ public void testNotInitializedInDefaultConstructor() throws Exception { "public class Test {\n" + " public final String |s;" + "}\n", - "FIX_InitializeVariable", "FIX_InitializeVariableInCtor", "FIX_AddConstructorParameter"); + "Initialize variable s", "Initialize variable s in constructor(s)", "Add parameter to constructor Test()"); } public void testNotInitializedInDefaultConstructorInitialize() throws Exception { @@ -52,7 +52,7 @@ public void testNotInitializedInDefaultConstructorInitialize() throws Exception "public class Test {\n" + " public final String |s;" + "}\n", - "FIX_InitializeVariable", + "Initialize variable s", "package test; public class Test { public final String s = null;} "); } @@ -63,7 +63,7 @@ public void testNotInitializedInDefaultConstructorInitializeInConstructor() thro "public class Test {\n" + " public final String |s;" + "}\n", - "FIX_InitializeVariableInCtor", + "Initialize variable s in constructor(s)", "package test; public class Test { public final String s; public Test() { this.s = null; } } "); } @@ -76,7 +76,7 @@ public void testNotInitializedInConstructor() throws Exception { " public Test() {" + " }" + "}\n", - "FIX_InitializeVariable", "FIX_InitializeVariableInCtor", "FIX_AddConstructorParameter"); + "Initialize variable s", "Initialize variable s in constructor(s)", "Add parameter to constructor Test()"); } public void testNotInitializedInConstructorInitialize() throws Exception { @@ -88,7 +88,7 @@ public void testNotInitializedInConstructorInitialize() throws Exception { " public Test() {" + " }" + "}\n", - "FIX_InitializeVariable", + "Initialize variable s", "package test; public class Test { public final String s = null; public Test() { }} "); } @@ -101,7 +101,7 @@ public void testNotInitializedInConstructorInitializeInConstructor() throws Exce " public Test() {" + " }" + "}\n", - "FIX_InitializeVariableInCtor", + "Initialize variable s in constructor(s)", "package test; public class Test { public final String s; public Test() {this.s = null; }} "); } @@ -116,7 +116,7 @@ public void testNotInitializedInMultipleConstructors() throws Exception { " public Test(int i) {" + " }" + "}\n", - "FIX_InitializeVariable", "FIX_InitializeVariableInCtor", "FIX_AddConstructorParameter", "FIX_AddConstructorParameter"); + "Initialize variable s", "Initialize variable s in constructor(s)", "Add parameter to constructor Test()", "Add parameter to constructor Test(int i)"); } public void testNotInitializedInMultipleConstructorsInitialize() throws Exception { @@ -130,7 +130,7 @@ public void testNotInitializedInMultipleConstructorsInitialize() throws Exceptio " public Test(int i) {" + " }" + "}\n", - "FIX_InitializeVariable", + "Initialize variable s", "package test; public class Test { public final String s = null; public Test() { } public Test(int i) { }} "); } @@ -145,7 +145,7 @@ public void testNotInitializedInMultipleConstructorsInitializeInConstructor() th " public Test(int i) {" + " }" + "}\n", - "FIX_InitializeVariableInCtor", + "Initialize variable s in constructor(s)", "package test; public class Test { public final String s; public Test() {this.s = null; } public Test(int i) {this.s = null; }} "); } @@ -161,7 +161,7 @@ public void testNotInitializedInMultipleConstructors2() throws Exception { " public Test(int i) {" + " }" + "}\n", - "FIX_InitializeVariable", "FIX_InitializeVariableInCtor", "FIX_AddConstructorParameter"); + "Initialize variable s", "Initialize variable s in constructor(s)", "Add parameter to constructor Test(int i)"); } public void testNotInitializedInMultipleConstructors2Initialize() throws Exception { @@ -176,7 +176,7 @@ public void testNotInitializedInMultipleConstructors2Initialize() throws Excepti " public Test(int i) {" + " }" + "}\n", - "FIX_InitializeVariable", + "Initialize variable s", "package test; public class Test { public final String s = null; public Test() { this.s = \"test\"; } public Test(int i) { }} "); } @@ -192,7 +192,7 @@ public void testNotInitializedInMultipleConstructors2InitializeInConstructor() t " public Test(int i) {" + " }" + "}\n", - "FIX_InitializeVariableInCtor", + "Initialize variable s in constructor(s)", "package test; public class Test { public final String s; public Test() { this.s = \"test\"; } public Test(int i) {this.s = null; }} "); } diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java index a800b0e056ce..0dd76624d86f 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/infrastructure/ErrorHintsProviderTest.java @@ -267,7 +267,7 @@ public void testUnnamedClass() throws Exception { "}\n", "21", //TODO: needs to be adjusted when the error in javac is fixed: - "0:0-0:13::Test.java:3:1: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.unnamed.classes)"); + "0:0-0:13::Test.java:1:1: compiler.err.preview.feature.disabled.plural: (compiler.misc.feature.unnamed.classes)"); } private void performInlinedTest(String name, String code) throws Exception { diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java index 1dfe9e29043c..c1173c310e7b 100644 --- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java +++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/JavacParser.java @@ -1031,6 +1031,7 @@ private static JavacTaskImpl createJavacTask( } options.add(sb.toString()); } + options.add("-proc:full"); } else { options.add("-proc:none"); // NOI18N, Disable annotation processors } diff --git a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassFinderTest.java b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassFinderTest.java index 1636626f3c9e..9e3df9b1406d 100644 --- a/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassFinderTest.java +++ b/java/lib.nbjavac/test/unit/src/org/netbeans/lib/nbjavac/services/NBClassFinderTest.java @@ -56,7 +56,7 @@ public void testEmptyClassPath() throws Exception { List actualErrors; actualErrors = compile(code, "-bootclasspath", "", "--system", "none", "-XDrawDiagnostics", "-source", "8", "-XDide", "-Xlint:-options"); assertEquals(expectedErrors, actualErrors); - actualErrors = compile(code, "-bootclasspath", "", "--system", "none", "-XDrawDiagnostics", "-XDide"); + actualErrors = compile(code, "-bootclasspath", "", "--system", "none", "-XDrawDiagnostics", "-XDide", "-Xlint:-options"); assertEquals(expectedErrors, actualErrors); expectedErrors = Arrays.asList( @@ -65,7 +65,7 @@ public void testEmptyClassPath() throws Exception { ); actualErrors = compile(code, "-bootclasspath", "", "--system", "none", "-XDrawDiagnostics", "-source", "8", "-XDide", "-XDbackgroundCompilation", "-Xlint:-options"); assertEquals(expectedErrors, actualErrors); - actualErrors = compile(code, "-bootclasspath", "", "--system", "none", "-XDrawDiagnostics", "-XDide", "-XDbackgroundCompilation"); + actualErrors = compile(code, "-bootclasspath", "", "--system", "none", "-XDrawDiagnostics", "-XDide", "-XDbackgroundCompilation", "-Xlint:-options"); assertEquals(expectedErrors, actualErrors); } diff --git a/java/libs.javacapi/external/binaries-list b/java/libs.javacapi/external/binaries-list index daaef405aa7a..b2149341628c 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. -2D8ACD8AAD9C74FDAAA9D7BBAF4278A57E2D86E0 com.dukescript.nbjavac:nb-javac:jdk-21+26:api -9A9BAB9DC8497962967345A59CDD8CBC9D73A40D com.dukescript.nbjavac:nb-javac:jdk-21+26 +D5113DE0BE3E296D3D9F2139F0102FDD9EB0D993 https://oss.sonatype.org/content/repositories/comdukescript-1162/com/dukescript/nbjavac/nb-javac/jdk-21u/nb-javac-jdk-21u-api.jar nb-javac-jdk-21u-api.jar +A9C5BABB481C07742E0C4FCD150DB6E6DE2C2119 https://oss.sonatype.org/content/repositories/comdukescript-1162/com/dukescript/nbjavac/nb-javac/jdk-21u/nb-javac-jdk-21u.jar nb-javac-jdk-21u.jar diff --git a/java/libs.javacapi/external/nb-javac-jdk-21+26-license.txt b/java/libs.javacapi/external/nb-javac-jdk-21u-license.txt similarity index 99% rename from java/libs.javacapi/external/nb-javac-jdk-21+26-license.txt rename to java/libs.javacapi/external/nb-javac-jdk-21u-license.txt index dfe886bb4cc5..4af2be67d067 100644 --- a/java/libs.javacapi/external/nb-javac-jdk-21+26-license.txt +++ b/java/libs.javacapi/external/nb-javac-jdk-21u-license.txt @@ -1,7 +1,7 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: jdk-21+26 -Files: nb-javac-jdk-21+26-api.jar nb-javac-jdk-21+26.jar +Version: jdk-21u +Files: nb-javac-jdk-21u-api.jar nb-javac-jdk-21u.jar License: GPL-2-CP Origin: OpenJDK (https://github.com/openjdk/jdk21) Source: https://github.com/openjdk/jdk21 diff --git a/java/libs.javacapi/nbproject/project.xml b/java/libs.javacapi/nbproject/project.xml index f9c89a231fcf..5f6ecacc70c1 100644 --- a/java/libs.javacapi/nbproject/project.xml +++ b/java/libs.javacapi/nbproject/project.xml @@ -40,11 +40,11 @@ - external/nb-javac-jdk-21+26-api.jar + external/nb-javac-jdk-21u-api.jar - external/nb-javac-jdk-21+26.jar + external/nb-javac-jdk-21u.jar diff --git a/java/libs.nbjavacapi/external/binaries-list b/java/libs.nbjavacapi/external/binaries-list index daaef405aa7a..5baca0fa85ba 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. -2D8ACD8AAD9C74FDAAA9D7BBAF4278A57E2D86E0 com.dukescript.nbjavac:nb-javac:jdk-21+26:api -9A9BAB9DC8497962967345A59CDD8CBC9D73A40D com.dukescript.nbjavac:nb-javac:jdk-21+26 +D5113DE0BE3E296D3D9F2139F0102FDD9EB0D993 https://oss.sonatype.org/content/repositories/comdukescript-1162/com/dukescript/nbjavac/nb-javac/jdk-21u/nb-javac-jdk-21u-api.jar nb-javac-jdk-21u-api.jar +A9C5BABB481C07742E0C4FCD150DB6E6DE2C2119 https://oss.sonatype.org/content/repositories/comdukescript-1162/com/dukescript/nbjavac/nb-javac/jdk-21u/nb-javac-jdk-21u.jar nb-javac-jdk-21u.jar diff --git a/java/libs.nbjavacapi/external/nb-javac-jdk-21+26-license.txt b/java/libs.nbjavacapi/external/nb-javac-jdk-21u-license.txt similarity index 99% rename from java/libs.nbjavacapi/external/nb-javac-jdk-21+26-license.txt rename to java/libs.nbjavacapi/external/nb-javac-jdk-21u-license.txt index dfe886bb4cc5..4af2be67d067 100644 --- a/java/libs.nbjavacapi/external/nb-javac-jdk-21+26-license.txt +++ b/java/libs.nbjavacapi/external/nb-javac-jdk-21u-license.txt @@ -1,7 +1,7 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: jdk-21+26 -Files: nb-javac-jdk-21+26-api.jar nb-javac-jdk-21+26.jar +Version: jdk-21u +Files: nb-javac-jdk-21u-api.jar nb-javac-jdk-21u.jar License: GPL-2-CP Origin: OpenJDK (https://github.com/openjdk/jdk21) Source: https://github.com/openjdk/jdk21 diff --git a/java/libs.nbjavacapi/nbproject/project.properties b/java/libs.nbjavacapi/nbproject/project.properties index 9b8f0cbe5b1c..32d86b7ed2e7 100644 --- a/java/libs.nbjavacapi/nbproject/project.properties +++ b/java/libs.nbjavacapi/nbproject/project.properties @@ -18,8 +18,8 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP -release.external/nb-javac-jdk-21+26-api.jar=modules/ext/nb-javac-jdk-21-26-api.jar -release.external/nb-javac-jdk-21+26.jar=modules/ext/nb-javac-jdk-21-26.jar +release.external/nb-javac-jdk-21u-api.jar=modules/ext/nb-javac-jdk-21u-api.jar +release.external/nb-javac-jdk-21u.jar=modules/ext/nb-javac-jdk-21u.jar # for tests requires.nb.javac=true diff --git a/java/libs.nbjavacapi/nbproject/project.xml b/java/libs.nbjavacapi/nbproject/project.xml index 22fe0fa3797d..91d7424159ad 100644 --- a/java/libs.nbjavacapi/nbproject/project.xml +++ b/java/libs.nbjavacapi/nbproject/project.xml @@ -45,12 +45,12 @@ - ext/nb-javac-jdk-21-26-api.jar - external/nb-javac-jdk-21+26-api.jar + ext/nb-javac-jdk-21u-api.jar + external/nb-javac-jdk-21u-api.jar - ext/nb-javac-jdk-21-26.jar - external/nb-javac-jdk-21+26.jar + ext/nb-javac-jdk-21u.jar + external/nb-javac-jdk-21u.jar diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 0955df9c174a..a89b20082435 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -97,8 +97,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-21+26-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-21+26-api.jar -java/libs.javacapi/external/nb-javac-jdk-21+26.jar java/libs.nbjavacapi/external/nb-javac-jdk-21+26.jar +java/libs.javacapi/external/nb-javac-jdk-21u-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-21u-api.jar +java/libs.javacapi/external/nb-javac-jdk-21u.jar java/libs.nbjavacapi/external/nb-javac-jdk-21u.jar # Used only in unittests for mysql db specific tests ide/db.metadata.model/external/mysql-connector-j-8.0.31.jar ide/db.mysql/external/mysql-connector-j-8.0.31.jar