build: fix cross-project group and version config

7 files changed, 16 insertions, 12 deletions

diff --git a/MANIFEST.MF b/MANIFEST.MF
new file mode 100644
index 00000000..94efbd74
--- /dev/null
+++ b/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0

+Bundle-SymbolicName: tools.refinery.refinery-language

+Bundle-Version: 0.0.0-SNAPSHOT

+

diff --git a/build.gradle b/build.gradle
index 329b1cdb..6c0c8701 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,8 +2,3 @@ plugins {
         id 'eclipse'
         id 'refinery-sonarqube'
 }
-
-allprojects {
-        group = 'tools.refinery'
-        version = '0.0.0-SNAPSHOT'
-}
diff --git a/buildSrc/src/main/groovy/refinery-java-conventions.gradle b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
index fcdc8ea9..b2efd7e9 100644
--- a/buildSrc/src/main/groovy/refinery-java-conventions.gradle
+++ b/buildSrc/src/main/groovy/refinery-java-conventions.gradle
@@ -45,7 +45,10 @@ tasks.register('slowTest', Test) {
 
 tasks.named('jar') {
         manifest {
-                attributes 'Bundle-SymbolicName': project.name
+                attributes(
+                        'Bundle-SymbolicName': "${project.group}.${project.name}",
+                        'Bundle-Version': project.version
+                )
         }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 713ba6a4..edfbcdc2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,7 @@
+group=tools.refinery
 nodeVersion=16.13.0
 systemProp.sonar.projectKey=graphs4value_refinery
 systemProp.sonar.organization=graphs4value
 systemProp.sonar.host.url=https://sonarcloud.io
+version=0.0.0-SNAPSHOT
 yarnVersion=1.22.17
diff --git a/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2 b/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
index c1518b4d..15198d69 100644
--- a/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
+++ b/language-model/src/main/java/tools/refinery/language/model/GenerateProblemModel.mwe2
@@ -3,7 +3,7 @@ module tools.refinery.language.model.GenerateProblemModel
 Workflow {
         bean = org.eclipse.emf.mwe.utils.StandaloneSetup {
                 projectMapping = {
-                        projectName = "refinery-language-model"
+                        projectName = "tools.refinery.refinery-language-model"
                         path = "."
                 }
         }
@@ -14,7 +14,7 @@ Workflow {
 
         component = org.eclipse.emf.mwe2.ecore.EcoreGenerator {
                 generateCustomClasses = false
-                genModel = "platform:/resource/refinery-language-model/src/main/resources/model/problem.genmodel"
-                srcPath = "platform:/resource/refinery-language-model/src/main/emf-gen"
+                genModel = "platform:/resource/tools.refinery.refinery-language-model/src/main/resources/model/problem.genmodel"
+                srcPath = "platform:/resource/tools.refinery.refinery-language-model/src/main/emf-gen"
         }
 }
diff --git a/language-model/src/main/resources/model/problem.genmodel b/language-model/src/main/resources/model/problem.genmodel
index 3e0ee35e..9ba2274b 100644
--- a/language-model/src/main/resources/model/problem.genmodel
+++ b/language-model/src/main/resources/model/problem.genmodel
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
-    modelDirectory="/refinery-language-model/src/main/emf-gen" creationIcons="false"
-    editDirectory="/language-edit/src/main/emf-gen" editorDirectory="/org.eclipse.viatra.solver.language.model.editor/src-gen"
+    modelDirectory="/tools.refinery.refinery-language-model/src/main/emf-gen"
+    creationIcons="false" editDirectory="/language-edit/src/main/emf-gen" editorDirectory="/org.eclipse.viatra.solver.language.model.editor/src-gen"
     modelPluginID="language-model" modelName="Problem" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
     codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
     copyrightFields="false" operationReflection="true" importOrganizing="true">
diff --git a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2 b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
index 0d934b68..21ff456e 100644
--- a/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
+++ b/language/src/main/java/tools/refinery/language/GenerateProblem.mwe2
@@ -35,7 +35,7 @@ Workflow {
                 language = StandardLanguage {
                         name = 'tools.refinery.language.Problem'
                         fileExtensions = 'problem'
-                        referencedResource = 'platform:/resource/refinery-language-model/model/problem.genmodel'
+                        referencedResource = 'platform:/resource/tools.refinery.refinery-language-model/model/problem.genmodel'
                         serializer = {
                                 generateStub = false
                         }