Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
applications
CarlaComponents
Commits
6e0ec7c8
Commit
6e0ec7c8
authored
Jun 14, 2019
by
Lennart Bucher
Browse files
use maven build with maven-streamtest 0.0.6-SNAPSHOT
parent
c7a86639
Changes
8
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
6e0ec7c8
...
...
@@ -5,7 +5,6 @@ buildLinux:
stage
:
build
image
:
registry.git.rwth-aachen.de/monticore/embeddedmontiarc/applications/carlacomponents/emam-carla-ros-bridge
script
:
-
cd EMAM2Carla; java -jar ../mw-generator.jar valid.json; target/compile.sh
-
cd ../Carla2EMAM; java -jar ../mw-generator.jar valid.json; target/compile.sh
-
mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -U
Carla2EMAM/pom.xml
View file @
6e0ec7c8
...
...
@@ -5,10 +5,14 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
c
arla
components-bumper
</artifactId>
<artifactId>
C
arla
2EMAM
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<name>
carlacomponents
</name>
<parent>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
Carlacomponents-bumper
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
...
...
@@ -20,14 +24,14 @@
<plugin>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
maven-streamtest
</artifactId>
<version>
0.0.
5
</version>
<version>
0.0.
6-SNAPSHOT
</version>
<configuration>
<pathMain>
.
/models
</pathMain>
<pathTest>
.
/src/test/emam
</pathTest>
<pathMain>
Carla2EMAM
/models
</pathMain>
<pathTest>
Carla2EMAM
/src/test/emam
</pathTest>
<runStreamTestBefore>
true
</runStreamTestBefore>
<pathTmpOut>
.
/target/tmp
</pathTmpOut>
<pathTmpOut>
Carla2EMAM
/target/tmp
</pathTmpOut>
<generator>
MinGW
</generator>
<pathMiddlewareOut>
.
/target/middleware
</pathMiddlewareOut>
<pathMiddlewareOut>
Carla2EMAM
/target/middleware
</pathMiddlewareOut>
<middlewareRootModels>
<param>
test.collisionDetection
</param>
</middlewareRootModels>
...
...
Carla2EMAM/settings.xml
View file @
6e0ec7c8
<?xml version="1.0" encoding="UTF-8"?>
<!--
******************************************************************************
MontiCAR Modeling Family, www.se-rwth.de
Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
All rights reserved.
This project is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3.0 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this project. If not, see <http://www.gnu.org/licenses/>.
*******************************************************************************
-->
<settings
xmlns=
"http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
...
...
@@ -20,45 +42,38 @@
</server>
</servers>
<mirrors>
<mirror>
<id>
se-nexus
</id>
<mirrorOf>
external:*
</mirrorOf>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
</mirror>
<mirror>
<id>
icm-repository
</id>
<mirrorOf>
icm
</mirrorOf>
<url>
http://maven.icm.edu.pl/artifactory/repo/
</url>
</mirror>
</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>
<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>
<repositories>
<repository>
<id>
se-nexus
</id>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</repository>
<repository>
<id>
central
</id>
<url>
http://
central
</url>
<url>
http
s
://
repo.maven.apache.org/maven2/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</repository>
...
...
@@ -72,10 +87,16 @@
<pluginRepositories>
<pluginRepository>
<id>
central
</id>
<url>
http://
central
</url>
<url>
http
s
://
repo.maven.apache.org/maven2/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</pluginRepository>
<pluginRepository>
<id>
se-nexus
</id>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
...
...
@@ -84,4 +105,3 @@
<activeProfile>
se-nexus
</activeProfile>
</activeProfiles>
</settings>
EMAM2Carla/pom.xml
View file @
6e0ec7c8
...
...
@@ -5,10 +5,14 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
carlacomponents-bumper
</artifactId>
<artifactId>
EMAM2Carla
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<name>
carlacomponents
</name>
<parent>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
Carlacomponents-bumper
</artifactId>
<version>
1.0-SNAPSHOT
</version>
</parent>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
...
...
@@ -20,14 +24,14 @@
<plugin>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
maven-streamtest
</artifactId>
<version>
0.0.
5
</version>
<version>
0.0.
6-SNAPSHOT
</version>
<configuration>
<pathMain>
.
/models
</pathMain>
<pathTest>
.
/src/test/emam
</pathTest>
<pathMain>
EMAM2Carla
/models
</pathMain>
<pathTest>
EMAM2Carla
/src/test/emam
</pathTest>
<runStreamTestBefore>
true
</runStreamTestBefore>
<pathTmpOut>
.
/target/tmp
</pathTmpOut>
<pathTmpOut>
EMAM2Carla
/target/tmp
</pathTmpOut>
<generator>
MinGW
</generator>
<pathMiddlewareOut>
.
/target/middleware
</pathMiddlewareOut>
<pathMiddlewareOut>
Carla2EMAM
/target/middleware
</pathMiddlewareOut>
<middlewareRootModels>
<param>
test.bumpBot
</param>
</middlewareRootModels>
...
...
EMAM2Carla/settings.xml
View file @
6e0ec7c8
<?xml version="1.0" encoding="UTF-8"?>
<!--
******************************************************************************
MontiCAR Modeling Family, www.se-rwth.de
Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
All rights reserved.
This project is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3.0 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this project. If not, see <http://www.gnu.org/licenses/>.
*******************************************************************************
-->
<settings
xmlns=
"http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
...
...
@@ -20,45 +42,38 @@
</server>
</servers>
<mirrors>
<mirror>
<id>
se-nexus
</id>
<mirrorOf>
external:*
</mirrorOf>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
</mirror>
<mirror>
<id>
icm-repository
</id>
<mirrorOf>
icm
</mirrorOf>
<url>
http://maven.icm.edu.pl/artifactory/repo/
</url>
</mirror>
</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>
<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>
<repositories>
<repository>
<id>
se-nexus
</id>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</repository>
<repository>
<id>
central
</id>
<url>
http://
central
</url>
<url>
http
s
://
repo.maven.apache.org/maven2/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</repository>
...
...
@@ -72,10 +87,16 @@
<pluginRepositories>
<pluginRepository>
<id>
central
</id>
<url>
http://
central
</url>
<url>
http
s
://
repo.maven.apache.org/maven2/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</pluginRepository>
<pluginRepository>
<id>
se-nexus
</id>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
...
...
@@ -84,4 +105,3 @@
<activeProfile>
se-nexus
</activeProfile>
</activeProfiles>
</settings>
EMAM2Carla/src/test/emam/.keep
0 → 100644
View file @
6e0ec7c8
pom.xml
0 → 100644
View file @
6e0ec7c8
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<groupId>
de.monticore.lang.monticar.utilities
</groupId>
<artifactId>
Carlacomponents-bumper
</artifactId>
<version>
1.0-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<modules>
<module>
Carla2EMAM
</module>
<module>
EMAM2Carla
</module>
</modules>
</project>
settings.xml
0 → 100644
View file @
6e0ec7c8
<?xml version="1.0" encoding="UTF-8"?>
<!--
******************************************************************************
MontiCAR Modeling Family, www.se-rwth.de
Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
All rights reserved.
This project is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 3.0 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this project. If not, see <http://www.gnu.org/licenses/>.
*******************************************************************************
-->
<settings
xmlns=
"http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"
>
<pluginGroups>
<pluginGroup>
org.mortbay.jetty
</pluginGroup>
<pluginGroup>
de.topobyte
</pluginGroup>
</pluginGroups>
<proxies>
</proxies>
<servers>
<server>
<id>
se-nexus
</id>
<username>
cibuild
</username>
<password>
${env.cibuild}
</password>
</server>
</servers>
<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>
<repositories>
<repository>
<id>
se-nexus
</id>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</repository>
<repository>
<id>
central
</id>
<url>
https://repo.maven.apache.org/maven2/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</repository>
<repository>
<id>
icm
</id>
<url>
http://maven.icm.edu.pl/artifactory/repo/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>
central
</id>
<url>
https://repo.maven.apache.org/maven2/
</url>
<releases><enabled
/></releases>
<snapshots><enabled
/></snapshots>
</pluginRepository>
<pluginRepository>
<id>
se-nexus
</id>
<url>
https://nexus.se.rwth-aachen.de/content/groups/public
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>
icm
</id>
<url>
http://maven.icm.edu.pl/artifactory/repo/
</url>
<releases><enabled>
true
</enabled>
</releases>
<snapshots><enabled>
true
</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>
se-nexus
</activeProfile>
</activeProfiles>
</settings>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment