This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch delivery
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/delivery by this push:
new 79ccf1d [NETBEANS-5055][NETBEANS-5109] Update to (Maven distributed)
nbjavac 15.0.0.2
new 0536335 Merge pull request #2759 from matthiasblaesing/update-nbjavac
79ccf1d is described below
commit 79ccf1da4baf745d792831794c83f2bbbe9c8c70
Author: Akshay=Gupta=Oracle <akshay.ag.gu...@oracle.com>
AuthorDate: Fri Feb 12 15:45:43 2021 +0530
[NETBEANS-5055][NETBEANS-5109] Update to (Maven distributed) nbjavac
15.0.0.2
As part of the nbjavac update to issues are fixed:
- the new nbjavac version fixes an issue where permits is treated
as a keyword and variables with that name are flagged as faulty
[NETBEANS-5055]
- The distribution of nbjavac was moved to maven central
[NETBEANS-5109]
---
java/libs.javacapi/external/binaries-list | 2 +-
...b-javac-15-api-license.txt => nb-javac-15.0.0.2-api-license.txt} | 2 +-
java/libs.javacapi/nbproject/project.xml | 2 +-
java/libs.javacimpl/external/binaries-list | 2 +-
.../{nb-javac-15-impl-license.txt => nb-javac-15.0.0.2-license.txt} | 2 +-
java/libs.javacimpl/nbproject/project.xml | 2 +-
nb/updatecenters/extras/nbjavac.api/manifest.mf | 2 +-
nb/updatecenters/extras/nbjavac.api/nbproject/project.xml | 4 ++--
.../nbjavac.api/release/modules/ext/nb-javac-15-api.jar.external | 6 ------
.../release/modules/ext/nb-javac-15.0.0.2-api.jar.external | 5 +++++
nb/updatecenters/extras/nbjavac.impl/manifest.mf | 2 +-
nb/updatecenters/extras/nbjavac.impl/nbproject/project.xml | 4 ++--
.../nbjavac.impl/release/modules/ext/nb-javac-15-impl.jar.external | 6 ------
.../release/modules/ext/nb-javac-15.0.0.2-impl.jar.external | 5 +++++
nb/updatecenters/licenseinfo.xml | 4 ++--
nbbuild/templates/projectized.xml | 2 +-
16 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/java/libs.javacapi/external/binaries-list
b/java/libs.javacapi/external/binaries-list
index 3070bde..fcdfdd6 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.
-267AFC87A08301145B10D86DA674724B884F010C nb-javac-15-api.jar
\ No newline at end of file
+E83D8755DF07D560A633A45A2340419CD1313E8D
com.dukescript.nbjavac:nb-javac:15.0.0.2:api
\ No newline at end of file
diff --git a/java/libs.javacapi/external/nb-javac-15-api-license.txt
b/java/libs.javacapi/external/nb-javac-15.0.0.2-api-license.txt
similarity index 99%
rename from java/libs.javacapi/external/nb-javac-15-api-license.txt
rename to java/libs.javacapi/external/nb-javac-15.0.0.2-api-license.txt
index e7f2cfa..f15ab01 100644
--- a/java/libs.javacapi/external/nb-javac-15-api-license.txt
+++ b/java/libs.javacapi/external/nb-javac-15.0.0.2-api-license.txt
@@ -1,6 +1,6 @@
Name: Javac Compiler API
Description: Javac Compiler API
-Version: 15
+Version: 15.0.0.2
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 d4d16d2..6d4c69c 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-15-api.jar</binary-origin>
+
<binary-origin>external/nb-javac-15.0.0.2-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 025eabf..115ef66 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.
-E03FFC36A80D76A138C5CC8096DFDD7E7BACEE7E nb-javac-15-impl.jar
\ No newline at end of file
+9A4B6A8063E2EE78FF2F12542AC2C06C11B07F61
com.dukescript.nbjavac:nb-javac:15.0.0.2
\ No newline at end of file
diff --git a/java/libs.javacimpl/external/nb-javac-15-impl-license.txt
b/java/libs.javacimpl/external/nb-javac-15.0.0.2-license.txt
similarity index 99%
rename from java/libs.javacimpl/external/nb-javac-15-impl-license.txt
rename to java/libs.javacimpl/external/nb-javac-15.0.0.2-license.txt
index b860944..df8f7fe 100644
--- a/java/libs.javacimpl/external/nb-javac-15-impl-license.txt
+++ b/java/libs.javacimpl/external/nb-javac-15.0.0.2-license.txt
@@ -1,6 +1,6 @@
Name: Javac Compiler Implementation
Description: Javac Compiler Implementation
-Version: 15
+Version: 15.0.0.2
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 54b76d5..90d4da4 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-15-impl.jar</binary-origin>
+ <binary-origin>external/nb-javac-15.0.0.2.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git a/nb/updatecenters/extras/nbjavac.api/manifest.mf
b/nb/updatecenters/extras/nbjavac.api/manifest.mf
index fafb1a0..a159562 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.3
+OpenIDE-Module-Specification-Version: 2.4
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 a1dc9a8..ecac547 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-15-api.jar</runtime-relative-path>
-
<binary-origin>release/modules/ext/nb-javac-15-api.jar</binary-origin>
+
<runtime-relative-path>ext/nb-javac-15.0.0.2-api.jar</runtime-relative-path>
+
<binary-origin>release/modules/ext/nb-javac-15.0.0.2-api.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15-api.jar.external
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15-api.jar.external
deleted file mode 100644
index 2f2ff3b..0000000
---
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15-api.jar.external
+++ /dev/null
@@ -1,6 +0,0 @@
-CRC:2157920864
-SIZE:252431
-URL:https://netbeans.osuosl.org/binaries/267AFC87A08301145B10D86DA674724B884F010C-nb-javac-15-api.jar
-URL:https://hg.netbeans.org/binaries/267AFC87A08301145B10D86DA674724B884F010C-nb-javac-15-api.jar
-MessageDigest: SHA-256
0a5e9b6afbdb86deb3286f37e1dee230c91f39438e55dc77910c9a48f38a2ffb
-MessageDigest: SHA-512
5b16a0c6466dc14cf2d428d4a84398f9de2d1782acf445c8da5ca874f807ac550db8b551ec41495963a29c2f400ca24ee8a70b1d589d0cdf2f05af5cb0f4ff56
\ No newline at end of file
diff --git
a/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
new file mode 100644
index 0000000..0abbc18
--- /dev/null
+++
b/nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external
@@ -0,0 +1,5 @@
+CRC:3736270701
+SIZE:210532
+URL:m2:/com.dukescript.nbjavac:nb-javac:15.0.0.2:jar:api
+MessageDigest: SHA-256
20dae9df239aa1d346c56b744aee741f753611e7470640ff1ff7b1731283ed1b
+MessageDigest: SHA-512
e12e603815159cbb348d8d3e73588d8ad549b41cac21831fa1228c0ab9bf23ce18d162b6fe7679de9d249fc2cb3a627edd35ebf2f3851dfd6d2513e1da741447
\ 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 0a37a20..494638e 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.3
+OpenIDE-Module-Specification-Version: 2.4
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 5784e85..d933acf 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-15-impl.jar</runtime-relative-path>
-
<binary-origin>release/modules/ext/nb-javac-15-impl.jar</binary-origin>
+
<runtime-relative-path>ext/nb-javac-15.0.0.2-impl.jar</runtime-relative-path>
+
<binary-origin>release/modules/ext/nb-javac-15.0.0.2-impl.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
diff --git
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15-impl.jar.external
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15-impl.jar.external
deleted file mode 100644
index fdfef79..0000000
---
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15-impl.jar.external
+++ /dev/null
@@ -1,6 +0,0 @@
-CRC:2366439669
-SIZE:3743735
-URL:https://netbeans.osuosl.org/binaries/E03FFC36A80D76A138C5CC8096DFDD7E7BACEE7E-nb-javac-15-impl.jar
-URL:https://hg.netbeans.org/binaries/E03FFC36A80D76A138C5CC8096DFDD7E7BACEE7E-nb-javac-15-impl.jar
-MessageDigest: SHA-256
c9caa104c663166fd8c1b127861b4f196674044b27494d86674b9cf399040c38
-MessageDigest: SHA-512
83b219a3c1c02adc25cdc146a33ef3c431bd5b5e3816f1dc9367f8997eba90509c87c560dda0276f78363ba81f1a8f8dcca201c60946288ca8f9d67ad9010724
\ No newline at end of file
diff --git
a/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
new file mode 100644
index 0000000..4e44592
--- /dev/null
+++
b/nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-impl.jar.external
@@ -0,0 +1,5 @@
+CRC:1851126890
+SIZE:3511612
+URL: m2:/com.dukescript.nbjavac:nb-javac:15.0.0.2:jar
+MessageDigest: SHA-256
809b68535b8d5e564802deba7489308f01041acaf0731584544ffd96c6d385c1
+MessageDigest: SHA-512
e450cf9da202dee89ef79bff65fab1a287bd97d08ecc2ea19fbeedd8a16ce79371fbc0a72c68d353d8d13cae18e015ad862b28962cd2f6e43874f52767e99de7
\ No newline at end of file
diff --git a/nb/updatecenters/licenseinfo.xml b/nb/updatecenters/licenseinfo.xml
index bf1b93a..12893ee 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-15-api.jar.external</file>
-
<file>extras/nbjavac.impl/release/modules/ext/nb-javac-15-impl.jar.external</file>
+
<file>extras/nbjavac.api/release/modules/ext/nb-javac-15.0.0.2-api.jar.external</file>
+
<file>extras/nbjavac.impl/release/modules/ext/nb-javac-15.0.0.2-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 867d9ca..7e30eb8 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-15-api.jar${path.separator}${nb_all}/java/libs.javacimpl/external/nb-javac-15-impl.jar"
/>
+ <property name="bootclasspath.prepend.nb"
value="${nb_all}/java/libs.javacapi/external/nb-javac-15.0.0.2-api.jar${path.separator}${nb_all}/java/libs.javacimpl/external/nb-javac-15.0.0.2.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
