From 2a2c6559d63937d8475922ae42a7909ac8e391ea Mon Sep 17 00:00:00 2001 From: Jan Lahoda Date: Thu, 27 Nov 2025 20:04:38 +0100 Subject: [PATCH] First attempt to upgrade to JDK 26 javac. --- java/libs.javacapi/external/binaries-list | 4 ++-- ...25+31.1-license.txt => nb-javac-jdk-26+26-license.txt} | 4 ++-- java/libs.javacapi/nbproject/project.xml | 4 ++-- java/libs.nbjavacapi/external/binaries-list | 4 ++-- ...25+31.1-license.txt => nb-javac-jdk-26+26-license.txt} | 4 ++-- java/libs.nbjavacapi/nbproject/project.properties | 4 ++-- java/libs.nbjavacapi/nbproject/project.xml | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-) rename java/libs.javacapi/external/{nb-javac-jdk-25+31.1-license.txt => nb-javac-jdk-26+26-license.txt} (99%) rename java/libs.nbjavacapi/external/{nb-javac-jdk-25+31.1-license.txt => nb-javac-jdk-26+26-license.txt} (99%) diff --git a/java/libs.javacapi/external/binaries-list b/java/libs.javacapi/external/binaries-list index 04893aa33931..680f3eb77e38 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. -CD9EA8DDE23DF41A129D563A51C9A2E502BD85BF com.dukescript.nbjavac:nb-javac:jdk-25+31.1 -183E5391BCCC0A27AE0F5014A3A9FA7F93214911 com.dukescript.nbjavac:nb-javac:jdk-25+31.1:api +60E8610B8DAB0DA0D5A30E25E0FD6EE4D5E8DC27 http://lahoda.info/nb-javac/26+26/nb-javac-jdk-26+26-api.jar nb-javac-jdk-26+26-api.jar +4959B698D4108C3AFBE8CDDC42A3552088FA11AC http://lahoda.info/nb-javac/26+26/nb-javac-jdk-26+26-impl.jar nb-javac-jdk-26+26.jar diff --git a/java/libs.javacapi/external/nb-javac-jdk-25+31.1-license.txt b/java/libs.javacapi/external/nb-javac-jdk-26+26-license.txt similarity index 99% rename from java/libs.javacapi/external/nb-javac-jdk-25+31.1-license.txt rename to java/libs.javacapi/external/nb-javac-jdk-26+26-license.txt index 897752a6807a..094d934d1e0c 100644 --- a/java/libs.javacapi/external/nb-javac-jdk-25+31.1-license.txt +++ b/java/libs.javacapi/external/nb-javac-jdk-26+26-license.txt @@ -1,7 +1,7 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: 25+31.1 -Files: nb-javac-jdk-25+31.1-api.jar nb-javac-jdk-25+31.1.jar +Version: 26+26 +Files: nb-javac-jdk-26+26-api.jar nb-javac-jdk-26+26.jar License: GPL-2-CP Origin: OpenJDK (https://github.com/openjdk/jdk) Source: https://github.com/openjdk/jdk diff --git a/java/libs.javacapi/nbproject/project.xml b/java/libs.javacapi/nbproject/project.xml index 85ce67de99f3..d4b7ab91337e 100644 --- a/java/libs.javacapi/nbproject/project.xml +++ b/java/libs.javacapi/nbproject/project.xml @@ -40,11 +40,11 @@ - external/nb-javac-jdk-25+31.1-api.jar + external/nb-javac-jdk-26+26-api.jar - external/nb-javac-jdk-25+31.1.jar + external/nb-javac-jdk-26+26.jar diff --git a/java/libs.nbjavacapi/external/binaries-list b/java/libs.nbjavacapi/external/binaries-list index 04893aa33931..680f3eb77e38 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. -CD9EA8DDE23DF41A129D563A51C9A2E502BD85BF com.dukescript.nbjavac:nb-javac:jdk-25+31.1 -183E5391BCCC0A27AE0F5014A3A9FA7F93214911 com.dukescript.nbjavac:nb-javac:jdk-25+31.1:api +60E8610B8DAB0DA0D5A30E25E0FD6EE4D5E8DC27 http://lahoda.info/nb-javac/26+26/nb-javac-jdk-26+26-api.jar nb-javac-jdk-26+26-api.jar +4959B698D4108C3AFBE8CDDC42A3552088FA11AC http://lahoda.info/nb-javac/26+26/nb-javac-jdk-26+26-impl.jar nb-javac-jdk-26+26.jar diff --git a/java/libs.nbjavacapi/external/nb-javac-jdk-25+31.1-license.txt b/java/libs.nbjavacapi/external/nb-javac-jdk-26+26-license.txt similarity index 99% rename from java/libs.nbjavacapi/external/nb-javac-jdk-25+31.1-license.txt rename to java/libs.nbjavacapi/external/nb-javac-jdk-26+26-license.txt index 897752a6807a..094d934d1e0c 100644 --- a/java/libs.nbjavacapi/external/nb-javac-jdk-25+31.1-license.txt +++ b/java/libs.nbjavacapi/external/nb-javac-jdk-26+26-license.txt @@ -1,7 +1,7 @@ Name: Javac Compiler Implementation Description: Javac Compiler Implementation -Version: 25+31.1 -Files: nb-javac-jdk-25+31.1-api.jar nb-javac-jdk-25+31.1.jar +Version: 26+26 +Files: nb-javac-jdk-26+26-api.jar nb-javac-jdk-26+26.jar License: GPL-2-CP Origin: OpenJDK (https://github.com/openjdk/jdk) Source: https://github.com/openjdk/jdk diff --git a/java/libs.nbjavacapi/nbproject/project.properties b/java/libs.nbjavacapi/nbproject/project.properties index efe0509fc907..a2b7d1a9d925 100644 --- a/java/libs.nbjavacapi/nbproject/project.properties +++ b/java/libs.nbjavacapi/nbproject/project.properties @@ -18,8 +18,8 @@ javac.release=17 javac.compilerargs=-Xlint -Xlint:-serial license.file.override=${nb_all}/nbbuild/licenses/GPL-2-CP -release.external/nb-javac-jdk-25+31.1-api.jar=modules/ext/nb-javac-jdk-25-31.1-api.jar -release.external/nb-javac-jdk-25+31.1.jar=modules/ext/nb-javac-jdk-25-31.1.jar +release.external/nb-javac-jdk-26+26-api.jar=modules/ext/nb-javac-jdk-26-26-api.jar +release.external/nb-javac-jdk-26+26.jar=modules/ext/nb-javac-jdk-26-26.jar # for tests requires.nb.javac=true diff --git a/java/libs.nbjavacapi/nbproject/project.xml b/java/libs.nbjavacapi/nbproject/project.xml index 19d916447aee..fb9e0153bd53 100644 --- a/java/libs.nbjavacapi/nbproject/project.xml +++ b/java/libs.nbjavacapi/nbproject/project.xml @@ -45,12 +45,12 @@ - ext/nb-javac-jdk-25-31.1-api.jar - external/nb-javac-jdk-25+31.1-api.jar + ext/nb-javac-jdk-26-26-api.jar + external/nb-javac-jdk-26+26-api.jar - ext/nb-javac-jdk-25-31.1.jar - external/nb-javac-jdk-25+31.1.jar + ext/nb-javac-jdk-26-26.jar + external/nb-javac-jdk-26+26.jar