Merge branch 'updated_cnnarch_version' into 'master'

Updated cnnarch version, added badges

See merge request CNNArch2MXNet!7

.gitlab-ci.yml

@@ -28,20 +28,23 @@ masterJobLinux:
   image: maven:3-jdk-8
   script: 
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install deploy --settings settings.xml
+  - cat target/site/jacoco/index.html
+  - mvn package sonar:sonar -s settings.xml
   only:
   - master
   
-masterJobWindows:
-  stage: windows
-  script: 
-  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
-  tags:
-  - Windows10
+#masterJobWindows:
+#  stage: windows
+#  script:
+#  - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
+#  tags:
+#  - Windows10
 
 BranchJobLinux:
   stage: linux
   image: maven:3-jdk-8
   script: 
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
+  - cat target/site/jacoco/index.html
   except:
   - master

README.md

+![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/CNNArch2MXNet/badges/master/build.svg)
+![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/generators/CNNArch2MXNet/badges/master/coverage.svg)
\ No newline at end of file

pom.xml

@@ -8,14 +8,14 @@
 
   <groupId>de.monticore.lang.monticar</groupId>
   <artifactId>cnnarch-mxnet-generator</artifactId>
-  <version>0.2.2-SNAPSHOT</version>
+  <version>0.2.3-SNAPSHOT</version>
 
   <!-- == PROJECT DEPENDENCIES ============================================= -->
 
   <properties>
 
     <!-- .. SE-Libraries .................................................. -->
-      <CNNArch.version>0.2.3-SNAPSHOT</CNNArch.version>
+      <CNNArch.version>0.2.4-SNAPSHOT</CNNArch.version>
       <CNNTrain.version>0.2.4-SNAPSHOT</CNNTrain.version>
     
         <!-- .. Libraries .................................................. -->
@@ -29,6 +29,7 @@
         <compiler.plugin>3.3</compiler.plugin>
         <source.plugin>2.4</source.plugin>
         <shade.plugin>2.4.3</shade.plugin>
+        <jacoco.plugin>0.8.1</jacoco.plugin>
 
     <!-- Classifiers -->
     <grammars.classifier>grammars</grammars.classifier>
@@ -117,6 +118,28 @@
         <artifactId>maven-deploy-plugin</artifactId>
         <version>2.8.1</version>
       </plugin>
+        <!-- Test coverage -->
+        <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${jacoco.plugin}</version>
+            <executions>
+                <execution>
+                    <id>pre-unit-test</id>
+                    <goals>
+                        <goal>prepare-agent</goal>
+                    </goals>
+                </execution>
+                <execution>
+                    <id>post-unit-test</id>
+                    <phase>test</phase>
+                    <goals>
+                        <goal>report</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+
 
       <!-- Other Configuration -->
       <plugin>

settings.xml

@@ -57,6 +57,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>