Skip to content

Commit 0494e6e

Browse files
committed
лицензии и обвноления зависимостей
1 parent f4c2599 commit 0494e6e

File tree

14 files changed

+36
-35
lines changed

14 files changed

+36
-35
lines changed

build.gradle.kts

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
`java-library`
66
`maven-publish`
77
jacoco
8-
id("org.cadixdev.licenser") version "0.6.1"
8+
id("cloud.rio.license") version "0.18.0"
99
id("me.qoomon.git-versioning") version "6.4.4"
10-
id("io.freefair.lombok") version "9.1.0"
11-
id("io.freefair.javadoc-links") version "9.1.0"
12-
id("io.freefair.javadoc-utf-8") version "9.1.0"
13-
id("io.freefair.maven-central.validate-poms") version "9.1.0"
10+
id("io.freefair.lombok") version "9.2.0"
11+
id("io.freefair.javadoc-links") version "9.2.0"
12+
id("io.freefair.javadoc-utf-8") version "9.2.0"
13+
// id("io.freefair.maven-central.validate-poms") version "9.2.0"
1414
id("com.github.ben-manes.versions") version "0.53.0"
1515
id("ru.vyarus.pom") version "3.0.0"
1616
id("org.jreleaser") version "1.21.0"
@@ -49,19 +49,22 @@ repositories {
4949

5050
dependencies {
5151
// логирование
52-
implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1")
52+
implementation("org.slf4j:slf4j-api:2.1.0-alpha1")
5353

5454
// прочее
55-
implementation("commons-io", "commons-io", "2.18.0")
56-
api("io.github.1c-syntax", "bsl-common-library", "0.9.0")
55+
implementation("commons-io:commons-io:2.21.0")
56+
implementation("io.github.1c-syntax:bsl-common-library:0.9.0")
5757

5858
// тестирование
59-
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4")
60-
testImplementation("org.junit.jupiter", "junit-jupiter-engine", "5.11.4")
61-
testImplementation("org.assertj", "assertj-core", "3.27.0")
59+
testImplementation(platform("org.junit:junit-bom:6.0.3"))
60+
testImplementation("org.junit.jupiter:junit-jupiter-api")
61+
testImplementation("org.assertj:assertj-core:3.27.7")
6262

6363
// логирование
64-
testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1")
64+
testImplementation("org.slf4j:slf4j-reload4j:2.1.0-alpha1")
65+
66+
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
67+
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
6568
}
6669

6770
java {
@@ -107,7 +110,8 @@ sonarqube {
107110
property("sonar.organization", "1c-syntax")
108111
property("sonar.projectKey", "1c-syntax_supportconf")
109112
property("sonar.projectName", "Support Configuration")
110-
property("sonar.coverage.jacoco.xmlReportPaths", "${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
113+
property("sonar.coverage.jacoco.xmlReportPaths",
114+
"${layout.buildDirectory.get()}/reports/jacoco/test/jacoco.xml")
111115
}
112116
}
113117

@@ -118,14 +122,14 @@ artifacts {
118122
}
119123

120124
license {
121-
header(rootProject.file("license/HEADER.txt"))
122-
newLine(false)
125+
header = rootProject.file("license/HEADER.txt")
126+
skipExistingHeaders = false
127+
strictCheck = true
128+
mapping("java", "SLASHSTAR_STYLE")
123129
ext["year"] = "2019 - " + Calendar.getInstance().get(Calendar.YEAR)
124130
ext["name"] = "Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com>"
125131
ext["project"] = "Support Configuration"
126-
exclude("**/*.properties")
127-
exclude("**/*.orig")
128-
exclude("**/*.xml")
132+
include("**/*.java")
129133
}
130134

131135
publishing {
@@ -190,7 +194,8 @@ tasks.register("precommit") {
190194
description = "Run all precommit tasks"
191195
group = "Developer tools"
192196
dependsOn(":test")
193-
dependsOn(":updateLicenses")
197+
dependsOn(":licenseFormatMain")
198+
dependsOn(":licenseFormatTest")
194199
}
195200

196201
tasks.withType<Javadoc> {

gradle/wrapper/gradle-wrapper.jar

2.35 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/com/github/_1c_syntax/bsl/supconf/FullSupportData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of Support Configuration.
33
*
4-
* Copyright (c) 2019 - 2025
4+
* Copyright (c) 2019 - 2026
55
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/supconf/GeneralSupportVariant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of Support Configuration.
33
*
4-
* Copyright (c) 2019 - 2025
4+
* Copyright (c) 2019 - 2026
55
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/supconf/ParseSupportData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of Support Configuration.
33
*
4-
* Copyright (c) 2019 - 2025
4+
* Copyright (c) 2019 - 2026
55
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/supconf/SupportConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of Support Configuration.
33
*
4-
* Copyright (c) 2019 - 2025
4+
* Copyright (c) 2019 - 2026
55
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

src/main/java/com/github/_1c_syntax/bsl/supconf/SupportData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* This file is a part of Support Configuration.
33
*
4-
* Copyright (c) 2019 - 2025
4+
* Copyright (c) 2019 - 2026
55
* Tymko Oleg <olegtymko@yandex.ru>, Maximov Valery <maximovvalery@gmail.com> and contributors
66
*
77
* SPDX-License-Identifier: LGPL-3.0-or-later

0 commit comments

Comments
 (0)