Skip to content

Merge maintenance/mps20241 into maintenance/mps20251 #2966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 21, 2025
Merged

Merge maintenance/mps20241 into maintenance/mps20251 #2966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc820d4
docs: mention PlantUML version update in CHANGELOG.md
sergej-koscejev May 15, 2025
70150f5
Merge branch 'maintenance/mps20241' into docs/plantuml-changelog
sergej-koscejev May 19, 2025
ecce74e
fix(deps): update dependency org.mockito:mockito-core to v5.18.0
renovate[bot] May 21, 2025
68d1bda
Merge pull request #2953 from mbeddr/docs/plantuml-changelog
sergej-koscejev May 21, 2025
695b140
Merge pull request #2965 from mbeddr/renovate/maintenance/mps20241-mo…
slisson May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# May 2025

## com.mbeddr.doc

### Fixed

- PlantUML version changed from erroneously used old 8059 back to 1.2025.2. The erroneous update happened in commit
[d3e54084](https://github.com/mbeddr/mbeddr.core/commit/d3e540849808d1649a4728ac9a32a5c06d37ade2), and was merged
in [ee09cc31](https://github.com/mbeddr/mbeddr.core/commit/ee09cc3167c9943e3a193d2d2dc89d3e82fd1e35) in April 2025.

## com.mbeddr.mpsutil.process

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion subprojects/com.mbeddr/platform/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def bundledDeps = [
new BundledDep('jfreechart', ['org.jfree:jfreechart:1.5.5'], 'com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.jfreechart.runtime', {}),
new BundledDep('plantuml', ['net.sourceforge.plantuml:plantuml:1.2025.2'], 'com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.plantuml/solutions/pluginSolution'),
new BundledDep('opencsv', ['au.com.bytecode:opencsv:2.4'], 'com.mbeddr.mpsutil/solutions/com.opencsv'),
new BundledDep('mockito', ['org.mockito:mockito-core:5.17.0'], 'com.mbeddr.mpsutil/solutions/org.mockito', {}),
new BundledDep('mockito', ['org.mockito:mockito-core:5.18.0'], 'com.mbeddr.mpsutil/solutions/org.mockito', {}),
new BundledDep('ecore', ['org.eclipse.emf:org.eclipse.emf.ecore.xcore:1.32.0'], 'com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.stubs', {
exclude module: 'aopalliance'
exclude module: 'antlr-runtime'
Expand Down
Loading