Merge pull request #3560 from 1c-syntax/copilot/support-jdk25

Add JDK 25 support with Gradle 9.1.0 and migrate release workflows to JDK 25

Author: nixel2007

.github/workflows/check-package.yml

@@ -37,7 +37,7 @@ jobs:
             - name: Set up JDK
               uses: actions/setup-java@v5
               with:
-                java-version: 23
+                java-version: 25
                 distribution: 'temurin'
                 cache: gradle
 

.github/workflows/gradle.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: ['17', '21', '23']
+        java_version: ['17', '21', '25']
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
     - uses: actions/checkout@v5

.github/workflows/release.yml

@@ -34,7 +34,7 @@ jobs:
             - name: Set up JDK
               uses: actions/setup-java@v5
               with:
-                java-version: 23
+                java-version: 25
                 distribution: 'temurin'
                 cache: gradle
 

build.gradle.kts

@@ -7,13 +7,13 @@ plugins {
     `java-library`
     `maven-publish`
     jacoco
-    id("org.cadixdev.licenser") version "0.6.1"
+    id("cloud.rio.license") version "0.18.0"
     id("me.qoomon.git-versioning") version "6.4.4"
     id("io.freefair.lombok") version "9.0.0"
     id("io.freefair.javadoc-links") version "9.0.0"
     id("io.freefair.javadoc-utf-8") version "9.0.0"
     id("io.freefair.aspectj.post-compile-weaving") version "9.0.0"
-    id("io.freefair.maven-central.validate-poms") version "9.0.0"
+    // id("io.freefair.maven-central.validate-poms") version "9.0.0" // TODO: Re-enable when compatible with Gradle 9
     id("com.github.ben-manes.versions") version "0.53.0"
     id("org.springframework.boot") version "3.5.7"
     id("io.spring.dependency-management") version "1.1.7"
@@ -207,12 +207,12 @@ tasks.check {
     mustRunAfter(tasks.generateDiagnosticDocs)
 }
 
-tasks.checkLicenseMain {
+tasks.named("licenseMain") {
     dependsOn(tasks.generateSentryDebugMetaPropertiesjava)
     dependsOn(tasks.collectExternalDependenciesForSentry)
 }
 
-tasks.updateLicenseMain {
+tasks.named("licenseFormatMain") {
     dependsOn(tasks.generateSentryDebugMetaPropertiesjava)
     dependsOn(tasks.collectExternalDependenciesForSentry)
 }
@@ -267,11 +267,13 @@ tasks.javadoc {
 }
 
 license {
-    header(rootProject.file("license/HEADER.txt"))
-    newLine(false)
+    header = rootProject.file("license/HEADER.txt")
+    skipExistingHeaders = false
+    strictCheck = true
     ext["year"] = "2018-" + Calendar.getInstance().get(Calendar.YEAR)
     ext["name"] = "Alexey Sosnoviy <[email protected]>, Nikita Fedkin <[email protected]>"
     ext["project"] = "BSL Language Server"
+    mapping("java", "SLASHSTAR_STYLE")
     exclude("**/*.properties")
     exclude("**/*.xml")
     exclude("**/*.json")

docs/contributing/EnvironmentSetting.md

@@ -4,7 +4,7 @@
 
 ## Необходимое ПО
 
-* Java Development Kit 17
+* Java Development Kit 17 или новее (до JDK 25)
 * [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/)
 * Плагины IntelliJ IDEA
     * Lombok Plugin
@@ -14,7 +14,7 @@
 
 ### Настройки IntelliJ IDEA
 
-* Настроить [Java SDK на JDK17](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks)
+* Настроить [Java SDK на JDK17 или новее](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks)
 * Включить обработку аннотаций: `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors -> Enable annotation processing`
 * Выполнить настройки автоимпорта, подробно описано в [статье](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html). Отдельно стоит обратить внимание на оптимизацию импорта.
     * Не надо запускать оптимизацию импортов всего проекта, за этим следят мейнтейнеры. Если после оптимизации импортов появились измененные файлы, которые не менялись в процессе разработки, стоит уведомить мейнтейнеров и откатить эти изменения.

docs/en/contributing/EnvironmentSetting.md

@@ -4,7 +4,7 @@ Development is underway using [IntelliJ IDEA Community Edition](https://www.jetb
 
 ## Required Software
 
-* Java Development Kit 17
+* Java Development Kit 17 or newer (up to JDK 25)
 * [IntelliJ IDEA Community Edition](https://www.jetbrains.com/idea/download/)
 * Plugins IntelliJ IDEA
     * Lombok Plugin
@@ -14,7 +14,7 @@ Please note that plugins do not have to be installed - if you have Internet acce
 
 ### IntelliJ IDEA Settings
 
-* Set [Java SDK to JDK17](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks)
+* Set [Java SDK to JDK17 or newer](https://www.jetbrains.com/help/idea/sdk.html#manage_sdks)
 * Enable annotation processing: `File -> Settings -> Build, Execution, Deployment -> Compiler -> Annotation Processors -> Enable annotation processing`
 * Configure auto import settings, details in the [article](https://www.jetbrains.com/help/idea/creating-and-optimizing-imports.html). Pay special attention to import optimization.
     * There is no need to start optimization of imports of the entire project, this is followed by maintainers. If, after optimizing imports, changed files appeared that did not change during the development process, you should notify the maintainers and roll back these changes.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/LanguageServerStartCommand.java

@@ -75,7 +75,7 @@ public class LanguageServerStartCommand implements Callable<Integer> {
   public Integer call() {
 
     var configurationFile = new File(configurationOption);
-    if (configurationFile.exists()) {
+    if (configurationFile.exists() && !configurationFile.isDirectory()) {
       configuration.update(configurationFile);
     }
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/cli/WebsocketCommand.java

@@ -87,7 +87,7 @@ public class WebsocketCommand implements Callable<Integer> {
 
   public Integer call() {
     var configurationFile = new File(configurationOption);
-    if (configurationFile.exists()) {
+    if (configurationFile.exists() && !configurationFile.isDirectory()) {
       configuration.update(configurationFile);
     }
 

src/main/java/com/github/_1c_syntax/bsl/languageserver/configuration/LanguageServerConfiguration.java

@@ -50,6 +50,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 
 import static com.fasterxml.jackson.databind.MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS;
@@ -174,7 +175,7 @@ public static Path getCustomConfigurationRoot(LanguageServerConfiguration config
   }
 
   private void loadConfigurationFile(File configurationFile) {
-    if (!configurationFile.exists()) {
+    if (!configurationFile.exists() || configurationFile.isDirectory()) {
       return;
     }
 
@@ -184,8 +185,8 @@ private void loadConfigurationFile(File configurationFile) {
       .enable(ACCEPT_CASE_INSENSITIVE_ENUMS)
       .build();
 
-    try {
-      configuration = mapper.readValue(configurationFile, LanguageServerConfiguration.class);
+    try (var inputStream = Files.newInputStream(configurationFile.toPath())) {
+      configuration = mapper.readValue(inputStream, LanguageServerConfiguration.class);
     } catch (IOException e) {
       LOGGER.error("Can't deserialize configuration file", e);
       return;