Commit 4fb1dac7 authored by Malte Heithoff's avatar Malte Heithoff
Browse files

Merge branch 'master' into ExecutionSemantics

# Conflicts:
#	pom.xml
#	src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceBuilder.java
#	src/main/java/de/monticore/lang/embeddedmontiarc/embeddedmontiarc/_symboltable/instanceStructure/EMAComponentInstanceSymbolCreator.java
parents 68a2f706 d0c18bff
Pipeline #392207 failed with stage
in 22 seconds
...@@ -17,12 +17,13 @@ githubjob: ...@@ -17,12 +17,13 @@ githubjob:
script: script:
- git clone git@github.com:MontiCore/EmbeddedMontiArc.git - git clone git@github.com:MontiCore/EmbeddedMontiArc.git
- cd EmbeddedMontiArc - cd EmbeddedMontiArc
- git subtree pull --prefix languages/EmbeddedMontiArc https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/languages/EmbeddedMontiArc.git master - git subtree pull --prefix $PRJ_NAME https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/${PRJ_NAME}.git master --squash
- git push --force - git push --force
only: only:
- master - master
masterJob: masterJob:
script: script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy sonar:sonar --settings settings.xml - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy sonar:sonar --settings settings.xml
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>25.1-jre</guava.version> <guava.version>25.1-jre</guava.version>
<junit.version>4.12</junit.version> <junit.version>4.13.1</junit.version>
<jsr305.version>3.0.0</jsr305.version> <jsr305.version>3.0.0</jsr305.version>
<!-- .. Plugins ....................................................... --> <!-- .. Plugins ....................................................... -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment