From 9ccfab7afe9bb8d577cd72edca10252a6d14967f Mon Sep 17 00:00:00 2001 From: Nifacy Date: Thu, 29 Jan 2026 00:12:59 +0300 Subject: [PATCH 1/6] add jweaver in dependencies list --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index 2d14e7d..162b0f3 100644 --- a/readme.md +++ b/readme.md @@ -23,6 +23,7 @@ C4 DSL Patterns расширяет синтаксис Structurizr DSL новой - **Structurizr DSL**: версия `3.2.1` - **Java Development Kit (JDK)**: версия `17` +- **AspectJ Weaver (для lite-версии)**: версия `1.9.24` ## Документация From df77bbc5c478ca3d6f21540934d76fe8773c90e7 Mon Sep 17 00:00:00 2001 From: Nifacy Date: Thu, 29 Jan 2026 22:52:31 +0300 Subject: [PATCH 2/6] add jweaver 1.9.25 --- dev-tools/tests/test_syntax_plugin.py | 8 ++++++-- readme.md | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-tools/tests/test_syntax_plugin.py b/dev-tools/tests/test_syntax_plugin.py index 523fb33..5a47a6b 100644 --- a/dev-tools/tests/test_syntax_plugin.py +++ b/dev-tools/tests/test_syntax_plugin.py @@ -21,8 +21,12 @@ _exporter_factory.JWeaverRelease( url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.24/aspectjweaver-1.9.24.jar", version="1.9.24", - ) -,) + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.25/aspectjweaver-1.9.25.jar", + version="1.9.25", + ), +) @dataclasses.dataclass(frozen=True, slots=True) class SuccessTestResult: diff --git a/readme.md b/readme.md index 162b0f3..8a62253 100644 --- a/readme.md +++ b/readme.md @@ -23,7 +23,7 @@ C4 DSL Patterns расширяет синтаксис Structurizr DSL новой - **Structurizr DSL**: версия `3.2.1` - **Java Development Kit (JDK)**: версия `17` -- **AspectJ Weaver (для lite-версии)**: версия `1.9.24` +- **AspectJ Weaver (для lite-версии)**: версии `1.9.24` - `1.9.25` ## Документация From e063e8a58f044ba4bcd2243e5d2ef2339ff81ae5 Mon Sep 17 00:00:00 2001 From: Nifacy Date: Fri, 30 Jan 2026 00:10:22 +0300 Subject: [PATCH 3/6] add structurizr 4.1.0 support --- dev-tools/tests/test_syntax_plugin.py | 4 ++++ readme.md | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dev-tools/tests/test_syntax_plugin.py b/dev-tools/tests/test_syntax_plugin.py index 5a47a6b..3313ed3 100644 --- a/dev-tools/tests/test_syntax_plugin.py +++ b/dev-tools/tests/test_syntax_plugin.py @@ -162,6 +162,10 @@ def _get_test_configs( version="v2025.03.28", url="https://github.com/structurizr/lite/releases/download/v2025.03.28/structurizr-lite.war", ), + _exporter_release.StructurizrLiteRelease( + version="v2025.05.28", + url="https://github.com/structurizr/lite/releases/download/v2025.05.28/structurizr-lite.war", + ), ], reduced_test_configs=[ ReducedTestConfiguration( diff --git a/readme.md b/readme.md index 8a62253..ea934e1 100644 --- a/readme.md +++ b/readme.md @@ -21,7 +21,7 @@ C4 DSL Patterns расширяет синтаксис Structurizr DSL новой ## Требования -- **Structurizr DSL**: версия `3.2.1` +- **Structurizr DSL**: версии `3.2.1` - `4.1.0` - **Java Development Kit (JDK)**: версия `17` - **AspectJ Weaver (для lite-версии)**: версии `1.9.24` - `1.9.25` From 8df092dcb66773d1725ba268ac607080b04c8852 Mon Sep 17 00:00:00 2001 From: Nifacy Date: Fri, 30 Jan 2026 00:20:53 +0300 Subject: [PATCH 4/6] fix: add older jweaver versions support --- dev-tools/tests/test_syntax_plugin.py | 60 +++++++++++++++++++++++++++ readme.md | 2 +- 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dev-tools/tests/test_syntax_plugin.py b/dev-tools/tests/test_syntax_plugin.py index 3313ed3..b5eee33 100644 --- a/dev-tools/tests/test_syntax_plugin.py +++ b/dev-tools/tests/test_syntax_plugin.py @@ -18,6 +18,66 @@ _CUR_DIR_PATH: Final = Path(__file__).parent _DOWNLOAD_CACHE_PATH: Final = _CUR_DIR_PATH / ".." / ".cache" _JWEAVER_RELEASES: Final = ( + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.0/aspectjweaver-1.9.0.jar", + version="1.9.0", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.1/aspectjweaver-1.9.1.jar", + version="1.9.1", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.2/aspectjweaver-1.9.2.jar", + version="1.9.2", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.3/aspectjweaver-1.9.3.jar", + version="1.9.3", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.4/aspectjweaver-1.9.4.jar", + version="1.9.4", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar", + version="1.9.5", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar", + version="1.9.6", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.7/aspectjweaver-1.9.7.jar", + version="1.9.7", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.8/aspectjweaver-1.9.8.jar", + version="1.9.8", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.9/aspectjweaver-1.9.9.jar", + version="1.9.9", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.19/aspectjweaver-1.9.19.jar", + version="1.9.19", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.20/aspectjweaver-1.9.20.jar", + version="1.9.20", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.21/aspectjweaver-1.9.21.jar", + version="1.9.21", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.22/aspectjweaver-1.9.22.jar", + version="1.9.22", + ), + _exporter_factory.JWeaverRelease( + url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.23/aspectjweaver-1.9.23.jar", + version="1.9.23", + ), _exporter_factory.JWeaverRelease( url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.24/aspectjweaver-1.9.24.jar", version="1.9.24", diff --git a/readme.md b/readme.md index ea934e1..3f93efe 100644 --- a/readme.md +++ b/readme.md @@ -23,7 +23,7 @@ C4 DSL Patterns расширяет синтаксис Structurizr DSL новой - **Structurizr DSL**: версии `3.2.1` - `4.1.0` - **Java Development Kit (JDK)**: версия `17` -- **AspectJ Weaver (для lite-версии)**: версии `1.9.24` - `1.9.25` +- **AspectJ Weaver (для lite-версии)**: версии `1.9.0` - `1.9.25` ## Документация From 68f5172af79ea68e82496a8aa9bae57dd8a1e86f Mon Sep 17 00:00:00 2001 From: Nifacy Date: Sat, 31 Jan 2026 15:39:10 +0300 Subject: [PATCH 5/6] fix: update jweaver version list --- dev-tools/tests/test_syntax_plugin.py | 52 --------------------------- readme.md | 2 +- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/dev-tools/tests/test_syntax_plugin.py b/dev-tools/tests/test_syntax_plugin.py index b5eee33..9bbe0e5 100644 --- a/dev-tools/tests/test_syntax_plugin.py +++ b/dev-tools/tests/test_syntax_plugin.py @@ -18,58 +18,6 @@ _CUR_DIR_PATH: Final = Path(__file__).parent _DOWNLOAD_CACHE_PATH: Final = _CUR_DIR_PATH / ".." / ".cache" _JWEAVER_RELEASES: Final = ( - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.0/aspectjweaver-1.9.0.jar", - version="1.9.0", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.1/aspectjweaver-1.9.1.jar", - version="1.9.1", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.2/aspectjweaver-1.9.2.jar", - version="1.9.2", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.3/aspectjweaver-1.9.3.jar", - version="1.9.3", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.4/aspectjweaver-1.9.4.jar", - version="1.9.4", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.5/aspectjweaver-1.9.5.jar", - version="1.9.5", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.6/aspectjweaver-1.9.6.jar", - version="1.9.6", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.7/aspectjweaver-1.9.7.jar", - version="1.9.7", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.8/aspectjweaver-1.9.8.jar", - version="1.9.8", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.9/aspectjweaver-1.9.9.jar", - version="1.9.9", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.19/aspectjweaver-1.9.19.jar", - version="1.9.19", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.20/aspectjweaver-1.9.20.jar", - version="1.9.20", - ), - _exporter_factory.JWeaverRelease( - url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.21/aspectjweaver-1.9.21.jar", - version="1.9.21", - ), _exporter_factory.JWeaverRelease( url="https://repo1.maven.org/maven2/org/aspectj/aspectjweaver/1.9.22/aspectjweaver-1.9.22.jar", version="1.9.22", diff --git a/readme.md b/readme.md index 3f93efe..38ce9c1 100644 --- a/readme.md +++ b/readme.md @@ -23,7 +23,7 @@ C4 DSL Patterns расширяет синтаксис Structurizr DSL новой - **Structurizr DSL**: версии `3.2.1` - `4.1.0` - **Java Development Kit (JDK)**: версия `17` -- **AspectJ Weaver (для lite-версии)**: версии `1.9.0` - `1.9.25` +- **AspectJ Weaver (для lite-версии)**: версии `1.9.22` - `1.9.25` ## Документация From 29b4b2cc931025a92ca418073cf678d5f43a9a0a Mon Sep 17 00:00:00 2001 From: Nifacy Date: Sat, 31 Jan 2026 15:41:08 +0300 Subject: [PATCH 6/6] fix: update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 543a7da..9128069 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ - Removed typo in project docs ([#55](https://github.com/Nifacy/c4-patterns/issues/55)) - Added change log support ([#62](https://github.com/Nifacy/c4-patterns/issues/62)) - Added lite & standalone versions of syntax plugin based on AspectJ ([#56](https://github.com/Nifacy/c4-patterns/issues/56)) +- Updated list of supported versions of external dependencies ([#69](https://github.com/Nifacy/c4-patterns/issues/69)) ### Internal