merge fix

.gitlab-ci.yml

@@ -22,6 +22,28 @@ stages:
 #  variables:
 #    MAVEN_CLI_OPTS: --settings=settings.xml
 
+githubjob:
+  image: maven:3-jdk-8
+  stage: linux
+  before_script:
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+  - eval $(ssh-agent -s)
+  - ssh-add <(echo "$GITHUB_SSH_PRIV_KEY")
+  - echo "$GITHUB_SSH_PRIV_KEY" | tr -d '\r' | ssh-add -
+  - git config --global user.email "kusmenko@se-rwth.de"
+  - git config --global user.name "EMA CI Robot"
+  - mkdir -p ~/.ssh
+#  - cat gitlab-known-hosts >> ~/.ssh/known_hosts
+  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
+  script: 
+  - git clone git@github.com:MontiCore/EmbeddedMontiArc.git
+  - cd EmbeddedMontiArc
+  - git subtree pull --prefix $PRJ_NAME https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/${PRJ_NAME}.git master --squash
+  - git push --force
+  only:
+  - master
+
+
 masterJobLinux:
   stage: linux
   image: maven:3-jdk-8
@@ -54,7 +76,3 @@ BranchJobLinux:
   - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B  clean install --settings settings.xml
   except:
   - master
-  except:
-    changes:
-    - README.md
-    - .gitignore

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>de.monticore.lang.monticar</groupId>
     <artifactId>cnn-arch</artifactId>
-    <version>0.3.7-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
 
 
 
@@ -32,12 +32,12 @@
         <se-commons.version>1.7.8</se-commons.version>
         <mc.grammars.assembly.version>0.0.6</mc.grammars.assembly.version>
         <SIUnit.version>0.0.11</SIUnit.version>
-        <Common-MontiCar.version>0.0.19-SNAPSHOT</Common-MontiCar.version>
+        <Common-MontiCar.version>0.2.12-SNAPSHOT</Common-MontiCar.version>
         <Math.version>0.2.12-SNAPSHOT</Math.version>
 
         <!-- .. Libraries .................................................. -->
-        <guava.version>18.0</guava.version>
-        <junit.version>4.12</junit.version>
+        <guava.version>25.1-jre</guava.version>
+        <junit.version>4.13.1</junit.version>
         <logback.version>1.1.2</logback.version>
         <jscience.version>4.3.1</jscience.version>
         <commons-cli.version>1.4</commons-cli.version>