Merge branch 'master' into ros2_test

.gitlab-ci.yml

@@ -6,7 +6,7 @@ masterJobLinux:
   stage: linux
   image: maven:3-jdk-8
   script:
-  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy --settings settings.xml
+  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean deploy sonar:sonar --settings settings.xml
   - cat target/site/jacoco/index.html
   only:
   - master

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>embedded-montiarc-math-roscpp-generator</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>0.1.1-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
@@ -17,8 +17,8 @@
 
     <!-- .. SE-Libraries .................................................. -->
     <se-commons.version>1.7.7</se-commons.version>
-    <Embedded-MontiArc-Math.version>0.1.0-SNAPSHOT</Embedded-MontiArc-Math.version>
-    <Embedded-montiarc-math-rosmsg-generator.version>0.1.0-SNAPSHOT</Embedded-montiarc-math-rosmsg-generator.version>
+    <Embedded-MontiArc-Math.version>0.1.4-SNAPSHOT</Embedded-MontiArc-Math.version>
+    <Embedded-montiarc-math-rosmsg-generator.version>0.1.1-SNAPSHOT</Embedded-montiarc-math-rosmsg-generator.version>
 
     <!-- .. Libraries .................................................. -->
     <guava.version>18.0</guava.version>
@@ -174,6 +174,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.19.1</version>
         <configuration>
+          <useSystemClassLoader>false</useSystemClassLoader>
         </configuration>
       </plugin>
       <plugin>

settings.xml

@@ -35,6 +35,24 @@
   </mirrors>
 
   <profiles>
+    <profile>
+      <id>sonar</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <!-- Optional URL to server. Default value is http://localhost:9000 -->
+        <sonar.host.url>
+          https://metric.se.rwth-aachen.de
+        </sonar.host.url>
+        <sonar.login>
+		      jenkins
+		    </sonar.login>
+		    <sonar.password>
+		      ${env.sonar}
+		    </sonar.password>
+      </properties>
+    </profile>
 
     <profile>
       <id>se-nexus</id>

src/test/resources/tests/structs/BasicStruct.struct

@@ -2,8 +2,8 @@ package tests.structs;
 
 struct BasicStruct{
     Q fieldQ1;
-    Q (0:0.1:100) fieldQ2;
+    Q fieldQ2;
     Z fieldZ1;
-    Z (-100:2:100) fieldZ2;
+    Z fieldZ2;
     B fieldB1;
 }
\ No newline at end of file