diff --git a/build.gradle.kts b/build.gradle.kts index 657f334..bf8545a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,6 @@ plugins { repositories { mavenLocal() mavenCentral() - maven(url = "https://jitpack.io") } group = "io.github.1c-syntax" @@ -45,23 +44,22 @@ val isSnapshot = gitVersioning.gitVersionDetails.refType != GitRefType.TAG dependencies { implementation("org.apache.commons", "commons-collections4", "4.4") - implementation("com.github.1c-syntax", "utils", "0.5.1") + implementation("io.github.1c-syntax", "utils", "0.6.2") // логирование - implementation("org.slf4j", "slf4j-api", "2.0.11") + implementation("org.slf4j", "slf4j-api", "2.0.16") // stat analysis - compileOnly("com.google.code.findbugs", "jsr305", "3.0.2") + compileOnly("com.github.spotbugs", "spotbugs-annotations", "4.8.6") // тестирование - testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.6.1") - testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.6.1") - testImplementation("org.assertj", "assertj-core", "3.18.1") - testImplementation("com.ginsberg", "junit5-system-exit", "1.0.0") + testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.4") + testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.4") + testImplementation("org.assertj", "assertj-core", "3.27.0") + testImplementation("com.ginsberg", "junit5-system-exit", "2.0.2") // логирование - // https://mvnrepository.com/artifact/org.slf4j/slf4j-log4j12 - testImplementation("org.slf4j", "slf4j-log4j12", "2.0.11") + testImplementation("org.slf4j", "slf4j-reload4j", "2.0.16") } java { @@ -90,7 +88,7 @@ tasks.check { tasks.jacocoTestReport { reports { xml.required.set(true) - xml.outputLocation.set(File("$buildDir/reports/jacoco/test/jacoco.xml")) + xml.outputLocation.set(layout.buildDirectory.file("reports/jacoco/test/jacoco.xml")) } } @@ -107,7 +105,7 @@ sonarqube { property("sonar.organization", "1c-syntax") property("sonar.projectKey", "1c-syntax_bsl-common-library") property("sonar.projectName", "BSL Common library") - property("sonar.coverage.jacoco.xmlReportPaths", "$buildDir/reports/jacoco/test/jacoco.xml") + property("sonar.coverage.jacoco.xmlReportPaths", layout.buildDirectory.file("reports/jacoco/test/jacoco.xml")) } } diff --git a/src/main/java/com/github/_1c_syntax/bsl/support/CompatibilityMode.java b/src/main/java/com/github/_1c_syntax/bsl/support/CompatibilityMode.java index 15090e3..d7dccbf 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/support/CompatibilityMode.java +++ b/src/main/java/com/github/_1c_syntax/bsl/support/CompatibilityMode.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.support; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.support; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/src/main/java/com/github/_1c_syntax/bsl/support/SupportVariant.java b/src/main/java/com/github/_1c_syntax/bsl/support/SupportVariant.java index f59ae74..3945a54 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/support/SupportVariant.java +++ b/src/main/java/com/github/_1c_syntax/bsl/support/SupportVariant.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Common library. * - * Copyright (c) 2021 - 2024 + * Copyright (c) 2021 - 2025 * Tymko Oleg , Maximov Valery and contributors * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/types/ConfigurationSource.java b/src/main/java/com/github/_1c_syntax/bsl/types/ConfigurationSource.java index 0d56a35..193202a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/types/ConfigurationSource.java +++ b/src/main/java/com/github/_1c_syntax/bsl/types/ConfigurationSource.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.types; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.types; /** * Возможные виды конфигураций по формату данных diff --git a/src/main/java/com/github/_1c_syntax/bsl/types/MDOType.java b/src/main/java/com/github/_1c_syntax/bsl/types/MDOType.java index 10279ce..e100e05 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/types/MDOType.java +++ b/src/main/java/com/github/_1c_syntax/bsl/types/MDOType.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.types; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.types; import lombok.Getter; import org.apache.commons.collections4.map.CaseInsensitiveMap; diff --git a/src/main/java/com/github/_1c_syntax/bsl/types/MdoReference.java b/src/main/java/com/github/_1c_syntax/bsl/types/MdoReference.java index 5487f24..a1b2b5d 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/types/MdoReference.java +++ b/src/main/java/com/github/_1c_syntax/bsl/types/MdoReference.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Common library. * - * Copyright (c) 2021 - 2024 + * Copyright (c) 2021 - 2025 * Tymko Oleg , Maximov Valery and contributors * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/types/ModuleType.java b/src/main/java/com/github/_1c_syntax/bsl/types/ModuleType.java index dd8cc98..496bb60 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/types/ModuleType.java +++ b/src/main/java/com/github/_1c_syntax/bsl/types/ModuleType.java @@ -1,7 +1,7 @@ /* * This file is a part of BSL Common library. * - * Copyright (c) 2021 - 2024 + * Copyright (c) 2021 - 2025 * Tymko Oleg , Maximov Valery and contributors * * SPDX-License-Identifier: LGPL-3.0-or-later diff --git a/src/main/java/com/github/_1c_syntax/bsl/types/package-info.java b/src/main/java/com/github/_1c_syntax/bsl/types/package-info.java index 86b1a60..a1a2679 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/types/package-info.java +++ b/src/main/java/com/github/_1c_syntax/bsl/types/package-info.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -/** +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +/** * Пакет содержит общие типы данных */ package com.github._1c_syntax.bsl.types; diff --git a/src/test/java/com/github/_1c_syntax/bsl/support/CompatibilityModeTest.java b/src/test/java/com/github/_1c_syntax/bsl/support/CompatibilityModeTest.java index 9719d3b..9a388a1 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/support/CompatibilityModeTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/support/CompatibilityModeTest.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.support; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.support; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/_1c_syntax/bsl/support/SupportVariantTest.java b/src/test/java/com/github/_1c_syntax/bsl/support/SupportVariantTest.java index b99f012..3818231 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/support/SupportVariantTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/support/SupportVariantTest.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.support; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.support; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/_1c_syntax/bsl/types/MDOTypeTest.java b/src/test/java/com/github/_1c_syntax/bsl/types/MDOTypeTest.java index 8d842fa..b961007 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/types/MDOTypeTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/types/MDOTypeTest.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.types; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.types; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/_1c_syntax/bsl/types/MdoReferenceTest.java b/src/test/java/com/github/_1c_syntax/bsl/types/MdoReferenceTest.java index 43363ab..7a0837c 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/types/MdoReferenceTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/types/MdoReferenceTest.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.types; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.types; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/github/_1c_syntax/bsl/types/ModuleTypeTest.java b/src/test/java/com/github/_1c_syntax/bsl/types/ModuleTypeTest.java index 644ac0f..927d993 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/types/ModuleTypeTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/types/ModuleTypeTest.java @@ -1,25 +1,25 @@ -/* - * This file is a part of BSL Common library. - * - * Copyright (c) 2021 - 2024 - * Tymko Oleg , Maximov Valery and contributors - * - * SPDX-License-Identifier: LGPL-3.0-or-later - * - * BSL Common library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3.0 of the License, or (at your option) any later version. - * - * BSL Common library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with BSL Common library. - */ -package com.github._1c_syntax.bsl.types; +/* + * This file is a part of BSL Common library. + * + * Copyright (c) 2021 - 2025 + * Tymko Oleg , Maximov Valery and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Common library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Common library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Common library. + */ +package com.github._1c_syntax.bsl.types; import org.junit.jupiter.api.Test;