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

Merging MPS 2022.3 → master #86

Closed
wants to merge 60 commits into from
Closed

Merging MPS 2022.3 → master #86

wants to merge 60 commits into from

Commits on Dec 20, 2023

  1. repo_admin project: cleanup

    @danielratiu
    danielratiu committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    78a0956 View commit details
    Browse the repository at this point in the history

  2. repo_admin project: cleanup

    @danielratiu
    danielratiu committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    bf8209a View commit details
    Browse the repository at this point in the history

  3. nusmv.importer: added textgen to NotReifiedVarRef

    @danielratiu
    danielratiu committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    b5a852f View commit details
    Browse the repository at this point in the history

  4. overall: File -> Force Save All

    @danielratiu
    danielratiu committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    b047a9c View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2023

  1. Update the readme

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    7108ccb View commit details
    Browse the repository at this point in the history

  2. Update docx4j and docx4j-diffx to 11.4.9

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    a9bcf4d View commit details
    Browse the repository at this point in the history

  3. Update build scripts and execute all missing migrations

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    93562d7 View commit details
    Browse the repository at this point in the history

  4. Use the right JBR version

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    37afc9a View commit details
    Browse the repository at this point in the history

  5. Use MPS 2022.2.2

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    b6c9bac View commit details
    Browse the repository at this point in the history

  6. Extract docx4j-diffx into a separate solution and create a separate p… 

    …lugin com.mpsbasics.testutils for it and the test class
    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    a7d6265 View commit details
    Browse the repository at this point in the history

  7. Add missing vcs.xml from tutorial-mdcc to Git

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    1946449 View commit details
    Browse the repository at this point in the history

  8. Reimport the libs in docx4j.lib

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    7263d62 View commit details
    Browse the repository at this point in the history

  9. Fix broken reference

    @alexanderpann
    alexanderpann committed Dec 22, 2023
    Configuration menu
    Copy the full SHA
    b3143a9 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2023

  1. safety: initial version of the GSN importer

    @danielratiu
    danielratiu committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    2638d3b View commit details
    Browse the repository at this point in the history

  2. rcp: fixed the creation of FASTEN RCP 

    base.tooling: fixed ProjectHelper
    @danielratiu
    danielratiu committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    902cf52 View commit details
    Browse the repository at this point in the history

  3. safety.gsn.xml_gen: make GenerateGoalStructure2XML implement INamedCo… 

    …ncept
    @danielratiu
    danielratiu committed Dec 24, 2023
    Configuration menu
    Copy the full SHA
    84c0de1 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. safety.gsn.importer: initial support for importing goal structures fr… 

    …om XML
    @danielratiu
    danielratiu committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    522b7d1 View commit details
    Browse the repository at this point in the history

  2. safety.gsn: unified the styles of attributes

    @danielratiu
    danielratiu committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    5e67df2 View commit details
    Browse the repository at this point in the history

  3. safety.gsn, safety-tutorial: cosmetic fixes

    @danielratiu
    danielratiu committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    ca83bef View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. fasten.rcp: improved creation of new Models and the creation of new R… 

    …oot Nodes
    @danielratiu
    danielratiu committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    b592101 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. safety.ft: remove "read-only" style on FT elements to allow their del… 

    …etion
    @danielratiu
    danielratiu committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    c779932 View commit details
    Browse the repository at this point in the history

  2. safety.gsn: automatically refresh the project-pane after import

    @danielratiu
    danielratiu committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    3df2774 View commit details
    Browse the repository at this point in the history

  3. safety.build: fixed dependencies

    @danielratiu
    danielratiu committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    b0dc2bc View commit details
    Browse the repository at this point in the history

  4. safet.ft: added support for explicitly displaying layout-information … 

    …in DIFF view
    @danielratiu
    danielratiu committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    9ede04d View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2024

  1. safety.rcp: enabled the actionsfilter plugin to filter out irrelevant… 

    … menus for FASTEN

build.gradle: enable installation of actionsfilter into MPS\plugins directory
    @danielratiu
    danielratiu committed Jan 2, 2024
    Configuration menu
    Copy the full SHA
    8d2fbfc View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. safety.tutorial: converted all models to file-per-root format to refl… 

    …ect the default settings of the FASTEN RCP
    @danielratiu
    danielratiu committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    ec71c9d View commit details
    Browse the repository at this point in the history

  2. tutorial.safety: initial readme.md

    @danielratiu
    danielratiu committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    16b6d25 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. safety.gsn: cosmetic improvement of the editor

    @danielratiu
    danielratiu committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    422d396 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Merge remote-tracking branch 'origin/feature/upgrade_docx4j' into mai… 

    …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
    danielratiu committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    60362ab View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. mpsbasics: initial pdfexporter infrastructure 

    formal.base: moved the screenshooters functionality to mpsbasics
    @danielratiu
    danielratiu committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    2f56b25 View commit details
    Browse the repository at this point in the history

  2. refactoring: moved ProjectHelper to mpsbasic.project.utils 

    moved FASTENNotification to mpsbasic.project.utils
    @danielratiu
    danielratiu committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    9fabf63 View commit details
    Browse the repository at this point in the history

  3. assurance.build: added needed solutions from mpsbasics

    @danielratiu
    danielratiu committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    32d2837 View commit details
    Browse the repository at this point in the history

  4. mpsbasics: initial pdfexporter infrastructure

    @danielratiu
    danielratiu committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    561273e View commit details
    Browse the repository at this point in the history

  5. safety.gsn: export to pdf - example

    @danielratiu
    danielratiu committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    1d125d3 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. mpsbasics.pdfbox: improved the exporter

    @danielratiu
    danielratiu committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    37c0ddd View commit details
    Browse the repository at this point in the history

  2. mpsbasics.editor.utils: improved the SVG cell editor screenshooter

    @danielratiu
    danielratiu committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    03c13a3 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2024

  1. mpsbasics: mini improvements of the PDF exporter

    @danielratiu
    danielratiu committed Feb 9, 2024
    Configuration menu
    Copy the full SHA
    cfcee3b View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. safety.gsn: GSN diagrams text has the same font and size as set in th… 

    …e Settings
    @danielratiu
    danielratiu committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    5a24dcc View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2024

  1. mpsbasics: improved exporting of PDFs

    @danielratiu
    danielratiu committed Feb 15, 2024
    Configuration menu
    Copy the full SHA
    52221f2 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. gsn.pdfexport: initial version for exporting argument legs to PDF

    @danielratiu
    danielratiu committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    f7dcf27 View commit details
    Browse the repository at this point in the history

  2. safety: fixing the build

    @danielratiu
    danielratiu committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    c1053f0 View commit details
    Browse the repository at this point in the history

  3. safety.argument.modelquery: fixed runtime solution

    @danielratiu
    danielratiu committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    36489f6 View commit details
    Browse the repository at this point in the history

  4. gsn.pdfexport: initial version for exporting argument legs to PDF

    @danielratiu
    danielratiu committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    6ba241f View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. Merge pull request #80 from mbeddr/feature/pdf_export 

    Implement initial support for exporting to PDF
    @danielratiu
    danielratiu authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    4d02896 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. gsn: slightly better editor styles

    @danielratiu
    danielratiu committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    54a5bcf View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. mpsbasics: enhanced the pdfexport (#81) 

    tutorial-safety: updated the examples
    @danielratiu
    danielratiu authored Feb 28, 2024
    Configuration menu
    Copy the full SHA
    c8611b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. gradle.lockfile: updated dependencies to mps.extension, mbeddr.platform 

    overall: ran automated migrations
    @danielratiu
    danielratiu committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f33ef7a View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. safety: removed deprecated nodes (concepts, properties, links)

    @danielratiu
    danielratiu committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    bacfa65 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Add cascading merge workflow

    @sergej-koscejev
    sergej-koscejev committed May 16, 2024
    Configuration menu
    Copy the full SHA
    8d86d4b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/maintenance/MPS-2022.2' into mai… 

    …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
    danielratiu committed May 16, 2024
    Configuration menu
    Copy the full SHA
    8b17032 View commit details
    Browse the repository at this point in the history

  3. nusmv: re-ran automated migrations

    @danielratiu
    danielratiu committed May 16, 2024
    Configuration menu
    Copy the full SHA
    df83e8d View commit details
    Browse the repository at this point in the history

  4. req: ran automated migrations 

    tutorial.safety: reverted unintended change
    @danielratiu
    danielratiu committed May 16, 2024
    Configuration menu
    Copy the full SHA
    e5f422f View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. formal.safety.build: added "test.mbeddr.formal.safety.argument.modelq… 

    …uery" to the build tests
    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    6abce67 View commit details
    Browse the repository at this point in the history

  2. build_all: refreshed new version

    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f2c031c View commit details
    Browse the repository at this point in the history

  3. formal.safety: fixing decorators of shapes to use an explicitly passe… 

    …d-in repository
    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    55411d0 View commit details
    Browse the repository at this point in the history

  4. build.gradle: fixed mpsVersion to 2022.3

    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    1521553 View commit details
    Browse the repository at this point in the history

  5. build.gradle: fixed mpsVersion to 2022.3

    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    584026d View commit details
    Browse the repository at this point in the history

  6. modelquery: explicitly pass in the SRepository parameter

    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    a22df8c View commit details
    Browse the repository at this point in the history

  7. modelquery: removed ProjectExpression

    @danielratiu
    danielratiu committed May 17, 2024
    Configuration menu
    Copy the full SHA
    f5f1924 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #85 from mbeddr/maintenance/MPS-2022.3_merge_2022.… 

    …2_dan

maintenance/merge_maintenance_mps_2022.2_into_maintenance_2022.3
    @danielratiu
    danielratiu authored May 17, 2024
    Configuration menu
    Copy the full SHA
    9caf234 View commit details
    Browse the repository at this point in the history