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 6afa3a9ce1 Update to nb-javac-19.0.1. (#5133) 6afa3a9ce1 is described below commit 6afa3a9ce1cb474cbf084ab5e7f7071c4a6eca59 Author: Dusan Balek <dusan.ba...@oracle.com> AuthorDate: Mon Jan 2 11:55:54 2023 +0100 Update to nb-javac-19.0.1. (#5133) --- .../src/org/netbeans/modules/java/hints/jdk/ConvertToARMTest.java | 4 ++-- java/libs.javacapi/external/binaries-list | 4 ++-- ...vac-jdk-19+33-license.txt => nb-javac-jdk-19.0.1-ga-license.txt} | 4 ++-- java/libs.javacapi/nbproject/project.xml | 4 ++-- java/libs.nbjavacapi/external/binaries-list | 4 ++-- ...vac-jdk-19+33-license.txt => nb-javac-jdk-19.0.1-ga-license.txt} | 4 ++-- java/libs.nbjavacapi/nbproject/project.properties | 4 ++-- java/libs.nbjavacapi/nbproject/project.xml | 4 ++-- .../src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java | 4 ++-- .../unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java | 4 +--- nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps | 6 +++--- 11 files changed, 22 insertions(+), 24 deletions(-) diff --git a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToARMTest.java b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToARMTest.java index c83b01acaa..646b28402e 100644 --- a/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToARMTest.java +++ b/java/java.hints/test/unit/src/org/netbeans/modules/java/hints/jdk/ConvertToARMTest.java @@ -537,7 +537,7 @@ public class ConvertToARMTest extends NbTestCase { .run(ConvertToARM.class) .findWarning("0:173-0:175:verifier:TXT_ConvertToARM") .applyFix("FIX_MergeTryResources") - .assertOutput("package test;import java.io.InputStream;import java.io.FileInputStream;import java.io.File;public class Test { public void test() throws Exception { try (InputStream in = new FileInputStream(new File(\"a\"));InputStream in2 = new FileInputStream(new File(\"a\"))){ in.read(); } }}"); + .assertOutput("package test;import java.io.InputStream;import java.io.FileInputStream;import java.io.File;public class Test { public void test() throws Exception { try (InputStream in = new FileInputStream(new File(\"a\")); InputStream in2 = new FileInputStream(new File(\"a\"))){ in.read(); } }}"); } public void testEFNestedInStms() throws Exception { @@ -559,7 +559,7 @@ public class ConvertToARMTest extends NbTestCase { .run(ConvertToARM.class) .findWarning("0:247-0:249:verifier:TXT_ConvertToARM") .applyFix("FIX_MergeTryResources") - .assertOutput("package test;import java.io.InputStream;import java.io.FileInputStream;import java.io.File;public class Test { public void test(InputStream in) throws Exception { try (in;InputStream in2 = new FileInputStream(new File(\"a\"))){ in.read(); } }}"); + .assertOutput("package test;import java.io.InputStream;import java.io.FileInputStream;import java.io.File;public class Test { public void test(InputStream in) throws Exception { try (in; InputStream in2 = new FileInputStream(new File(\"a\"))){ in.read(); } }}"); } public void testEnclosedFinally() throws Exception { diff --git a/java/libs.javacapi/external/binaries-list b/java/libs.javacapi/external/binaries-list index b42feac2b1..3cab39c037 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. -DBA592C75DD52B97EC88A6B06ADF71D4F3C3DED9 com.dukescript.nbjavac:nb-javac:jdk-19+33:api -A36688EDA1DE51508A039AED3518771C6F75E416 com.dukescript.nbjavac:nb-javac:jdk-19+33 +D0586059323C762A59E1874B8CC74E2F959D618D com.dukescript.nbjavac:nb-javac:jdk-19.0.1-ga:api +D4DDCBEA7886EF3AFC900CA51A76E12B93757ECB com.dukescript.nbjavac:nb-javac:jdk-19.0.1-ga diff --git a/java/libs.javacapi/external/nb-javac-jdk-19+33-license.txt b/java/libs.javacapi/external/nb-javac-jdk-19.0.1-ga-license.txt similarity index 99% rename from java/libs.javacapi/external/nb-javac-jdk-19+33-license.txt rename to java/libs.javacapi/external/nb-javac-jdk-19.0.1-ga-license.txt index 8123b5ff80..31772aadad 100644 --- a/java/libs.javacapi/external/nb-javac-jdk-19+33-license.txt +++ b/java/libs.javacapi/external/nb-javac-jdk-19.0.1-ga-license.txt @@ -1,7 +1,7 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: jdk-19+33 -Files: nb-javac-jdk-19+33-api.jar nb-javac-jdk-19+33.jar +Version: jdk-19.0.1-ga +Files: nb-javac-jdk-19.0.1-ga-api.jar nb-javac-jdk-19.0.1-ga.jar License: GPL-2-CP Origin: OpenJDK (https://github.com/openjdk/jdk19) Source: https://github.com/openjdk/jdk19 diff --git a/java/libs.javacapi/nbproject/project.xml b/java/libs.javacapi/nbproject/project.xml index 35901e2eb3..1caa00b53d 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-19+33-api.jar</binary-origin> + <binary-origin>external/nb-javac-jdk-19.0.1-ga-api.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path /> - <binary-origin>external/nb-javac-jdk-19+33.jar</binary-origin> + <binary-origin>external/nb-javac-jdk-19.0.1-ga.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 b42feac2b1..3cab39c037 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. -DBA592C75DD52B97EC88A6B06ADF71D4F3C3DED9 com.dukescript.nbjavac:nb-javac:jdk-19+33:api -A36688EDA1DE51508A039AED3518771C6F75E416 com.dukescript.nbjavac:nb-javac:jdk-19+33 +D0586059323C762A59E1874B8CC74E2F959D618D com.dukescript.nbjavac:nb-javac:jdk-19.0.1-ga:api +D4DDCBEA7886EF3AFC900CA51A76E12B93757ECB com.dukescript.nbjavac:nb-javac:jdk-19.0.1-ga diff --git a/java/libs.nbjavacapi/external/nb-javac-jdk-19+33-license.txt b/java/libs.nbjavacapi/external/nb-javac-jdk-19.0.1-ga-license.txt similarity index 99% rename from java/libs.nbjavacapi/external/nb-javac-jdk-19+33-license.txt rename to java/libs.nbjavacapi/external/nb-javac-jdk-19.0.1-ga-license.txt index 770d20b881..409d214a52 100644 --- a/java/libs.nbjavacapi/external/nb-javac-jdk-19+33-license.txt +++ b/java/libs.nbjavacapi/external/nb-javac-jdk-19.0.1-ga-license.txt @@ -1,7 +1,7 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Files: nb-javac-jdk-19+33-api.jar nb-javac-jdk-19+33.jar -Version: jdk-19+33 +Files: nb-javac-jdk-19.0.1-ga-api.jar nb-javac-jdk-19.0.1-ga.jar +Version: jdk-19.0.1-ga License: GPL-2-CP Origin: OpenJDK (https://github.com/openjdk/jdk19) Source: https://github.com/openjdk/jdk19 diff --git a/java/libs.nbjavacapi/nbproject/project.properties b/java/libs.nbjavacapi/nbproject/project.properties index f8f0952adf..e4582a328c 100644 --- a/java/libs.nbjavacapi/nbproject/project.properties +++ b/java/libs.nbjavacapi/nbproject/project.properties @@ -18,5 +18,5 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP -release.external/nb-javac-jdk-19+33-api.jar=modules/ext/nb-javac-jdk-19-api.jar -release.external/nb-javac-jdk-19+33.jar=modules/ext/nb-javac-jdk-19.jar +release.external/nb-javac-jdk-19.0.1-ga-api.jar=modules/ext/nb-javac-jdk-19-api.jar +release.external/nb-javac-jdk-19.0.1-ga.jar=modules/ext/nb-javac-jdk-19.jar diff --git a/java/libs.nbjavacapi/nbproject/project.xml b/java/libs.nbjavacapi/nbproject/project.xml index 5b801b83fb..5c2fa6a80a 100644 --- a/java/libs.nbjavacapi/nbproject/project.xml +++ b/java/libs.nbjavacapi/nbproject/project.xml @@ -37,11 +37,11 @@ <public-packages/> <class-path-extension> <runtime-relative-path>ext/nb-javac-jdk-19-api.jar</runtime-relative-path> - <binary-origin>external/nb-javac-jdk-19+33-api.jar</binary-origin> + <binary-origin>external/nb-javac-jdk-19.0.1-ga-api.jar</binary-origin> </class-path-extension> <class-path-extension> <runtime-relative-path>ext/nb-javac-jdk-19.jar</runtime-relative-path> - <binary-origin>external/nb-javac-jdk-19+33.jar</binary-origin> + <binary-origin>external/nb-javac-jdk-19.0.1-ga.jar</binary-origin> </class-path-extension> </data> </configuration> diff --git a/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java b/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java index d50f59c2a9..4411e9c217 100644 --- a/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java +++ b/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/UtilitiesTest.java @@ -234,7 +234,7 @@ public class UtilitiesTest extends TestBase { assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - String golden = "try ($t$ final $type $name = $init) { $stmts$; }$catches$"; + String golden = "try ($t$ $type $name = $init) { $stmts$; }$catches$"; String resultString = result.toString(); //nb-javac: nb-javac and JDK's javac produce different semicolons for the TWR resources: resultString = resultString.replace("$t$;", "$t$"); @@ -250,7 +250,7 @@ public class UtilitiesTest extends TestBase { assertTrue(result.getKind().name(), result.getKind() == Kind.TRY); - String golden = "try (final $t $n = $init$) { $stmts$; }$catches$"; + String golden = "try ($t $n = $init$) { $stmts$; }$catches$"; String resultString = result.toString(); //nb-javac: nb-javac and JDK's javac produce different semicolons for the TWR resources: resultString = resultString.replace("$init$;", "$init$"); diff --git a/java/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java b/java/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java index 228d548956..3957df6cc5 100644 --- a/java/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java +++ b/java/spi.java.hints/test/unit/src/org/netbeans/spi/java/hints/JavaFixUtilitiesTest.java @@ -536,9 +536,7 @@ public class JavaFixUtilitiesTest extends TestBase { "import java.io.InputStream;\n" + "public class Test {\n" + " private void t() throws Exception {\n" + -// " try (InputStream in = null) {\n" + - //XXX: - " try (final InputStream in = null) {\n" + + " try (InputStream in = null) {\n" + " } finally {\n" + " in.close()\n" + " }\n" + diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 2fedbd6dfe..b5352b7639 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -115,11 +115,11 @@ 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-19+33-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-19+33-api.jar -java/libs.javacapi/external/nb-javac-jdk-19+33.jar java/libs.nbjavacapi/external/nb-javac-jdk-19+33.jar +java/libs.javacapi/external/nb-javac-jdk-19.0.1-ga-api.jar java/libs.nbjavacapi/external/nb-javac-jdk-19.0.1-ga-api.jar +java/libs.javacapi/external/nb-javac-jdk-19.0.1-ga.jar java/libs.nbjavacapi/external/nb-javac-jdk-19.0.1-ga.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.6-bin.zip # 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 \ No newline at end of file +ide/db.metadata.model/external/mysql-connector-j-8.0.31.jar ide/db.mysql/external/mysql-connector-j-8.0.31.jar --------------------------------------------------------------------- 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