Обновления (#123)

theshadowco · web-flow · commit 03044710f500 · 2026-02-20T18:01:25.000+03:00
* лицензии и обвноления зависимостей

* null check jspecify
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,12 +5,12 @@ 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.1.0"
-    id("io.freefair.javadoc-links") version "9.1.0"
-    id("io.freefair.javadoc-utf-8") version "9.1.0"
-    id("io.freefair.maven-central.validate-poms") version "9.1.0"
+    id("io.freefair.lombok") version "9.2.0"
+    id("io.freefair.javadoc-links") version "9.2.0"
+    id("io.freefair.javadoc-utf-8") version "9.2.0"
+//    id("io.freefair.maven-central.validate-poms") version "9.2.0"
     id("com.github.ben-manes.versions") version "0.53.0"
     id("ru.vyarus.pom") version "3.0.0"
     id("org.jreleaser") version "1.21.0"
@@ -49,19 +49,24 @@ repositories {
 
 dependencies {
     // логирование
-    implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1")
+    implementation("org.slf4j:slf4j-api:2.1.0-alpha1")
 
     // прочее
-    implementation("commons-io", "commons-io", "2.18.0")
-    api("io.github.1c-syntax", "bsl-common-library", "0.9.0")
+    implementation("commons-io:commons-io:2.21.0")
+    implementation("io.github.1c-syntax:bsl-common-library:0.9.0")
+
+    api("org.jspecify:jspecify:1.0.0")
 
     // тестирование
-    testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
-    testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
-    testImplementation("org.assertj", "assertj-core", "3.27.0")
+    testImplementation(platform("org.junit:junit-bom:6.0.3"))
+    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.assertj:assertj-core:3.27.7")
 
     // логирование
-    testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
+    testImplementation("org.slf4j:slf4j-reload4j:2.1.0-alpha1")
+
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 java {
@@ -107,7 +112,8 @@ sonarqube {
         property("sonar.organization", "1c-syntax")
         property("sonar.projectKey", "1c-syntax_supportconf")
         property("sonar.projectName", "Support Configuration")
-        property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
+        property("sonar.coverage.jacoco.xmlReportPaths",
+            "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
     }
 }
 
@@ -118,14 +124,14 @@ artifacts {
 }
 
 license {
-    header(rootProject.file("license/HEADER.txt"))
-    newLine(false)
+    header = rootProject.file("license/HEADER.txt")
+    skipExistingHeaders = false
+    strictCheck = true
+    mapping("java", "SLASHSTAR_STYLE")
     ext["year"] = "2019 - " + Calendar.getInstance().get(Calendar.YEAR)
     ext["name"] = "Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com>"
     ext["project"] = "Support Configuration"
-    exclude("**/*.properties")
-    exclude("**/*.orig")
-    exclude("**/*.xml")
+    include("**/*.java")
 }
 
 publishing {
@@ -190,7 +196,8 @@ tasks.register("precommit") {
     description = "Run all precommit tasks"
     group = "Developer tools"
     dependsOn(":test")
-    dependsOn(":updateLicenses")
+    dependsOn(":licenseFormatMain")
+    dependsOn(":licenseFormatTest")
 }
 
 tasks.withType<Javadoc> {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/FullSupportData.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/FullSupportData.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -52,7 +52,8 @@ private FullSupportData(Path pathParentConfigurationBin) {
     this(pathParentConfigurationBin, Collections.emptyMap());
   }
 
-  private FullSupportData(Path pathParentConfigurationBin, Map<String, Map<SupportConfiguration, SupportVariant>> supportVariants) {
+  private FullSupportData(Path pathParentConfigurationBin,
+                          Map<String, Map<SupportConfiguration, SupportVariant>> supportVariants) {
     this.supportVariants = supportVariants;
     this.pathParentConfigurationBin = pathParentConfigurationBin;
   }
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/GeneralSupportVariant.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/GeneralSupportVariant.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/SupportConfiguration.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/SupportConfiguration.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/SupportData.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/SupportData.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/SupportDataReader.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/SupportDataReader.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -142,7 +142,8 @@ public static Map<String, Map<SupportConfiguration, SupportVariant>> readFull(Pa
     return Collections.unmodifiableMap(supportVariants);
   }
 
-  private static SupportVariant computeSupportVariant(GeneralSupportVariant configurationSupportVariant, int dataStrings) {
+  private static SupportVariant computeSupportVariant(GeneralSupportVariant configurationSupportVariant,
+                                                      int dataStrings) {
     SupportVariant supportVariant;
     if (configurationSupportVariant == GeneralSupportVariant.LOCKED) {
       supportVariant = SupportVariant.NOT_EDITABLE;
diff --git a/src/main/java/com/github/_1c_syntax/bsl/supconf/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/supconf/package-info.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
@@ -22,10 +22,7 @@
 /**
  * Реализации чтения информации о поставке
  */
-@ParametersAreNonnullByDefault
-@ReturnValuesAreNonnullByDefault
+@NullMarked
 package com.github._1c_syntax.bsl.supconf;
 
-import edu.umd.cs.findbugs.annotations.ReturnValuesAreNonnullByDefault;
-
-import javax.annotation.ParametersAreNonnullByDefault;
+import org.jspecify.annotations.NullMarked;
diff --git a/src/test/java/com/github/_1c_syntax/bsl/supconf/ParseSupportDataTest.java b/src/test/java/com/github/_1c_syntax/bsl/supconf/ParseSupportDataTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later
diff --git a/src/test/java/com/github/_1c_syntax/bsl/supconf/SupportConfigurationTest.java b/src/test/java/com/github/_1c_syntax/bsl/supconf/SupportConfigurationTest.java
@@ -1,7 +1,7 @@
 /*
  * This file is a part of Support Configuration.
  *
- * Copyright (c) 2019 - 2025
+ * Copyright (c) 2019 - 2026
  * Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
  *
  * SPDX-License-Identifier: LGPL-3.0-or-later

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* This file is a part of Support Configuration.`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2019 - 2025`
	`4`	`+ * Copyright (c) 2019 - 2026`
`5`	`5`	`* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors`
`6`	`6`	`*`
`7`	`7`	`* SPDX-License-Identifier: LGPL-3.0-or-later`
`@@ -52,7 +52,8 @@ private FullSupportData(Path pathParentConfigurationBin) {`
`52`	`52`	`this(pathParentConfigurationBin, Collections.emptyMap());`
`53`	`53`	`}`
`54`	`54`
`55`		`- private FullSupportData(Path pathParentConfigurationBin, Map<String, Map<SupportConfiguration, SupportVariant>> supportVariants) {`
	`55`	`+ private FullSupportData(Path pathParentConfigurationBin,`
	`56`	`+ Map<String, Map<SupportConfiguration, SupportVariant>> supportVariants) {`
`56`	`57`	`this.supportVariants = supportVariants;`
`57`	`58`	`this.pathParentConfigurationBin = pathParentConfigurationBin;`
`58`	`59`	`}`