From 338602fc50254da6a629db9c7917d576194d842c Mon Sep 17 00:00:00 2001
From: Alexander Pann <88385944+alexanderpann@users.noreply.github.com>
Date: Fri, 8 Dec 2023 10:50:30 +0100
Subject: [PATCH 01/41] Migrate to 2023.2 (#23)
* org.mpsqa.base: run migrations
* org.mpsqa.arch: run migrations
* org.mpsqa.build: run migrations
* org.mpsqa.deprecated: run migrations
* org.mpsqa.lint: run migrations
* org.mpsqa.mutant: run migrations + fix imports
* org.mpsqa.unused: run migrations
* org.mpsqa.base: re-export JDK for libs
* org.mpsqa.testing: run migrations
* org.mpsqa.clones: run migrations
* org.mpsqa.clones.demo: run migrations
* org.mpsqa.clones.demo: run migrations and fix build script
* Cleanup + fix some warnings
* Update build.gradle
---
build.gradle | 8 +-
build/scripts/build_all_scripts.xml | 5 +-
.../code/.mps/migration.xml | 4 +-
.../org.mpsqa.clones.demo/code/.mps/vcs.xml | 2 +-
.../models/build.mps | 76 ++++++----
.../org.mpsqa.clones.demo.build.msd | 5 +-
.../models/_010_clones_detection_config.mps | 2 +-
.../models/_010_headless_runner@tests.mps | 6 +-
.../org.mpsqa.clones.demo.config.msd | 5 +-
.../org.mpsqa.arch/.mps/migration.xml | 4 +-
.../models/org.mpsqa.arch.behavior.mps | 58 +++----
.../models/org.mpsqa.arch.constraints.mps | 4 +-
.../models/org.mpsqa.arch.editor.mps | 26 ++--
.../models/org.mpsqa.arch.intentions.mps | 12 +-
.../models/org.mpsqa.arch.structure.mps | 2 +-
.../models/org.mpsqa.arch.typesystem.mps | 48 +++---
.../models/org.mpsqa.arch.util.mps | 14 +-
.../org.mpsqa.arch/org.mpsqa.arch.mpl | 3 +-
...baselang.generator.templates@generator.mps | 24 ---
.../test.org.mpsqa.arch.baselang.mpl | 46 +-----
....ext.ext.generator.templates@generator.mps | 24 ---
.../test.org.mpsqa.arch.ext.ext.mpl | 46 +-----
...arch.ext.generator.templates@generator.mps | 24 ---
.../test.org.mpsqa.arch.ext.mpl | 46 +-----
.../org.mpsqa.arch.pluginSolution.plugin.mps | 112 +++++++++-----
.../org.mpsqa.arch.pluginSolution.msd | 11 +-
.../models/org.mpsqa.arch.sandbox.smoke.mps | 2 +-
.../org.mpsqa.arch.sandbox.msd | 3 +-
...qa.arch._010_simple_dependencies@tests.mps | 2 +-
.../test.org.mpsqa.arch.msd | 3 +-
.../org.mpsqa.base/.mps/migration.xml | 4 +-
.../org.mpsqa.base.lib/org.mpsqa.base.lib.msd | 13 +-
.../org.mpsqa.base.utils.notifications.mps | 10 +-
.../org.mpsqa.base.utils.msd | 3 +-
.../org.mpsqa.treemap.lib.msd | 19 +--
.../org.mpsqa.build/.mps/migration.xml | 4 +-
.../org.mpsqa.build._000_all_scripts.mps | 18 +--
.../org.mpsqa.build._010_base_build.mps | 22 +--
.../org.mpsqa.build._020_testing_build.mps | 4 +-
.../org.mpsqa.build._030_clones_build.mps | 142 ++++++++++++------
.../org.mpsqa.build._040_mutant_build.mps | 52 +------
.../org.mpsqa.build._050_unused_build.mps | 18 +--
.../org.mpsqa.build._060_arch_build.mps | 18 +--
.../org.mpsqa.build._070_deprecated_build.mps | 18 +--
.../org.mpsqa.build._080_lint_build.mps | 18 +--
.../org.mpsqa.build._100_allInOne_build.mps | 18 +--
.../org.mpsqa.build/org.mpsqa.build.msd | 3 +-
.../org.mpsqa.clones/.mps/migration.xml | 4 +-
.../generator/template/main@generator.mps | 24 ---
.../org.mpsqa.clones.config.behavior.mps | 6 +-
.../models/org.mpsqa.clones.config.editor.mps | 6 +-
.../org.mpsqa.clones.config.intentions.mps | 4 +-
.../org.mpsqa.clones.config.structure.mps | 2 +-
.../org.mpsqa.clones.config.mpl | 46 +-----
.../models/org.mpsqa.clones.build.mps | 21 +--
.../org.mpsqa.clones.build.msd | 3 +-
...qa.clones.config.pluginSolution.plugin.mps | 23 ++-
.../models/utils.mps | 34 ++---
...org.mpsqa.clones.config.pluginSolution.msd | 7 +-
.../org.mpsqa.clones.core/models/algo.mps | 36 ++---
.../org.mpsqa.clones.core/models/hashcode.mps | 10 +-
.../models/management.mps | 18 +--
.../org.mpsqa.clones.core/models/utils.mps | 8 +-
.../org.mpsqa.clones.core.msd | 5 +-
.../models/plugin.mps | 6 +-
.../org.mpsqa.clones.java.pluginSolution.msd | 7 +-
.../models/plugin.mps | 19 ++-
.../models/ui.mps | 18 +--
.../models/visualization.mps | 24 +--
.../org.mpsqa.clones.pluginSolution.msd | 7 +-
...es.config.sandbox.simple_clones_config.mps | 2 +-
.../org.mpsqa.clones.config.sandbox.msd | 3 +-
.../models/_010_headless_runner_1@tests.mps | 6 +-
.../models/clone_config_headless_01.mps | 2 +-
.../test.org.mpsqa.clones.headless.msd | 7 +-
.../models/_000_infrastructure@tests.mps | 28 +++-
.../_010_identical_java_statements@tests.mps | 4 +-
.../models/_020_overlapping_clones@tests.mps | 4 +-
.../_200_save_load_filter_clones@tests.mps | 4 +-
...estcode._010_identical_java_statements.mps | 29 +++-
.../testcode._020_overlapping_clones.mps | 6 +-
.../test.org.mpsqa.clones.msd | 5 +-
.../org.mpsqa.deprecated/.mps/migration.xml | 4 +-
...mple_lan.generator.templates@generator.mps | 24 ---
...rg.mpsqa.deprecated.example_lan.editor.mps | 2 +-
...mpsqa.deprecated.example_lan.structure.mps | 2 +-
.../org.mpsqa.deprecated.example_lan.mpl | 46 +-----
.../models/org.mpsqa.deprecated.editor.mps | 4 +-
.../org.mpsqa.deprecated.intentions.mps | 58 +++----
.../models/org.mpsqa.deprecated.structure.mps | 2 +-
.../org.mpsqa.deprecated.typesystem.mps | 6 +-
.../org.mpsqa.deprecated.mpl | 3 +-
...precated.sandbox._010_deprecated_nodes.mps | 2 +-
.../org.mpsqa.deprecated.sandbox.msd | 3 +-
...eprecated._010_deprecation_tests@tests.mps | 16 +-
.../test.org.mpsqa.deprecated.msd | 5 +-
.../org.mpsqa.lint/.mps/migration.xml | 4 +-
....generic.generator.templates@generator.mps | 6 +-
.../org.mpsqa.lint.generic.behavior.mps | 52 +++----
.../models/org.mpsqa.lint.generic.editor.mps | 12 +-
.../org.mpsqa.lint.generic.structure.mps | 2 +-
.../org.mpsqa.lint.generic.typesystem.mps | 10 +-
.../models/org.mpsqa.lint.generic.util.mps | 14 +-
.../org.mpsqa.lint.generic.mpl | 5 +-
.../models/org.mpsqa.lint.build.mps | 4 +-
.../org.mpsqa.lint.build.msd | 3 +-
...int.generic.linters_library.filesystem.mps | 8 +-
...psqa.lint.generic.linters_library.meta.mps | 18 +--
...qa.lint.generic.linters_library.models.mps | 48 +++---
...a.lint.generic.linters_library.modules.mps | 48 +++---
...sqa.lint.generic.linters_library.nodes.mps | 6 +-
...org.mpsqa.lint.generic.linters_library.msd | 5 +-
...andbox._010_smoke_user_defined_linters.mps | 8 +-
..._smoke_referenced_linters_from_library.mps | 2 +-
...int.generic.sandbox._500_other_scripts.mps | 2 +-
.../org.mpsqa.lint.generic.sandbox.msd | 5 +-
...s_lang.linters_library.behavior_aspect.mps | 6 +-
...t.mps_lang.linters_library.expressions.mps | 26 ++--
..._lang.linters_library.generator_aspect.mps | 6 +-
...qa.lint.mps_lang.linters_library.tests.mps | 50 +++---
...rg.mpsqa.lint.mps_lang.linters_library.msd | 5 +-
.../models/org.mpsqa.lint.test@tests.mps | 6 +-
.../org.mpsqa.lint.test.msd | 5 +-
.../org.mpsqa.mutant/.mps/migration.xml | 4 +-
.../generator/templates/main@generator.mps | 24 ---
.../org.mpsqa.mutant.demolang.editor.mps | 4 +-
.../org.mpsqa.mutant.demolang.structure.mps | 2 +-
.../org.mpsqa.mutant.demolang.mpl | 46 +-----
.../generator/templates/main@generator.mps | 24 ---
.../models/org.mpsqa.mutant.behavior.mps | 6 +-
.../models/org.mpsqa.mutant.editor.mps | 2 +-
.../models/org.mpsqa.mutant.intentions.mps | 12 +-
.../models/org.mpsqa.mutant.structure.mps | 2 +-
.../org.mpsqa.mutant/org.mpsqa.mutant.mpl | 46 +-----
.../models/org.mpsqa.mutant.base.core.mps | 10 +-
.../models/org.mpsqa.mutant.base.filter.mps | 50 +++---
.../org.mpsqa.mutant.base.model_checkers.mps | 28 ++--
...mpsqa.mutant.base.next_concept_chooser.mps | 8 +-
.../org.mpsqa.mutant.base.postprocessor.mps | 10 +-
...qa.mutant.base.references_synthethiser.mps | 18 +--
.../org.mpsqa.mutant.base.seed_chooser.mps | 18 +--
.../models/org.mpsqa.mutant.base.utils.mps | 23 ++-
.../org.mpsqa.mutant.base.msd | 6 +-
...org.mpsqa.mutant.pluginSolution.plugin.mps | 2 +-
.../org.mpsqa.mutant.pluginSolution.msd | 5 +-
...mpsqa.mutant.sandbox.java_baseLanguage.mps | 4 +-
.../org.mpsqa.mutant.sandbox.msd | 5 +-
...qa.mutant.demolang._010_smoke_testcode.mps | 2 +-
...010_smoke_testcode_010_depth_1_mutants.mps | 2 +-
...010_smoke_testcode_020_depth_2_mutants.mps | 2 +-
...010_smoke_testcode_030_depth_3_mutants.mps | 2 +-
...cept_with_two_children_depth_2_mutants.mps | 2 +-
...mutant.demolang._010_smoke_tests@tests.mps | 6 +-
...molang._020_smoke_constraints_testcode.mps | 2 +-
...ang._020_smoke_constraints_tests@tests.mps | 4 +-
.../test.org.mpsqa.mutant.demolang.msd | 5 +-
.../org.mpsqa.testing/.mps/migration.xml | 4 +-
...n.jacoco.generator.templates@generator.mps | 78 +++++-----
...buildIntegration.jacoco.generator.util.mps | 6 +-
...stcov.buildIntegration.jacoco.behavior.mps | 16 +-
...ov.buildIntegration.jacoco.constraints.mps | 2 +-
...testcov.buildIntegration.jacoco.editor.mps | 6 +-
...tcov.buildIntegration.jacoco.structure.mps | 2 +-
....mpsqa.testcov.buildIntegration.jacoco.mpl | 5 +-
...v.jacoco.generator.templates@generator.mps | 2 +-
.../org.mpsqa.testcov.jacoco.intentions.mps | 4 +-
.../org.mpsqa.testcov.jacoco.mpl | 5 +-
.../models/org.mpsqa.gentest.baseline.mps | 24 +--
.../org.mpsqa.gentest.baseline.msd | 5 +-
....mpsqa.testcov.jacoco.rt.java_coverage.mps | 8 +-
...mpsqa.testcov.jacoco.rt.nodes_coverage.mps | 22 +--
.../org.mpsqa.testcov.jacoco.rt.plugin.mps | 16 +-
....mpsqa.testcov.jacoco.rt.visualization.mps | 24 +--
.../org.mpsqa.testcov.jacoco.rt.msd | 19 +--
.../org.mpsqa.testcov.jacoco.sandbox.msd | 3 +-
.../org.mpsqa.unused/.mps/migration.xml | 4 +-
...a.invisible_models.test_lang.structure.mps | 2 +-
.../org.mpsqa.invisible_models.test_lang.mpl | 3 +-
.../org.mpsqa.invisible_models.editor.mps | 2 +-
.../org.mpsqa.invisible_models.intentions.mps | 38 ++---
.../org.mpsqa.invisible_models.structure.mps | 2 +-
.../org.mpsqa.invisible_models.mpl | 3 +-
...a.lancov.generator.templates@generator.mps | 2 +-
.../models/org.mpsqa.lancov.behavior.mps | 16 +-
.../models/org.mpsqa.lancov.editor.mps | 4 +-
.../models/org.mpsqa.lancov.intentions.mps | 50 +++---
.../models/org.mpsqa.lancov.structure.mps | 2 +-
.../org.mpsqa.lancov/org.mpsqa.lancov.mpl | 5 +-
...g.mpsqa.invisible_models.sandbox.smoke.mps | 2 +-
.../org.mpsqa.invisible_models.sandbox.msd | 3 +-
.../models/org.mpsqa.lancov.sandbox.smoke.mps | 2 +-
.../org.mpsqa.lancov.sandbox.msd | 3 +-
192 files changed, 1115 insertions(+), 1657 deletions(-)
delete mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.baselang/generator/templates/test.org.mpsqa.arch.baselang.generator.templates@generator.mps
delete mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext.ext/generator/templates/test.org.mpsqa.arch.ext.ext.generator.templates@generator.mps
delete mode 100644 code/languages/org.mpsqa.arch/languages/test.org.mpsqa.arch.ext/generator/templates/test.org.mpsqa.arch.ext.generator.templates@generator.mps
delete mode 100644 code/languages/org.mpsqa.clones/languages/org.mpsqa.clones.config/generator/template/main@generator.mps
delete mode 100644 code/languages/org.mpsqa.deprecated/languages/org.mpsqa.deprecated.example_lan/generator/templates/org.mpsqa.deprecated.example_lan.generator.templates@generator.mps
delete mode 100644 code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant.demolang/generator/templates/main@generator.mps
delete mode 100644 code/languages/org.mpsqa.mutant/languages/org.mpsqa.mutant/generator/templates/main@generator.mps
diff --git a/build.gradle b/build.gradle
index c6aafc6b..ac8c9b33 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
apply plugin: 'download-jbr'
-ext.jbrVers = '17.0.3-b469.32'
+ext.jbrVers = '17.0.8.1-b1000.32'
downloadJbr {
jbrVersion = jbrVers
@@ -57,11 +57,11 @@ ext.dependencyRepositories = [
]
// Dependency versions
-ext.mpsVersion = '2022.3'
+ext.mpsVersion = '2023.2'
// Project versions
-ext.major = '2022'
-ext.minor = '3'
+ext.major = '2023'
+ext.minor = '2'
if (ciBuild) {
String branch = GitBasedVersioning.gitBranch
diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml
index 4b38a20b..3c054f7a 100644
--- a/build/scripts/build_all_scripts.xml
+++ b/build/scripts/build_all_scripts.xml
@@ -3,7 +3,7 @@
-
+
@@ -28,7 +28,7 @@
-
+
@@ -206,6 +206,7 @@
+
diff --git a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml b/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
index 1c00245e..d62e30e5 100644
--- a/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
+++ b/code/applications/org.mpsqa.clones.demo/code/.mps/migration.xml
@@ -9,6 +9,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml b/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
index e25a9f81..4fce1d86 100644
--- a/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
+++ b/code/applications/org.mpsqa.clones.demo/code/.mps/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
index 5b723a8a..fa00f2d1 100644
--- a/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
+++ b/code/applications/org.mpsqa.clones.demo/code/solutions/org.mpsqa.clones.demo.build/models/build.mps
@@ -9,6 +9,8 @@
+
+
@@ -60,7 +62,7 @@
-
+
@@ -73,7 +75,7 @@
-
+
@@ -109,6 +111,12 @@
+
+
+
+
+
+
@@ -152,7 +160,7 @@