Merge branch 'graphs4value:main' into datastructure

11 files changed, 90 insertions, 56 deletions

diff --git a/subprojects/language-model/META-INF/MANIFEST.MF b/subprojects/language-model/META-INF/MANIFEST.MF
index a9c6340a..5d36a475 100644
--- a/subprojects/language-model/META-INF/MANIFEST.MF
+++ b/subprojects/language-model/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Version: 0.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: tools.refinery.language.model,
  tools.refinery.language.model.problem,
  tools.refinery.language.model.problem.impl,
diff --git a/subprojects/language-model/META-INF/MANIFEST.MF.license b/subprojects/language-model/META-INF/MANIFEST.MF.license
new file mode 100644
index 00000000..e5db6ccd
--- /dev/null
+++ b/subprojects/language-model/META-INF/MANIFEST.MF.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/subprojects/language-model/build.gradle b/subprojects/language-model/build.gradle
deleted file mode 100644
index 275db188..00000000
--- a/subprojects/language-model/build.gradle
+++ /dev/null
@@ -1,55 +0,0 @@
-plugins {
-        id 'refinery-java-library'
-        id 'refinery-mwe2'
-        id 'refinery-sonarqube'
-}
-
-dependencies {
-        api libs.ecore
-        api libs.ecore.xmi
-        mwe2 libs.ecore.codegen
-        mwe2 libs.mwe.utils
-        mwe2 libs.mwe2.lib
-        mwe2 libs.xtext.core
-        mwe2 libs.xtext.xbase
-}
-
-sourceSets {
-        main {
-                java.srcDirs += ['src/main/emf-gen']
-        }
-}
-
-def generateEPackage = tasks.register('generateEPackage', JavaExec) {
-        mainClass = 'org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher'
-        classpath = configurations.mwe2
-        inputs.file 'src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2'
-        inputs.file 'src/main/resources/model/problem.ecore'
-        inputs.file 'src/main/resources/model/problem.genmodel'
-        outputs.dir 'src/main/emf-gen'
-        args += 'src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2'
-        args += '-p'
-        args += "rootPath=/${projectDir}"
-}
-
-for (taskName in ['compileJava', 'processResources', 'generateEclipseSourceFolders']) {
-        tasks.named(taskName) {
-                dependsOn generateEPackage
-        }
-}
-
-tasks.named('clean') {
-        delete 'src/main/emf-gen'
-}
-
-sonarqube.properties {
-        properties['sonar.exclusions'] += [
-                'src/main/emf-gen/**',
-        ]
-}
-
-eclipse.project.natures += [
-        'org.eclipse.sirius.nature.modelingproject',
-        'org.eclipse.pde.PluginNature',
-        'org.eclipse.xtext.ui.shared.xtextNature'
-]
diff --git a/subprojects/language-model/build.gradle.kts b/subprojects/language-model/build.gradle.kts
new file mode 100644
index 00000000..59ff9046
--- /dev/null
+++ b/subprojects/language-model/build.gradle.kts
@@ -0,0 +1,65 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+import tools.refinery.gradle.utils.SonarPropertiesUtils
+
+plugins {
+        id("tools.refinery.gradle.java-library")
+        id("tools.refinery.gradle.mwe2")
+        id("tools.refinery.gradle.sonarqube")
+}
+
+dependencies {
+        api(libs.ecore)
+        api(libs.ecore.xmi)
+        mwe2(libs.ecore.codegen)
+        mwe2(libs.mwe.utils)
+        mwe2(libs.mwe2.lib)
+        mwe2(libs.xtext.core)
+        mwe2(libs.xtext.xbase)
+}
+
+sourceSets {
+        main {
+                java.srcDir("src/main/emf-gen")
+        }
+}
+
+tasks {
+        val generateEPackage by registering(JavaExec::class) {
+                mainClass.set("org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher")
+                classpath(configurations.mwe2)
+                inputs.file("src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2")
+                inputs.file("src/main/resources/model/problem.ecore")
+                inputs.file("src/main/resources/model/problem.genmodel")
+                outputs.file("build.properties")
+                outputs.file("META-INF/MANIFEST.MF")
+                outputs.file("plugin.xml")
+                outputs.file("plugin.properties")
+                outputs.dir("src/main/emf-gen")
+                args("src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2", "-p", "rootPath=/$projectDir")
+        }
+
+        for (taskName in listOf("compileJava", "processResources", "generateEclipseSourceFolders")) {
+                named(taskName) {
+                        dependsOn(generateEPackage)
+                }
+        }
+
+        clean {
+                delete("src/main/emf-gen")
+        }
+}
+
+sonarqube.properties {
+        SonarPropertiesUtils.addToList(properties, "sonar.exclusions", "src/main/emf-gen/**")
+}
+
+eclipse.project.natures.plusAssign(listOf(
+                "org.eclipse.sirius.nature.modelingproject",
+                "org.eclipse.pde.PluginNature",
+                "org.eclipse.xtext.ui.shared.xtextNature",
+))
diff --git a/subprojects/language-model/build.properties b/subprojects/language-model/build.properties
index 65dfc7c4..9b9859ff 100644
--- a/subprojects/language-model/build.properties
+++ b/subprojects/language-model/build.properties
@@ -1,4 +1,6 @@
+# SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
 #
+# SPDX-License-Identifier: EPL-2.0
 
 bin.includes = .,\
                src/main/resources/model/,\
diff --git a/subprojects/language-model/plugin.properties b/subprojects/language-model/plugin.properties
index c4fb7e23..c410feb7 100644
--- a/subprojects/language-model/plugin.properties
+++ b/subprojects/language-model/plugin.properties
@@ -1,4 +1,6 @@
+# SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
 #
+# SPDX-License-Identifier: EPL-2.0
 
 pluginName = tools.refinery.language.model
 providerName = refinery.tools
diff --git a/subprojects/language-model/plugin.xml b/subprojects/language-model/plugin.xml
index 4ca005a8..ef1e21f4 100644
--- a/subprojects/language-model/plugin.xml
+++ b/subprojects/language-model/plugin.xml
@@ -2,6 +2,9 @@
 <?eclipse version="3.0"?>
 
 <!--
+  SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+
+  SPDX-License-Identifier: EPL-2.0
 -->
 
 <plugin>
diff --git a/subprojects/language-model/problem.aird.license b/subprojects/language-model/problem.aird.license
new file mode 100644
index 00000000..e5db6ccd
--- /dev/null
+++ b/subprojects/language-model/problem.aird.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 b/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
index 15198d69..074b6b71 100644
--- a/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
+++ b/subprojects/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
@@ -1,3 +1,8 @@
+/*
+ * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
 module tools.refinery.language.model.GenerateProblemModel
 
 Workflow {
diff --git a/subprojects/language-model/src/main/resources/model/problem.ecore.license b/subprojects/language-model/src/main/resources/model/problem.ecore.license
new file mode 100644
index 00000000..e5db6ccd
--- /dev/null
+++ b/subprojects/language-model/src/main/resources/model/problem.ecore.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+
+SPDX-License-Identifier: EPL-2.0
diff --git a/subprojects/language-model/src/main/resources/model/problem.genmodel.license b/subprojects/language-model/src/main/resources/model/problem.genmodel.license
new file mode 100644
index 00000000..e5db6ccd
--- /dev/null
+++ b/subprojects/language-model/src/main/resources/model/problem.genmodel.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+
+SPDX-License-Identifier: EPL-2.0