Skip to content
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

Jump to bottom

Merge maintenance/MPS-2022.3_merge_2022.2_dan into master #83

Closed
wants to merge 60 commits into from
Closed

Merge maintenance/MPS-2022.3_merge_2022.2_dan into master #83

wants to merge 60 commits into from

Conversation

mps-ci-buildbot
Copy link
Contributor

Merge changes from maintenance/MPS-2022.3_merge_2022.2_dan to master.

danielratiu and others added 30 commits December 20, 2023 10:45
@danielratiu
repo_admin project: cleanup
78a0956
@danielratiu
repo_admin project: cleanup
bf8209a
@danielratiu
nusmv.importer: added textgen to NotReifiedVarRef
b5a852f
@danielratiu
overall: File -> Force Save All
b047a9c
@alexanderpann
Update the readme
7108ccb
@alexanderpann
Update docx4j and docx4j-diffx to 11.4.9
a9bcf4d
@alexanderpann
Update build scripts and execute all missing migrations
93562d7
@alexanderpann
Use the right JBR version
37afc9a
@alexanderpann
Use MPS 2022.2.2
b6c9bac
@alexanderpann
Extract docx4j-diffx into a separate solution and create a separate p…
a7d6265 
…lugin com.mpsbasics.testutils for it and the test class
@alexanderpann
Add missing vcs.xml from tutorial-mdcc to Git
1946449
@alexanderpann
Reimport the libs in docx4j.lib
7263d62
@alexanderpann
Fix broken reference
b3143a9
@danielratiu
safety: initial version of the GSN importer
2638d3b
@danielratiu
rcp: fixed the creation of FASTEN RCP
902cf52 
base.tooling: fixed ProjectHelper
@danielratiu
safety.gsn.xml_gen: make GenerateGoalStructure2XML implement INamedCo…
84c0de1 
…ncept
@danielratiu
safety.gsn.importer: initial support for importing goal structures fr…
522b7d1 
…om XML
@danielratiu
safety.gsn: unified the styles of attributes
5e67df2
@danielratiu
safety.gsn, safety-tutorial: cosmetic fixes
ca83bef
@danielratiu
fasten.rcp: improved creation of new Models and the creation of new R…
b592101 
…oot Nodes
@danielratiu
safety.ft: remove "read-only" style on FT elements to allow their del…
c779932 
…etion
@danielratiu
safety.gsn: automatically refresh the project-pane after import
3df2774
@danielratiu
safety.build: fixed dependencies
b0dc2bc
@danielratiu
safet.ft: added support for explicitly displaying layout-information …
9ede04d 
…in DIFF view
@danielratiu
safety.rcp: enabled the actionsfilter plugin to filter out irrelevant…
8d2fbfc 
… menus for FASTEN

build.gradle: enable installation of actionsfilter into MPS\plugins directory
@danielratiu
safety.tutorial: converted all models to file-per-root format to refl…
ec71c9d 
…ect the default settings of the FASTEN RCP
@danielratiu
tutorial.safety: initial readme.md
16b6d25
@danielratiu
safety.gsn: cosmetic improvement of the editor
422d396
@danielratiu
Merge remote-tracking branch 'origin/feature/upgrade_docx4j' into mai…
60362ab 
…ntenance/MPS-2022.2

# Conflicts:
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_010_airbag_controller_functional_control_structure.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/Safety Requirements Are Well Defined.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_100_top_level.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps
#	gradle.lockfile
@danielratiu
mpsbasics: initial pdfexporter infrastructure
2f56b25 
formal.base: moved the screenshooters functionality to mpsbasics
danielratiu and others added 18 commits February 8, 2024 10:14
@danielratiu
mpsbasics.pdfbox: improved the exporter
37c0ddd
@danielratiu
mpsbasics.editor.utils: improved the SVG cell editor screenshooter
03c13a3
@danielratiu
mpsbasics: mini improvements of the PDF exporter
cfcee3b
@danielratiu
safety.gsn: GSN diagrams text has the same font and size as set in th…
5a24dcc 
…e Settings
@danielratiu
mpsbasics: improved exporting of PDFs
52221f2
@danielratiu
gsn.pdfexport: initial version for exporting argument legs to PDF
f7dcf27
@danielratiu
safety: fixing the build
c1053f0
@danielratiu
safety.argument.modelquery: fixed runtime solution
36489f6
@danielratiu
gsn.pdfexport: initial version for exporting argument legs to PDF
6ba241f
@danielratiu
Merge pull request #80 from mbeddr/feature/pdf_export
4d02896 
Implement initial support for exporting to PDF
@danielratiu
gsn: slightly better editor styles
54a5bcf
@danielratiu
mpsbasics: enhanced the pdfexport (#81)
c8611b1 
tutorial-safety: updated the examples
@danielratiu
gradle.lockfile: updated dependencies to mps.extension, mbeddr.platform
f33ef7a 
overall: ran automated migrations
@danielratiu
safety: removed deprecated nodes (concepts, properties, links)
bacfa65
@sergej-koscejev
Add cascading merge workflow
8d86d4b
@danielratiu
Merge remote-tracking branch 'origin/maintenance/MPS-2022.2' into mai…
8b17032 
…ntenance/MPS-2022.3_merge_2022.2_dan

# Conflicts:
#	README.md
#	build.gradle.kts
#	code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.ft/test.com.fasten.safety.ft.msd
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/com.mbeddr.formal.safety.tutorial.msd
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._010_requirements.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._020_hazards_and_risk_analysis/_010_airbag_controller_functional_control_structure.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._040_safety_models.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._050_structured_assurance_cases.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._051_structured_assurance_cases_doc/_015_cross_referencing_goal_structure.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_cae/Safety Requirements Are Well Defined.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._060_assurance_case_fragments_reuse_gsn/_010_pattern_instantiation.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._070_assurance_cases_linked_to_artifacts_models/_100_top_level.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_010_features._100_checkable_assurance_demo.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._010_charging_cable._010_safe_charging_cable.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._010_safe_lane_keeping.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._020_safe_acc.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._020_adas_students_lab._030_safe_emergency_break.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._010_intersection_handling.ihs.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._000_hara.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._010_scenarios.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._020_requirements.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._050_architecture.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_100_examples._030_adas._020_automated_evasion_maneuver._100_safety_case.mps
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.tutorial/models/_500_real_world_examples._010_uber_atg_safety_case_modularized/_010_uber_atg_safety_case_top.mpsr
#	code/tutorial-safety/solutions/com.mbeddr.formal.safety.users_guide/models/doc.mps
#	gradle.lockfile
@danielratiu
nusmv: re-ran automated migrations
df83e8d
@danielratiu
req: ran automated migrations
e5f422f 
tutorial.safety: reverted unintended change
@sergej-koscejev sergej-koscejev deleted the merge/master branch May 20, 2024 08:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielratiu danielratiu Awaiting requested review from danielratiu

Assignees

@danielratiu danielratiu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mps-ci-buildbot @danielratiu @alexanderpann @sergej-koscejev