From 1f0832f4e536cadb359a9423fd48550ec3edb3d6 Mon Sep 17 00:00:00 2001
From: Malte Heithoff <h.malte.f@googlemail.com>
Date: Sat, 16 Jan 2021 16:59:00 +0100
Subject: [PATCH 1/4] Generate CMake

---
 .../monticar/generator/middleware/impls/EMADLGeneratorImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/de/monticore/lang/monticar/generator/middleware/impls/EMADLGeneratorImpl.java b/src/main/java/de/monticore/lang/monticar/generator/middleware/impls/EMADLGeneratorImpl.java
index b121a5c..222c1d6 100644
--- a/src/main/java/de/monticore/lang/monticar/generator/middleware/impls/EMADLGeneratorImpl.java
+++ b/src/main/java/de/monticore/lang/monticar/generator/middleware/impls/EMADLGeneratorImpl.java
@@ -37,6 +37,8 @@ public class EMADLGeneratorImpl implements GeneratorImpl {
         emadlGenerator.setGenerationTargetPath(generationTargetPath);
         List<FileContent> fileContents = emadlGenerator.generateStrings(taggingResolver, componentInstanceSymbol, new HashSet<>(), "n");
 
+        emadlGenerator.generateCMakeFiles(componentInstanceSymbol);
+
         for (FileContent fileContent : fileContents) {
             files.add(emadlGenerator.getEmamGen().generateFile(fileContent));
         }
-- 
GitLab


From b369bae4d977378d93389f8b6f448df0805e2a5c Mon Sep 17 00:00:00 2001
From: Malte Heithoff <h.malte.f@googlemail.com>
Date: Sun, 17 Jan 2021 00:21:25 +0100
Subject: [PATCH 2/4] Update Versions

---
 pom.xml | 41 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index 903cd4b..26eaa87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>embedded-montiarc-math-middleware-generator</artifactId>
-    <version>0.0.33-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
 
 
     <!-- == PROJECT DEPENDENCIES ============================================= -->
@@ -19,15 +19,12 @@
 
         <!-- .. SE-Libraries .................................................. -->
         <se-commons.version>1.7.7</se-commons.version>
-        
-        <embedded-montiarc.version>0.2.12-SNAPSHOT</embedded-montiarc.version>
-        <Embedded-montiarc-math-generator.version>0.4.0-SNAPSHOT</Embedded-montiarc-math-generator.version>
-        <Embedded-montiarc-math-roscpp-generator.version>0.1.8-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
-        <EMADL2CPP.version>0.4.2</EMADL2CPP.version>
-        <EMADL.version>0.2.12-SNAPSHOT</EMADL.version>
-        <SOMEIP.version>1.3-SNAPSHOT</SOMEIP.version>
-        <MQTT.version>1.5-SNAPSHOT</MQTT.version>
-        <embedded-montiarc-component-clustering.version>0.0.2-SNAPSHOT</embedded-montiarc-component-clustering.version>
+
+        <Embedded-montiarc-math-roscpp-generator.version>0.1.9-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
+        <EMADL2CPP.version>0.4.7</EMADL2CPP.version>
+        <SOMEIP.version>1.4-SNAPSHOT</SOMEIP.version>
+        <MQTT.version>1.6-SNAPSHOT</MQTT.version>
+        <embedded-montiarc-component-clustering.version>0.0.3-SNAPSHOT</embedded-montiarc-component-clustering.version>
 
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
@@ -56,12 +53,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc</artifactId>
-            <version>${embedded-montiarc.version}</version>
-        </dependency>
-
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <dependency>
             <groupId>com.google.code.gson</groupId>
@@ -75,12 +66,6 @@
             <version>1.2.17</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jgrapht</groupId>
-            <artifactId>jgrapht-core</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-
         <dependency>
             <groupId>de.se_rwth.commons</groupId>
             <artifactId>se-commons-logging</artifactId>
@@ -97,12 +82,6 @@
             <version>${guava.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-math-generator</artifactId>
-            <version>${Embedded-montiarc-math-generator.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-math-roscpp-generator</artifactId>
@@ -129,11 +108,7 @@
         </dependency>
 
         <!-- EMADL Dependencies -->
-        <dependency>
-            <groupId>de.monticore.lang.monticar</groupId>
-            <artifactId>embedded-montiarc-deeplearning</artifactId>
-            <version>${EMADL.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-emadl-generator</artifactId>
-- 
GitLab


From c2187338b5438d8e5bcbe23c7f60cc03b3b9bc84 Mon Sep 17 00:00:00 2001
From: Malte Heithoff <h.malte.f@googlemail.com>
Date: Sun, 17 Jan 2021 15:49:19 +0100
Subject: [PATCH 3/4] Update JGraphT Version

---
 .../generator/middleware/helpers/ClusterFromTagsHelper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java b/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java
index 5b4ae53..9d38e79 100644
--- a/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java
+++ b/src/main/java/de/monticore/lang/monticar/generator/middleware/helpers/ClusterFromTagsHelper.java
@@ -13,7 +13,7 @@ import de.monticore.symboltable.Symbol;
 import de.monticore.symboltable.resolving.ResolvingFilter;
 import de.se_rwth.commons.logging.Log;
 import org.jgrapht.Graph;
-import org.jgrapht.alg.ConnectivityInspector;
+import org.jgrapht.alg.connectivity.ConnectivityInspector;
 import org.jgrapht.graph.DefaultEdge;
 import org.jgrapht.graph.SimpleGraph;
 
-- 
GitLab


From 14eaa14ab2d285f29c08a0453392a0be70b26260 Mon Sep 17 00:00:00 2001
From: Evgeny Kusmenko <kusmenko@se.rwth-aachen.de>
Date: Thu, 21 Jan 2021 18:21:55 +0100
Subject: [PATCH 4/4] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2739a74..32fa37b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ CompileJobLinux:
     expire_in: 1 day
   script:
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml -U
-  - cat target/site/jacoco/index.html
+#  - cat target/site/jacoco/index.html
 
 DeployJobLinux:
   stage: linuxDeploy
-- 
GitLab