This is an automated email from the ASF dual-hosted git repository.
neilcsmith 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 8ebb35d [NETBEANS-3825] nb-javac Upgrade to JDK-14
new 43b26e5 Merge pull request #2277 from Akshay-Gupta-Oracle/nb_javac_14
8ebb35d is described below
commit 8ebb35d204a599405b5cc7a367eb371aa347cf95
Author: Akshay-Gupta-Oracle <akshay.ag.gu...@oracle.com>
AuthorDate: Mon Jul 27 14:36:04 2020 +0530
[NETBEANS-3825] nb-javac Upgrade to JDK-14
---
.../hints/suggestions/ExpectedTypeResolver.java | 15 ++++++
.../hints/jdk/ConvertToPatternInstanceOfTest.java | 21 ++++----
.../netbeans/modules/java/source/TreeShims.java | 9 ++++
.../api/java/source/ElementHandleTest.java | 11 +++++
java/libs.javacapi/external/binaries-list | 2 +-
...api-license.txt => nb-javac-14-api-license.txt} | 2 +-
java/libs.javacapi/nbproject/project.xml | 2 +-
java/libs.javacimpl/external/binaries-list | 2 +-
...pl-license.txt => nb-javac-14-impl-license.txt} | 2 +-
java/libs.javacimpl/nbproject/project.xml | 2 +-
.../modules/java/hints/spiimpl/Utilities.java | 57 ++++++++++++++++++++++
nb/updatecenters/extras/nbjavac.api/manifest.mf | 2 +-
.../extras/nbjavac.api/nbproject/project.xml | 4 +-
.../modules/ext/nb-javac-13-api.jar.external | 6 ---
.../modules/ext/nb-javac-14-api.jar.external | 6 +++
nb/updatecenters/extras/nbjavac.impl/manifest.mf | 2 +-
.../extras/nbjavac.impl/nbproject/project.xml | 4 +-
.../modules/ext/nb-javac-13-impl.jar.external | 6 ---
.../modules/ext/nb-javac-14-impl.jar.external | 6 +++
nb/updatecenters/licenseinfo.xml | 4 +-
nbbuild/templates/projectized.xml | 2 +-
21 files changed, 128 insertions(+), 39 deletions(-)
diff --git
a/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
b/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
index 8bf7951..a2424e5 100644
---
a/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
+++
b/java/java.hints/src/org/netbeans/modules/java/hints/suggestions/ExpectedTypeResolver.java
@@ -25,6 +25,7 @@ import com.sun.source.tree.ArrayTypeTree;
import com.sun.source.tree.AssertTree;
import com.sun.source.tree.AssignmentTree;
import com.sun.source.tree.BinaryTree;
+import com.sun.source.tree.BindingPatternTree;
import com.sun.source.tree.BlockTree;
import com.sun.source.tree.BreakTree;
import com.sun.source.tree.CaseTree;
@@ -67,6 +68,7 @@ import com.sun.source.tree.ProvidesTree;
import com.sun.source.tree.RequiresTree;
import com.sun.source.tree.ReturnTree;
import com.sun.source.tree.Scope;
+import com.sun.source.tree.SwitchExpressionTree;
import com.sun.source.tree.SwitchTree;
import com.sun.source.tree.SynchronizedTree;
import com.sun.source.tree.ThrowTree;
@@ -81,6 +83,7 @@ import com.sun.source.tree.UsesTree;
import com.sun.source.tree.VariableTree;
import com.sun.source.tree.WhileLoopTree;
import com.sun.source.tree.WildcardTree;
+import com.sun.source.tree.YieldTree;
import com.sun.source.util.SourcePositions;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.code.Type.CapturedType;
@@ -1388,4 +1391,16 @@ public class ExpectedTypeResolver implements
TreeVisitor<List<? extends TypeMirr
public List<? extends TypeMirror> visitUses(UsesTree node, Object p) {
return null;
}
+
+ public List<? extends TypeMirror> visitBindingPattern(BindingPatternTree
bpt, Object p) {
+ return null;
+ }
+
+ public List<? extends TypeMirror>
visitSwitchExpression(SwitchExpressionTree set, Object p) {
+ return null;
+ }
+
+ public List<? extends TypeMirror> visitYield(YieldTree yt, Object p) {
+ return null;
+ }
}
diff --git
a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToPatternInstanceOfTest.java
b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToPatternInstanceOfTest.java
index 14ea3d4..1982bbd 100644
---
a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToPatternInstanceOfTest.java
+++
b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToPatternInstanceOfTest.java
@@ -18,9 +18,9 @@
*/
package org.netbeans.modules.java.hints.jdk;
-import javax.lang.model.SourceVersion;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.hints.test.api.HintTest;
+import javax.lang.model.SourceVersion;
/**
*
@@ -44,6 +44,8 @@ public class ConvertToPatternInstanceOfTest extends
NbTestCase {
" return -1;\n" +
" }\n" +
"}\n")
+ .sourceLevel(SourceVersion.latest().name())
+ .options("--enable-preview")
.run(ConvertToPatternInstanceOf.class)
.findWarning("3:8-3:10:verifier:" +
Bundle.ERR_ConvertToPatternInstanceOf())
.applyFix()
@@ -72,6 +74,8 @@ public class ConvertToPatternInstanceOfTest extends
NbTestCase {
" }\n" +
" }\n" +
"}\n")
+ .sourceLevel(SourceVersion.latest().name())
+ .options("--enable-preview")
.run(ConvertToPatternInstanceOf.class)
.findWarning("3:8-3:10:verifier:" +
Bundle.ERR_ConvertToPatternInstanceOf())
.applyFix()
@@ -99,6 +103,8 @@ public class ConvertToPatternInstanceOfTest extends
NbTestCase {
" return -1;\n" +
" }\n" +
"}\n")
+ .sourceLevel(SourceVersion.latest().name())
+ .options("--enable-preview")
.run(ConvertToPatternInstanceOf.class)
.findWarning("3:8-3:10:verifier:" +
Bundle.ERR_ConvertToPatternInstanceOf())
.applyFix()
@@ -125,6 +131,8 @@ public class ConvertToPatternInstanceOfTest extends
NbTestCase {
" return -1;\n" +
" }\n" +
"}\n")
+ .sourceLevel(SourceVersion.latest().name())
+ .options("--enable-preview")
.run(ConvertToPatternInstanceOf.class)
.findWarning("3:8-3:10:verifier:" +
Bundle.ERR_ConvertToPatternInstanceOf())
.applyFix()
@@ -140,15 +148,4 @@ public class ConvertToPatternInstanceOfTest extends
NbTestCase {
"}\n");
}
- @Override
- protected void runTest() throws Throwable {
- try {
- SourceVersion.valueOf("RELEASE_14");
- } catch (IllegalArgumentException ex) {
- //OK, skip test
- return ;
- }
- super.runTest();
- }
-
}
diff --git
a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
index 5e7b042..88504aa 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/TreeShims.java
@@ -228,4 +228,13 @@ public class TreeShims {
public static boolean isRecordComponent(ElementKind kind) {
return "RECORD_COMPONENT".equals(kind.name());
}
+
+ public static ElementKind getRecordKind() {
+ try {
+ return ElementKind.valueOf(RECORD); //NOI18N
+ } catch (IllegalArgumentException ex) {
+ return null;
+ }
+ }
+
}
diff --git
a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ElementHandleTest.java
b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ElementHandleTest.java
index d38785b..e113741 100644
---
a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ElementHandleTest.java
+++
b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/ElementHandleTest.java
@@ -53,6 +53,7 @@ import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.java.source.BootClassPathUtil;
import org.netbeans.modules.java.source.ElementUtils;
import org.netbeans.modules.java.source.TestUtil;
+import org.netbeans.modules.java.source.TreeShims;
import org.netbeans.modules.java.source.usages.IndexUtil;
import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
@@ -73,6 +74,7 @@ public class ElementHandleTest extends NbTestCase {
private FileObject src;
private FileObject data;
+ private String orignalNetbeansUsr;
static {
@@ -129,9 +131,15 @@ public class ElementHandleTest extends NbTestCase {
ClassPathProviderImpl.getDefault().setClassPaths(TestUtil.getBootClassPath(),
ClassPathSupport.createClassPath(new URL[0]),
ClassPathSupport.createClassPath(new FileObject[]{this.src}));
+ orignalNetbeansUsr = System.getProperty("netbeans.user");
+ System.setProperty("netbeans.user", getWorkDirPath());
}
protected void tearDown() throws Exception {
+ if (orignalNetbeansUsr != null)
+ System.setProperty("netbeans.user", orignalNetbeansUsr);
+ else
+ System.clearProperty("netbeans.user");
}
@@ -426,6 +434,9 @@ public class ElementHandleTest extends NbTestCase {
ElementKind.ENUM,
ElementKind.ANNOTATION_TYPE
}));
+ ElementKind recordKind = TreeShims.getRecordKind();
+ if (recordKind != null)
+ allowed.add(recordKind);
for (ElementKind aek : allowed) {
ElementHandle<TypeElement> eh =
ElementHandle.createTypeElementHandle(aek, "org.me.Foo"); //NOI18N
assertEquals(aek, eh.getKind());
diff --git a/java/libs.javacapi/external/binaries-list
b/java/libs.javacapi/external/binaries-list
index d9def00..178d876 100644
--- a/java/libs.javacapi/external/binaries-list
+++ b/java/libs.javacapi/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-FC7D04B1F1AE92A87F113096862112BE7E6970D4 nb-javac-13-api.jar
+1B02BEB46868327A9A10BBBB7B71CCDE974FAF44 nb-javac-14-api.jar
diff --git a/java/libs.javacapi/external/nb-javac-13-api-license.txt
b/java/libs.javacapi/external/nb-javac-14-api-license.txt
similarity index 99%
rename from java/libs.javacapi/external/nb-javac-13-api-license.txt
rename to java/libs.javacapi/external/nb-javac-14-api-license.txt
index 5f55457..d2aec9e 100644
--- a/java/libs.javacapi/external/nb-javac-13-api-license.txt
+++ b/java/libs.javacapi/external/nb-javac-14-api-license.txt
@@ -1,6 +1,6 @@
Name: Javac Compiler API
Description: Javac Compiler API
-Version: 13
+Version: 14
License: GPL-2-CP
Origin: OpenJDK (http://hg.openjdk.java.net/)
Source: http://hg.netbeans.org/main/nb-java-x/
diff --git a/java/libs.javacapi/nbproject/project.xml
b/java/libs.javacapi/nbproject/project.xml
index 0dc3ad9..2bd65c9 100644
--- a/java/libs.javacapi/nbproject/project.xml
+++ b/java/libs.javacapi/nbproject/project.xml
@@ -40,7 +40,7 @@
</public-packages>
<class-path-extension>
<runtime-relative-path />
- <binary-origin>external/nb-javac-13-api.jar</binary-origin>
+ <binary-origin>external/nb-javac-14-api.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/java/libs.javacimpl/external/binaries-list
b/java/libs.javacimpl/external/binaries-list
index 8461b2c..8eb8b24 100644
--- a/java/libs.javacimpl/external/binaries-list
+++ b/java/libs.javacimpl/external/binaries-list
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-34E9F9C1BDC61FE7EFCCF305D70960B862DE7815 nb-javac-13-impl.jar
+E8DE691178EC01A9396DE4AF2C6D836FA47BC8F6 nb-javac-14-impl.jar
diff --git a/java/libs.javacimpl/external/nb-javac-13-impl-license.txt
b/java/libs.javacimpl/external/nb-javac-14-impl-license.txt
similarity index 99%
rename from java/libs.javacimpl/external/nb-javac-13-impl-license.txt
rename to java/libs.javacimpl/external/nb-javac-14-impl-license.txt
index 7f1b8ff..99a03a9 100644
--- a/java/libs.javacimpl/external/nb-javac-13-impl-license.txt
+++ b/java/libs.javacimpl/external/nb-javac-14-impl-license.txt
@@ -1,6 +1,6 @@
Name: Javac Compiler Implementation
Description: Javac Compiler Implementation
-Version: 13
+Version: 14
License: GPL-2-CP
Origin: OpenJDK (http://hg.openjdk.java.net/)
Source: http://hg.netbeans.org/main/nb-java-x/
diff --git a/java/libs.javacimpl/nbproject/project.xml
b/java/libs.javacimpl/nbproject/project.xml
index 6b0987f..c382b99 100644
--- a/java/libs.javacimpl/nbproject/project.xml
+++ b/java/libs.javacimpl/nbproject/project.xml
@@ -37,7 +37,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path />
- <binary-origin>external/nb-javac-13-impl.jar</binary-origin>
+ <binary-origin>external/nb-javac-14-impl.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
index 03deb95..85c12ca 100644
---
a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
+++
b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/Utilities.java
@@ -111,6 +111,8 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
import javax.lang.model.element.AnnotationValueVisitor;
@@ -1352,6 +1354,33 @@ public class Utilities {
return super.modifiersOpt(partial);
}
+
+ public JCVariableDecl formalParameter(boolean lambdaParam, boolean
recordComponents) {
+ if (token.kind == TokenKind.IDENTIFIER) {
+ if (token.name().startsWith(dollar)) {
+ com.sun.tools.javac.util.Name name = token.name();
+
+ Token peeked = S.token(1);
+
+ if (peeked.kind == TokenKind.COMMA || peeked.kind ==
TokenKind.RPAREN) {
+ nextToken();
+ return JackpotTrees.createVariableWildcard(ctx, name);
+ }
+ }
+ }
+ JCTree.JCVariableDecl result = null;
+ try {
+ Class[] paramTypes = {boolean.class, boolean.class};
+ result = (JCTree.JCVariableDecl) MethodHandles.lookup()
+ .findSpecial(JavacParser.class, "formalParameter",
MethodType.methodType(JCTree.JCVariableDecl.class, paramTypes),
JackpotJavacParser.class) // NOI18N
+ .invoke(this, lambdaParam, recordComponents);
+ } catch (Throwable ex) {
+ throw new IllegalStateException(ex);
+ }
+ return result;
+
+ }
+
@Override
public JCVariableDecl formalParameter(boolean lambdaParam) {
if (token.kind == TokenKind.IDENTIFIER) {
@@ -1408,7 +1437,35 @@ public class Utilities {
}
return super.catchClause();
}
+
+ public com.sun.tools.javac.util.List<JCTree>
classOrInterfaceOrRecordBodyDeclaration(com.sun.tools.javac.util.Name
className, boolean isInterface, boolean isRecord) {
+ if (token.kind == TokenKind.IDENTIFIER) {
+ if (token.name().startsWith(dollar)) {
+ com.sun.tools.javac.util.Name name = token.name();
+
+ Token peeked = S.token(1);
+
+ if (peeked.kind == TokenKind.SEMI) {
+ nextToken();
+ nextToken();
+
+ return
com.sun.tools.javac.util.List.<JCTree>of(F.Ident(name));
+ }
+ }
+ }
+
+ com.sun.tools.javac.util.List<JCTree> result = null;
+ Class[] argsType = {com.sun.tools.javac.util.Name.class,
boolean.class, boolean.class};
+ try {
+ result = (com.sun.tools.javac.util.List<JCTree>)
MethodHandles.lookup().findSpecial(JavacParser.class,
"classOrInterfaceOrRecordBodyDeclaration",
MethodType.methodType(com.sun.tools.javac.util.List.class, argsType),
JackpotJavacParser.class) // NOI18N
+ .invoke(this, className, false, false);
+ } catch (Throwable ex) {
+ throw new IllegalStateException(ex);
+ }
+ return result;
+ }
+
@Override
public com.sun.tools.javac.util.List<JCTree>
classOrInterfaceBodyDeclaration(com.sun.tools.javac.util.Name className,
boolean isInterface) {
if (token.kind == TokenKind.IDENTIFIER) {
diff --git a/nb/updatecenters/extras/nbjavac.api/manifest.mf
b/nb/updatecenters/extras/nbjavac.api/manifest.mf
index af2837e..00bd544 100644
--- a/nb/updatecenters/extras/nbjavac.api/manifest.mf
+++ b/nb/updatecenters/extras/nbjavac.api/manifest.mf
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.nbjavac.api
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/nbjavac/api/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.1
+OpenIDE-Module-Specification-Version: 2.2
OpenIDE-Module-Hide-Classpath-Packages: com.sun.javadoc.**, com.sun.source.**,
javax.annotation.processing.**, javax.lang.model.**, javax.tools.**,
com.sun.tools.javac.**
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javacapi
diff --git a/nb/updatecenters/extras/nbjavac.api/nbproject/project.xml
b/nb/updatecenters/extras/nbjavac.api/nbproject/project.xml
index 8ebde33..a2bfb3d 100644
--- a/nb/updatecenters/extras/nbjavac.api/nbproject/project.xml
+++ b/nb/updatecenters/extras/nbjavac.api/nbproject/project.xml
@@ -28,8 +28,8 @@
<module-dependencies/>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/nb-javac-13-api.jar</runtime-relative-path>
-
<binary-origin>release/modules/ext/nb-javac-13-api.jar</binary-origin>
+
<runtime-relative-path>ext/nb-javac-14-api.jar</runtime-relative-path>
+
<binary-origin>release/modules/ext/nb-javac-14-api.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external
deleted file mode 100644
index 09a444a..0000000
---
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external
+++ /dev/null
@@ -1,6 +0,0 @@
-CRC:520567768
-SIZE:230395
-URL:https://netbeans.osuosl.org/binaries/FC7D04B1F1AE92A87F113096862112BE7E6970D4-nb-javac-13-api.jar
-URL:https://hg.netbeans.org/binaries/FC7D04B1F1AE92A87F113096862112BE7E6970D4-nb-javac-13-api.jar
-MessageDigest: SHA-256
eb36f3a1714010028d0da5c6be22cdb7b7cc8cc04d618351403a57c9b10adbfc
-MessageDigest: SHA-512
bdf48bef2578cd66df8c3a95e6ad1dc022ee136806674dcf791f43829d050f20b565b367b47a5524fb8d62c0f58187a1e0317429526fd219f324033830ac3e57
\ No newline at end of file
diff --git
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-14-api.jar.external
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-14-api.jar.external
new file mode 100644
index 0000000..18af6f5
--- /dev/null
+++
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-14-api.jar.external
@@ -0,0 +1,6 @@
+CRC:872844248
+SIZE:250999
+URL:https://netbeans.osuosl.org/binaries/1B02BEB46868327A9A10BBBB7B71CCDE974FAF44-nb-javac-14-api.jar
+URL:https://hg.netbeans.org/binaries/1B02BEB46868327A9A10BBBB7B71CCDE974FAF44-nb-javac-14-api.jar
+MessageDigest: SHA-256
8d2498c8fcdcf532e8bfbb74d68c8e90be965d274a9685dd4407c11d4ac69d1b
+MessageDigest: SHA-512
eff974128bd9bee3946a7696a0f7f3f21083035670f900a585d0d097c3c15cbafd98726c7d81cbc0c471646e455276c9613e9ef87c2a0660c3cae0074e6bdf79
\ No newline at end of file
diff --git a/nb/updatecenters/extras/nbjavac.impl/manifest.mf
b/nb/updatecenters/extras/nbjavac.impl/manifest.mf
index a9caa64..ac72632 100644
--- a/nb/updatecenters/extras/nbjavac.impl/manifest.mf
+++ b/nb/updatecenters/extras/nbjavac.impl/manifest.mf
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
OpenIDE-Module: org.netbeans.modules.nbjavac.impl
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/nbjavac/impl/Bundle.properties
-OpenIDE-Module-Specification-Version: 2.1
+OpenIDE-Module-Specification-Version: 2.2
OpenIDE-Module-Hide-Classpath-Packages: com.sun.tools.javac.**,
com.sun.tools.javadoc.**, com.sun.tools.javap.**, com.sun.tools.classfile.**,
com.sun.tools.doclint.**
OpenIDE-Module-Fragment-Host: org.netbeans.libs.javacimpl
OpenIDE-Module-Provides: org.netbeans.modules.nbjavac
diff --git a/nb/updatecenters/extras/nbjavac.impl/nbproject/project.xml
b/nb/updatecenters/extras/nbjavac.impl/nbproject/project.xml
index 8436f37..93ff9e6 100644
--- a/nb/updatecenters/extras/nbjavac.impl/nbproject/project.xml
+++ b/nb/updatecenters/extras/nbjavac.impl/nbproject/project.xml
@@ -35,8 +35,8 @@
</module-dependencies>
<public-packages/>
<class-path-extension>
-
<runtime-relative-path>ext/nb-javac-13-impl.jar</runtime-relative-path>
-
<binary-origin>release/modules/ext/nb-javac-13-impl.jar</binary-origin>
+
<runtime-relative-path>ext/nb-javac-14-impl.jar</runtime-relative-path>
+
<binary-origin>release/modules/ext/nb-javac-14-impl.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external
deleted file mode 100644
index e0f65a5..0000000
---
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external
+++ /dev/null
@@ -1,6 +0,0 @@
-CRC:3482904810
-SIZE:3595235
-URL:https://netbeans.osuosl.org/binaries/34E9F9C1BDC61FE7EFCCF305D70960B862DE7815-nb-javac-13-impl.jar
-URL:https://hg.netbeans.org/binaries/34E9F9C1BDC61FE7EFCCF305D70960B862DE7815-nb-javac-13-impl.jar
-MessageDigest: SHA-256
cabea2a079534191d09cba7bfe55c0de45079a04c8ac88926b09d76ed7067879
-MessageDigest: SHA-512
55feeefd61fda43e4a9b461f405e806a751ea35c713b7fc762f149565fd8780828fcce9d73d38edfa89176f00087220bd8b99ee5135f9f551fe40e2a8768ee83
\ No newline at end of file
diff --git
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-14-impl.jar.external
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-14-impl.jar.external
new file mode 100644
index 0000000..fbfafc2
--- /dev/null
+++
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-14-impl.jar.external
@@ -0,0 +1,6 @@
+CRC:1413267252
+SIZE:3683576
+URL:https://netbeans.osuosl.org/binaries/E8DE691178EC01A9396DE4AF2C6D836FA47BC8F6-nb-javac-14-impl.jar
+URL:https://hg.netbeans.org/binaries/E8DE691178EC01A9396DE4AF2C6D836FA47BC8F6-nb-javac-14-impl.jar
+MessageDigest: SHA-256
d84172262f69d9c22e30c647fb86a6a644ac8011890930fad3d20597e0adb5f8
+MessageDigest: SHA-512
4b011d19151277a795aa5a7220400c95f26ad1f4daf1b178545b8ae97cc4ca3e0d299fffc657d5a78574db7b149866e6440a9cbc73dce732d4d37feb81ec9b62
\ No newline at end of file
diff --git a/nb/updatecenters/licenseinfo.xml b/nb/updatecenters/licenseinfo.xml
index 06e3d8e..b40fdd4 100644
--- a/nb/updatecenters/licenseinfo.xml
+++ b/nb/updatecenters/licenseinfo.xml
@@ -26,8 +26,8 @@
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
<fileset>
-
<file>extras/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external</file>
-
<file>extras/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external</file>
+
<file>extras/nbjavac.api/release/modules/ext/nb-javac-14-api.jar.external</file>
+
<file>extras/nbjavac.impl/release/modules/ext/nb-javac-14-impl.jar.external</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
diff --git a/nbbuild/templates/projectized.xml
b/nbbuild/templates/projectized.xml
index 20a06c6..d315d2d 100644
--- a/nbbuild/templates/projectized.xml
+++ b/nbbuild/templates/projectized.xml
@@ -177,7 +177,7 @@ If you are sure you want to build with JDK 9+ anyway, use:
-Dpermit.jdk9.builds=
<property name="locmakenbm.brands" value="${brandings}"/>
<!-- When requires.nb.javac property is true, prepend javac-api and
javac-impl on bootclasspath to allow override the default annotation
processing API located in rt.jar. -->
- <property name="bootclasspath.prepend.nb"
value="${nb_all}/java/libs.javacapi/external/nb-javac-13-api.jar${path.separator}${nb_all}/java/libs.javacimpl/external/nb-javac-13-impl.jar"
/>
+ <property name="bootclasspath.prepend.nb"
value="${nb_all}/java/libs.javacapi/external/nb-javac-14-api.jar${path.separator}${nb_all}/java/libs.javacimpl/external/nb-javac-14-impl.jar"
/>
<property name="bootclasspath.prepend.vanilla"
value="${nb_all}/nbbuild/external/vanilla-javac-api.jar${path.separator}${nb_all}/nbbuild/external/vanilla-javac-impl.jar"
/>
<condition property="bootclasspath.prepend"
value="${bootclasspath.prepend.nb}">
<istrue value="${requires.nb.javac.impl}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
