Merge remote-tracking branch 'origin/master' into datev-staging

# Conflicts:
#	code/languages/org.iets3.opensource/languages/org.iets3.core.expr.tests/org.iets3.core.expr.tests.mpl
#	code/languages/org.iets3.opensource/languages/org.iets3.core.expr.toplevel/org.iets3.core.expr.toplevel.mpl
#	code/languages/org.iets3.opensource/languages/org.iets3.req.plugin/models/org/iets3/req/plugin/plugin.mps
#	code/languages/org.iets3.opensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps

Author: wsafonov

README.md

@@ -4,14 +4,13 @@ import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
-
 //will pull the groovy classes/types from nexus to the classpath
 buildscript {
     repositories {
-        maven { url 'https://projects.itemis.de/nexus/content/repositories/mbeddr' }
+        maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
     }
     dependencies {
-        classpath 'de.itemis.mps:mps-gradle-plugin:1.2.175.cc60dc8'
+        classpath 'de.itemis.mps:mps-gradle-plugin:1.7.288.4ea765f'
     }
 }
 
@@ -21,32 +20,27 @@ plugins {
     id 'co.riiid.gradle' version '0.4.2'
 }
 
-// Detect jdk location, required to start ant with tools.jar on classpath otherwise javac and tests will fail
-def jdk_home
+ext.dependencyRepositories = [
+    'https://artifacts.itemis.cloud/repository/maven-mps/'
+]
 
-if (ext.has('java11_home')) {
-    jdk_home = ext.get('java11_home')
-} else if (System.getenv('JB_JAVA11_HOME') != null) {
-    jdk_home = System.getenv('JB_JAVA11_HOME')
-} else {
-    def expected = JavaVersion.VERSION_11
-    if (JavaVersion.current() != expected) {
-        throw new GradleException("This build script requires Java 11 but you are currently using ${JavaVersion.current()}.\nWhat you can do:\n"
-                + "  * Use project property java11_home to point to the Java 11 JDK.\n"
-                + "  * Use environment variable JB_JAVA11_HOME to point to the Java 11 JDK\n"
-                + "  * Run Gradle using Java 11")
+repositories {
+    // we don't use mavenLocal() repo, since it can cause various issues with resolving dependencies,
+    // see https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:case-for-maven-local
+    for (repoUrl in project.dependencyRepositories) {
+        maven {
+            url repoUrl
+        }
     }
-    jdk_home = System.getProperty('java.home')
-}
-
-// Check JDK location
-if (!new File(jdk_home, "lib").exists()) {
-    throw new GradleException("Unable to locate JDK home folder. Detected folder is: $jdk_home")
+    mavenCentral()
 }
 
-logger.info 'Using JDK at {}', jdk_home
+apply plugin: 'download-jbr'
 
-ext.jdk_home = jdk_home
+// configure jbr download
+downloadJbr {
+    jbrVersion = '11_0_11-b1341.60'
+}
 
 // detect if we are in a CI build
 if (project.hasProperty("forceCI")) {
@@ -56,7 +50,6 @@ if (project.hasProperty("forceCI")) {
     ext.ciBuild = project.hasProperty("teamcity")
 }
 
-
 def forceLocal = project.hasProperty("forceLocalDependencies")
 
 def major = "2021"
@@ -112,14 +105,10 @@ if (!project.hasProperty("mbeddrVersion")) {
 }
 
 
-ext.releaseRepository = 'https://projects.itemis.de/nexus/content/repositories/mbeddr'
-ext.snapshotRepository = 'https://projects.itemis.de/nexus/content/repositories/mbeddr_snapshots'
+ext.releaseRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-releases/'
+ext.snapshotRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-snapshots'
 ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRepository : releaseRepository
 
-ext.dependencyRepositories = [
-    'https://projects.itemis.de/nexus/content/repositories/mbeddr',
-    'https://projects.itemis.de/nexus/content/repositories/mbeddr_snapshots'
-]
 
 // 'artifacts' is used in the generated ant scripts as build output directory
 ext.artifactsDir = new File(buildDir, 'artifacts')
@@ -145,21 +134,6 @@ dependencies {
     pcollections 'org.pcollections:pcollections:3.1.4'
 }
 
-repositories {
-    mavenLocal()
-    for (repoUrl in project.dependencyRepositories) {
-        maven {
-            url repoUrl
-            if (project.hasProperty('nexusUsername')) {
-                credentials {
-                    username project.nexusUsername
-                    password project.nexusPassword
-                }
-            }
-        }
-    }
-    mavenCentral()
-}
 
 task resolveMps(type: Sync) {
     dependsOn configurations.mps
@@ -193,7 +167,7 @@ task resolvePcollections(type: Sync) {
     }
 }
 
-task resolveDependencies(dependsOn: [resolveLanguageLibs, resolvePcollections])
+task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs, resolvePcollections])
 
 // Default arguments for ant scripts
 def defaultScriptArgs = [
@@ -207,15 +181,14 @@ if (gradle.startParameter.logLevel.toString() != "LIFECYCLE") {
     defaultScriptArgs.put('mps.ant.log', gradle.startParameter.logLevel.toString().toLowerCase())
 }
 
-def defaultScriptClasspath = project.configurations.junitAnt.fileCollection { true } +
-        project.files("$ext.jdk_home/lib/tools.jar")
-
 // enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
 ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.collect { "-D$it.key=$it.value".toString() }
-ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = defaultScriptClasspath
-ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java')
+ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = project.configurations.junitAnt.fileCollection { true }
+afterEvaluate {
+    project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
+}
 
-task buildAllScripts(type: BuildLanguages, dependsOn: [resolveMps, resolveDependencies]) {
+task buildAllScripts(type: BuildLanguages, dependsOn: resolveDependencies) {
     script "$buildDir/scripts/build-allScripts.xml"
 }
 
@@ -293,29 +266,27 @@ static def addDependency(Object pom, Configuration config) {
 publishing {
     repositories {
         maven {
-            url project.publishingRepository
-            if (project.hasProperty('nexusUsername')) {
+            url = project.publishingRepository
+            if (project.hasProperty("artifacts.itemis.cloud.user") && project.hasProperty("artifacts.itemis.cloud.pw")) {
                 credentials {
-                    username project.nexusUsername
-                    password project.nexusPassword
+                    username = project.findProperty("artifacts.itemis.cloud.user")
+                    password = project.findProperty("artifacts.itemis.cloud.pw")
                 }
             }
         }
-    }
-    repositories {
-        if(currentBranch == "master" || currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {
-                maven {
-                    name = "GitHubPackages"
-                    url = uri("https://maven.pkg.github.com/IETS3/iets3.opensource")
-                    if(project.hasProperty("gpr.token")) {
-                        credentials {
-                            username = project.findProperty("gpr.user")
-                            password = project.findProperty("gpr.token")
-                        }
+        if (currentBranch == "master" || currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {
+            maven {
+                name = "GitHubPackages"
+                url = uri("https://maven.pkg.github.com/IETS3/iets3.opensource")
+                if (project.hasProperty("gpr.token")) {
+                    credentials {
+                        username = project.findProperty("gpr.user")
+                        password = project.findProperty("gpr.token")
                     }
                 }
             }
         }
+    }
 
     publications {
         openSource(MavenPublication) {
@@ -393,21 +364,6 @@ publishing {
     }
 }
 
-
-task generateLibrariesXml(type: GenerateLibrariesXml) {
-    dependsOn resolveDependencies
-    description "Will read project libraries from projectlibraries.properties and generate libraries.xml in .mps directory. Libraries are loaded in mps during start."
-    defaults rootProject.file('projectlibraries.properties')
-    overrides rootProject.file('projectlibraries.overrides.properties')
-    destination file('code/languages/org.iets3.opensource/.mps/libraries.xml')
-}
-
-task setup {
-    dependsOn generateLibrariesXml
-    dependsOn resolveDependencies
-    description 'Set up MPS project libraries. Libraries are read in from projectlibraries.properties file.'
-}
-
 defaultTasks 'buildLanguages'
 
 def listMergedPRs = {

build.gradle

@@ -5,7 +5,7 @@
     <use id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor" version="14" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="11" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="18" />
-    <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="1" />
+    <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
     <devkit ref="2677cb18-f558-4e33-bc38-a5139cee06dc(jetbrains.mps.devkit.language-design)" />
   </languages>
   <imports>

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps

@@ -48,6 +48,7 @@
       </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="6714410169261853888" name="conceptId" index="EcuMT" />
+        <property id="4628067390765907488" name="conceptShortDescription" index="R4oN_" />
         <property id="4628067390765956807" name="final" index="R5$K2" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
         <child id="1071489727083" name="linkDeclaration" index="1TKVEi" />
@@ -99,6 +100,7 @@
     <property role="TrG5h" value="AbstractSolverTask" />
     <property role="R5$K7" value="true" />
     <property role="R5$K2" value="false" />
+    <property role="R4oN_" value="a base task for creating solver tasks" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="PrWs8" id="7rOSrvnG0Gn" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
@@ -108,6 +110,7 @@
     <property role="TrG5h" value="SolveControl" />
     <property role="3GE5qa" value="control" />
     <property role="EcuMT" value="4214990435119232757" />
+    <property role="R4oN_" value="an attribute containing additional settings for the solver" />
     <ref role="1TJDcQ" to="tpck:2ULFgo8_XDk" resolve="NodeAttribute" />
     <node concept="M6xJ_" id="3DYDRw0WRrQ" role="lGtFl">
       <property role="Hh88m" value="solveControl" />
@@ -141,6 +144,7 @@
     <property role="EcuMT" value="1103723565300550875" />
     <property role="3GE5qa" value="adapter" />
     <property role="TrG5h" value="ErrorMessage" />
+    <property role="R4oN_" value="a message describing an error state" />
     <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyi" id="XhdFKvXSNs" role="1TKVEl">
       <property role="IQ2nx" value="1103723565300550876" />
@@ -152,6 +156,7 @@
     <property role="EcuMT" value="1103723565300541528" />
     <property role="3GE5qa" value="adapter" />
     <property role="TrG5h" value="ErrorSolverTask" />
+    <property role="R4oN_" value="a failed solver task" />
     <ref role="1TJDcQ" node="7rOSrvnFUQX" resolve="AbstractSolverTask" />
     <node concept="1TJgyj" id="XhdFKvXSNY" role="1TKVEi">
       <property role="IQ2ns" value="1103723565300550910" />

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/structure.mps

@@ -25,7 +25,7 @@
   </dependencies>
   <languageVersions>
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
-    <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="1" />
+    <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
     <language slang="l:b4f35ed8-45af-4efa-abe4-00ac26956e69:com.mbeddr.mpsutil.grammarcells.runtimelang" version="0" />
     <language slang="l:b92f861d-0184-446d-b88b-6dcf0e070241:com.mbeddr.mpsutil.intentions" version="0" />
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="11" />