Обновление зависимостей и собранные изменения с разных репозиториев #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| The MIT License (MIT) | ||
|
|
||
| Copyright (c) 2023 alkoleft | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,95 @@ | ||
| # BSL-Doc | ||
|
|
||
| BSL-Doc — это инструмент для автоматической генерации документации на основе исходных кодов конфигурации 1С:Предприятие. | ||
| Он поддерживает работу с исходниками как в формате **конфигуратора**, так и в формате **EDT**. | ||
| Для анализа исходных кодов используются компоненты [bsl-language-server](https://github.com/1c-syntax/bsl-language-server), включая [bsl-parser](https://github.com/1c-syntax/bsl-parser) для работы с модулями и [mdclasses](https://github.com/1c-syntax/mdclasses) для чтения дерева метаданных. | ||
|
|
||
| ## Возможности | ||
|
|
||
| - Генерация документации в форматах Markdown, ConfluenceMarkdown и Docusaurus. | ||
| - Поддержка фильтрации по подсистемам и регионам. | ||
| - Возможность объединения с ручной документацией. | ||
| - Гибкая настройка иерархии и структуры выходной документации. | ||
|
|
||
| ## Требования | ||
|
|
||
| * java version 17 | ||
|
|
||
| ## Установка | ||
|
|
||
| * Скачайте jar файл со страницы [релизов](https://github.com/1CDevFlow/BSL-Doc/releases) | ||
|
|
||
| ## Запуск | ||
|
|
||
| ### Параметры запуска | ||
|
|
||
| ```bash | ||
| bsldoc --format=<Docusaurus, Markdown> --only-subsystems=<root subsystems list> --regions=<regions filter> source destination | ||
| ``` | ||
|
|
||
| | Параметр | Описание | Доступные значения | Значение по умолчанию | Файл | Cli | | ||
| |-----------------|------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------|------------------------------|---------------|-------------------| | ||
| | format | Формат генерируемой документации | Markdown, ConfluenceMarkdown, Docusaurus | Markdown | format | --format | | ||
| | hierarchy | Формат иерархии генерируемой документации — плоский список или иерархия по подсистемам | FLAT, SUBSYSTEM | FLAT | hierarchy | --hierarchy | | ||
| | subsystems | Подсистемы верхнего уровня, по которым строится документация. Если не указано, то по всем. | | | subsystems | --only-subsystems | | ||
| | regions | Список областей модулей, по которым строится документация. Если не указано, то по всем экспортным методам | | ПрограммныйИнтерфейс, Public | regions | --regions | | ||
| | manualDocs | Путь к каталогу с ручной документацией | | | manualDocs | --manual-docs | | ||
| | mergeStrategy | Способ объединения ручной и сгенерированной документации | APPEND, REPLACE, MERGE | APPEND | mergeStrategy | --merge-strategy | | ||
| | childLayout | Расположение файла описания групп | SUB_DIRECTORY, SAME_DIRECTORY | SAME_DIRECTORY | childLayout | --child-layout | | ||
| | header | Шаблон, добавляется в начало каждого сгенерированного файла `{path: '', content: ''}`. Либо сам шаблон, либо путь к файлу шаблона. | | | header | | | ||
| | footer | Шаблон, добавляется в конец каждого сгенерированного файла `{path: '', content: ''}`. Либо сам шаблон, либо путь к файлу шаблона. | | | footer | | | ||
|
|
||
| ### Пример запуска | ||
|
|
||
| ```bash | ||
| bsldoc --format=Markdown --only-subsystems="ОбщегоНазначения, Администрирование" --regions="ПрограммныйИнтерфейс" source_directory output_directory | ||
| ``` | ||
|
|
||
| ## Настройка `childLayout` | ||
|
|
||
| Определяет расположение описаний групп (подсистем). | ||
|
|
||
| ### Пример структуры файлов | ||
|
|
||
| Предположим, конфигурация имеет общий модуль `СтроковыеФункции`, который относится к подсистеме `ОбщегоНазначения`. | ||
|
|
||
| #### Для настройки `SAME_DIRECTORY` | ||
|
|
||
| ```tree | ||
| └── ОбщегоНазначения // Каталог с описанием элементов подсистемы | ||
| ├── index.md // Описание подсистемы | ||
| └── СтроковыеФункции.md // Описание общего модуля | ||
| ``` | ||
|
|
||
| #### Для настройки `SUB_DIRECTORY` | ||
|
|
||
| ```tree | ||
| ├── ОбщегоНазначения.md // Описание подсистемы | ||
| └── ОбщегоНазначения // Каталог с описанием элементов подсистемы | ||
| └── СтроковыеФункции.md // Описание общего модуля | ||
| ``` | ||
|
|
||
| ## Ручная документация | ||
|
|
||
| BSL-Doc поддерживает работу с ручной документацией, что позволяет: | ||
|
|
||
| - Совмещать ручные и сгенерированные статьи. | ||
| - Окружать сгенерированную документацию ручной в одной статье. | ||
| - Заменять сгенерированные страницы ручным вариантом. | ||
|
|
||
| ### Процесс публикации документации | ||
|
|
||
| 1. В каталог назначения копируется ручная документация. | ||
| 2. На основании исходников генерируется документация в тот же каталог назначения. | ||
| 3. При генерации проверяется существование "ручной" статьи. Если она найдена, то в зависимости от настройки `mergeStrategy`: | ||
| - `APPEND` — соответствующее описание не генерируется, существующая страница остается неизменной. | ||
| - `REPLACE` — страница заменяется сгенерированной. | ||
| - `MERGE` — описания объединяются. Страница с ручной документацией может содержать маркер `generated_content`, который заменяется сгенерированным описанием. При отсутствии маркера страница остается неизменной. | ||
|
|
||
| ## Лицензия | ||
|
|
||
| BSL-Doc распространяется под лицензией MIT. Подробности смотрите в файле [LICENSE](LICENSE). | ||
|
|
||
| ## Поддержка и обратная связь | ||
|
|
||
| Если у вас есть вопросы, предложения или вы нашли ошибку, пожалуйста, создайте issue на [GitHub](https://github.com/1CDevFlow/BSL-Doc). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,74 @@ | ||
| plugins { | ||
| java | ||
| application | ||
| id("me.qoomon.git-versioning") version "6.4.3" | ||
| id("com.gorylenko.gradle-git-properties") version "2.4.1" | ||
| id("io.freefair.lombok") version "8.4" | ||
| id("maven-publish") | ||
| id("org.springframework.boot") version "2.7.10" | ||
| id("io.spring.dependency-management") version "1.1.0" | ||
| id("org.sonarqube") version "6.1.0.5360" | ||
| } | ||
|
|
||
| group = "ru.alkoleft.bsl.doc" | ||
| gitVersioning.apply { | ||
| refs { | ||
| considerTagsOnBranches = true | ||
| tag("v(?<tagVersion>[0-9].*)") { | ||
| version = "\${ref.tagVersion}\${dirty}" | ||
| } | ||
| branch(".+") { | ||
| version = "\${ref}-\${commit.short}\${dirty}" | ||
| } | ||
| } | ||
|
|
||
| rev { | ||
| version = "\${commit.short}\${dirty}" | ||
| } | ||
| } | ||
|
|
||
| val junitVersion = "5.8.2" | ||
| val jacksonVersion = "2.19.0" | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| maven("https://central.sonatype.com/repository/maven-snapshots") | ||
| } | ||
|
|
||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 | ||
| } | ||
|
|
||
| dependencies { | ||
|
|
||
| // CLI | ||
| implementation("info.picocli", "picocli", "4.7.5") | ||
|
|
||
| // 1c-syntax | ||
| implementation("io.github.1c-syntax", "mdclasses", "0.17.3") | ||
| implementation("io.github.1c-syntax", "utils", "0.6.8") | ||
| implementation("io.github.1c-syntax", "bsl-common-library", "0.9.2") | ||
| implementation("io.github.1c-syntax", "bsl-parser", "0.30.0") | ||
| // logging | ||
| implementation("org.slf4j", "slf4j-api", "2.1.0-alpha1") | ||
|
There was a problem hiding this comment. 🧩 Analysis chain🌐 Web query:
💡 Result: The latest stable SLF4J release is 2.0.17, published February 25, 2025. [1][2] Sources:
Use stable version of slf4j instead of alpha release.
🤖 Prompt for AI Agents |
||
|
|
||
| // config load | ||
| implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion") | ||
| implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion") | ||
| implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion") | ||
|
|
||
| // template engine | ||
| implementation("com.github.jknack:handlebars:4.3.1") | ||
|
There was a problem hiding this comment. 🧩 Analysis chain🏁 Script executed: #!/bin/bash
# Search for Maven Central repository info on jknack handlebars
curl -s "https://api.github.com/repos/jknack/handlebars.java/releases" | head -50Repository: 1CDevFlow/BSL-Doc Length of output: 178 🌐 Web query:
💡 Result: Handlebars (jknack) 4.3.1 is reported by package trackers to be affected by multiple CVEs. Notable entries include CVE-2019-19919 (prototype‑pollution → RCE in Handlebars.js family) and more recent component CVEs reported against dependencies (e.g., CVE-2025-48924). For references and full lists see:
If you want, I can enumerate every CVE shown for 4.3.1 (with dates, severity and remediation for each) and suggest the minimum safe upgrade. Sources: 🌐 Web query:
💡 Result: Latest Maven Central version: com.github.jknack:handlebars.java 4.5.0 (released Aug 7, 2025). [1][2] Maven dependency: Sources: [1] mvnrepository listing for handlebars.java 4.5.0. [2] GitHub release v4.5.0. Upgrade Handlebars to 4.5.0 — security vulnerabilities in 4.3.1. Version 4.3.1 has known security vulnerabilities, including CVE-2019-19919 (prototype-pollution/RCE) and CVE-2025-48924. Upgrade to 4.5.0 (latest available version as of August 2025). 🤖 Prompt for AI Agents |
||
|
|
||
| implementation("commons-io", "commons-io", "2.18.0") | ||
|
|
||
| // tests | ||
| testImplementation("org.slf4j", "slf4j-reload4j", "2.1.0-alpha1") | ||
|
There was a problem hiding this comment. Test dependency also uses alpha slf4j version.
🤖 Prompt for AI Agents |
||
| testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion") | ||
| testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion") | ||
| testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion") | ||
| } | ||
|
|
||
| tasks.test { | ||
|
|
@@ -74,41 +86,14 @@ tasks.withType<JavaCompile> { | |
| } | ||
|
|
||
| tasks.jar { | ||
| enabled = true | ||
| archiveClassifier.set("") | ||
| } | ||
|
|
||
| tasks.bootJar { | ||
| archiveClassifier.set("exec") | ||
| } | ||
|
|
||
| publishing { | ||
| repositories { | ||
| maven { | ||
|
|
@@ -125,4 +110,4 @@ publishing { | |
| from(components["java"]) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,7 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip | ||
| networkTimeout=10000 | ||
| validateDistributionUrl=true | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🌐 Web query:
Spring Boot 2.7 end of life support date💡 Result:
Community (open-source) end-of-life / end of community support for Spring Boot 2.7: November 24, 2023. [1][2]
Commercial (paid) support window was extended to August 2025 (previously scheduled to end February 2025). [3][4]
Sources:
[1] Spring Boot blog (2.6.14 post noting 2.7 OSS support extension to Nov 2023).
[2] Spring Boot GitHub / project notes confirming 2.7 OSS end-of-support date (Nov 24, 2023).
[3] Spring blog — "Spring Commercial Support Extension" (announces commercial support extension to August 2025).
[4] Spring blog — "Updates to Spring Support Policy" (policy / support timeline context).
Consider upgrading from Spring Boot 2.7.10, which reached end of community support in November 2023.
Spring Boot 2.7.x no longer receives security patches or bug fixes in the open-source track. Your project already has Java 17 configured, so you can upgrade to Spring Boot 3.x. Be aware that this requires updating imports to Jakarta EE namespaces and will need dependency adjustments, but the upgrade path is well-documented and you have the Java version prerequisite in place.
🤖 Prompt for AI Agents