From f2df86fe09a477b380bc366cc91b512d2058cdc7 Mon Sep 17 00:00:00 2001
From: Alexander Hellwig <alexander.hellwig@rwth-aachen.de>
Date: Thu, 21 Jun 2018 13:48:34 +0200
Subject: [PATCH] CI + MontiCore 5

---
 .gitlab-ci.yml |  28 ++++-
 pom.xml        |  23 ++--
 settings.xml   | 333 +++----------------------------------------------
 3 files changed, 55 insertions(+), 329 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ef0e15..ea5a071 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,26 @@
-image: maven:3-jdk-8
+stages:
+#- windows
+- linux
 
-build:
-  script: "mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml"
+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
+  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
+
+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
+  except:
+  - master
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b8dfa7b..02b928c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,16 +16,19 @@
     <properties>
 
         <!-- .. SE-Libraries .................................................. -->
-        <monticore.version>4.5.4-SNAPSHOT</monticore.version>
+        <monticore.version>5.0.0</monticore.version>
         <se-commons.version>1.7.7</se-commons.version>
         <mc.grammars.assembly.version>0.0.6-SNAPSHOT</mc.grammars.assembly.version>
         <SIUnit.version>0.0.10-SNAPSHOT</SIUnit.version>
-        <Common-MontiCar.version>0.0.11-SNAPSHOT</Common-MontiCar.version>
-        <Embedded-MontiArc.version>0.0.11c-SNAPSHOT</Embedded-MontiArc.version>
-        <Embedded-MontiArc-Behaviour.version>0.0.11-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
-        <Math.version>0.0.11-SNAPSHOT</Math.version>
-        <Embedded-MontiArc-Math.version>0.0.11c-SNAPSHOT</Embedded-MontiArc-Math.version>
-        <tagging.version>0.0.1</tagging.version>
+        <Common-MontiCar.version>0.0.14-SNAPSHOT</Common-MontiCar.version>
+        <Embedded-MontiArc.version>0.0.18-SNAPSHOT</Embedded-MontiArc.version>
+        <Embedded-MontiArc-Behaviour.version>0.0.14-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
+        <Math.version>0.0.14-SNAPSHOT</Math.version>
+        <Embedded-MontiArc-Math.version>0.0.15-SNAPSHOT</Embedded-MontiArc-Math.version>
+        <Embedded-montiarc-math-generator.version>0.0.15-SNAPSHOT</Embedded-montiarc-math-generator.version>
+        <Embedded-montiarc-math-roscpp-generator.version>0.0.3-SNAPSHOT</Embedded-montiarc-math-roscpp-generator.version>
+        <Embedded-montiarc-math-rosmsg-generator.version>0.0.3-SNAPSHOT</Embedded-montiarc-math-rosmsg-generator.version>
+        <tagging.version>0.0.3-SNAPSHOT</tagging.version>
         <!-- .. Libraries .................................................. -->
         <guava.version>18.0</guava.version>
         <junit.version>4.12</junit.version>
@@ -84,19 +87,19 @@
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-math-generator</artifactId>
-            <version>0.0.7a-SNAPSHOT</version>
+            <version>${Embedded-montiarc-math-generator.version}</version>
         </dependency>
 
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-math-roscpp-generator</artifactId>
-            <version>0.0.1c-SNAPSHOT</version>
+            <version>${Embedded-montiarc-math-roscpp-generator.version}</version>
         </dependency>
 
         <dependency>
             <groupId>de.monticore.lang.monticar</groupId>
             <artifactId>embedded-montiarc-math-rosmsg-generator</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${Embedded-montiarc-math-rosmsg-generator.version}</version>
         </dependency>
 
         <dependency>
diff --git a/settings.xml b/settings.xml
index 7a461c6..27c5de6 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,362 +1,63 @@
 <?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/>.
-    *******************************************************************************
-
--->
-<!--
- | This is the configuration file for Maven. It can be specified at two levels:
- |
- |  1. User Level. This settings.xml file provides configuration for a single user,
- |                 and is normally provided in ${user.home}/.m2/settings.xml.
- |
- |                 NOTE: This location can be overridden with the CLI option:
- |
- |                 -s /path/to/user/settings.xml
- |
- |  2. Global Level. This settings.xml file provides configuration for all Maven
- |                 users on a machine (assuming they're all using the same Maven
- |                 installation). It's normally provided in
- |                 ${maven.conf}/settings.xml.
- |
- |                 NOTE: This location can be overridden with the CLI option:
- |
- |                 -gs /path/to/global/settings.xml
- |
- | The sections in this sample file are intended to give you a running start at
- | getting the most out of your Maven installation. Where appropriate, the default
- | values (values used when the setting is not specified) are provided.
- |
- |-->
 <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">
-    <!-- localRepository
-     | The path to the local repository maven will use to store artifacts.
-     |
-     | Default: ${user.home}/.m2/repository
-    <localRepository>/path/to/local/repo</localRepository>
-    -->
-
-    <!-- interactiveMode
-     | This will determine whether maven prompts you when it needs input. If set to false,
-     | maven will use a sensible default value, perhaps based on some other setting, for
-     | the parameter in question.
-     |
-     | Default: true
-    <interactiveMode>true</interactiveMode>
-    -->
-
-    <!-- offline
-     | Determines whether maven should attempt to connect to the network when executing a build.
-     | This will have an effect on artifact downloads, artifact deployment, and others.
-     |
-     | Default: false
-    <offline>false</offline>
-    -->
 
-    <!-- pluginGroups
-     | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
-     | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
-     | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
-     |-->
     <pluginGroups>
-        <!-- pluginGroup
-         | Specifies a further group identifier to use for plugin lookup.
-        <pluginGroup>com.your.plugins</pluginGroup>
-        -->
-
         <pluginGroup>org.mortbay.jetty</pluginGroup>
         <pluginGroup>de.topobyte</pluginGroup>
     </pluginGroups>
 
-    <!-- proxies
-     | This is a list of proxies which can be used on this machine to connect to the network.
-     | Unless otherwise specified (by system property or command-line switch), the first proxy
-     | specification in this list marked as active will be used.
-
     <proxies>
-      <proxy>
-        <id>optional</id>
-        <active>true</active>
-        <protocol>http</protocol>
-        <username>proxyuser</username>
-        <password>proxypass</password>
-        <host>172.29.1.4</host>
-        <port>3128</port>
-        <nonProxyHosts>local.net</nonProxyHosts>
-      </proxy>
     </proxies>
-    |-->
-    <!-- servers
-     | This is a list of authentication profiles, keyed by the server-id used within the system.
-     | Authentication profiles can be used whenever maven must make a connection to a remote server.
-     |-->
+
     <servers>
-        <!-- server
-         | Specifies the authentication information to use when connecting to a particular server, identified by
-         | a unique name within the system (referred to by the 'id' attribute below).
-         |
-         | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
-         |       used together.
-         |
         <server>
-          <id>deploymentRepo</id>
-          <username>repouser</username>
-          <password>repopwd</password>
+            <id>se-nexus</id>
+            <username>cibuild</username>
+            <password>${env.cibuild}</password>
         </server>
-        -->
+
         <server>
             <id>github</id>
             <username>travisbuilduser</username>
             <password>${env.travisbuilduserpassword}</password>
         </server>
-
-
-        <!-- Another sample, using keys to authenticate.
-        <server>
-          <id>siteServer</id>
-          <privateKey>/path/to/private/key</privateKey>
-          <passphrase>optional; leave empty if not used.</passphrase>
-        </server>
-        -->
     </servers>
 
-    <!-- mirrors
-     | This is a list of mirrors to be used in downloading artifacts from remote repositories.
-     |
-     | It works like this: a POM may declare a repository to use in resolving certain artifacts.
-     | However, this repository may have problems with heavy traffic at times, so people have mirrored
-     | it to several places.
-     |
-     | That repository definition will have a unique id, so we can create a mirror reference for that
-     | repository, to be used as an alternate download site. The mirror site will be the preferred
-     | server for that repository.
-     |-->
     <mirrors>
-
-        <!-- mirror
-         | Specifies a repository mirror site to use instead of a given repository. The repository that
-         | this mirror serves has an ID that matches the mirrorOf element of this mirror. IDs are used
-         | for inheritance and direct lookup purposes, and must be unique across the set of mirrors.
-         |
-        <mirror>
-          <id>mirrorId</id>
-          <mirrorOf>repositoryId</mirrorOf>
-          <name>Human Readable Name for this Mirror.</name>
-          <url>http://my.repository.com/repo/path</url>
-        </mirror>
-         -->
-
-        <mirror>
-            <id>github</id>
-            <mirrorOf>*</mirrorOf>
-            <url>https://raw.githubusercontent.com/EmbeddedMontiArc/external-dependencies/master/</url>
-        </mirror>
-        <mirror>
-            <id>maven-central</id>
-            <mirrorOf>central</mirrorOf>
-            <url>http://central.maven.org/maven2/</url>
-        </mirror>
-        <mirror>
-            <id>eclipse</id>
-            <mirrorOf>eclipse</mirrorOf>
-            <url>https://repo.eclipse.org/content/groups/releases/</url>
-        </mirror>
-
-        <!--
         <mirror>
-          <id>topobyte</id>
-          <mirrorOf>external:*</mirrorOf>
-          <url>http://http://mvn.topobyte.de/</url>
+            <id>se-nexus</id>
+            <mirrorOf>external:*</mirrorOf>
+            <url>https://nexus.se.rwth-aachen.de/content/groups/public</url>
         </mirror>
-        -->
     </mirrors>
 
-    <!-- profiles
-     | This is a list of profiles which can be activated in a variety of ways, and which can modify
-     | the build process. Profiles provided in the settings.xml are intended to provide local machine-
-     | specific paths and repository locations which allow the build to work in the local environment.
-     |
-     | For example, if you have an integration testing plugin - like cactus - that needs to know where
-     | your Tomcat instance is installed, you can provide a variable here such that the variable is
-     | dereferenced during the build process to configure the cactus plugin.
-     |
-     | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
-     | section of this document (settings.xml) - will be discussed later. Another way essentially
-     | relies on the detection of a system property, either matching a particular value for the property,
-     | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
-     | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
-     | Finally, the list of active profiles can be specified directly from the command line.
-     |
-     | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
-     |       repositories, plugin repositories, and free-form properties to be used as configuration
-     |       variables for plugins in the POM.
-     |
-     |-->
     <profiles>
-        <!-- profile
-         | Specifies a set of introductions to the build process, to be activated using one or more of the
-         | mechanisms described above. For inheritance purposes, and to activate profiles via <activatedProfiles/>
-         | or the command line, profiles have to have an ID that is unique.
-         |
-         | An encouraged best practice for profile identification is to use a consistent naming convention
-         | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey', 'user-brett', etc.
-         | This will make it more intuitive to understand what the set of introduced profiles is attempting
-         | to accomplish, particularly when you only have a list of profile id's for debug.
-         |
-         | This profile example uses the JDK version to trigger activation, and provides a JDK-specific repo.
-        <profile>
-          <id>jdk-1.4</id>
-          <activation>
-            <jdk>1.4</jdk>
-          </activation>
-          <repositories>
-            <repository>
-              <id>jdk14</id>
-              <name>Repository for JDK 1.4 builds</name>
-              <url>http://www.myhost.com/maven/jdk14</url>
-              <layout>default</layout>
-              <snapshotPolicy>always</snapshotPolicy>
-            </repository>
-          </repositories>
-        </profile>
-        -->
-
-        <!--
-         | Here is another profile, activated by the system property 'target-env' with a value of 'dev',
-         | which provides a specific path to the Tomcat instance. To use this, your plugin configuration
-         | might hypothetically look like:
-         |
-         | ...
-         | <plugin>
-         |   <groupId>org.myco.myplugins</groupId>
-         |   <artifactId>myplugin</artifactId>
-         |
-         |   <configuration>
-         |     <tomcatLocation>${tomcatPath}</tomcatLocation>
-         |   </configuration>
-         | </plugin>
-         | ...
-         |
-         | NOTE: If you just wanted to inject this configuration whenever someone set 'target-env' to
-         |       anything, you could just leave off the <value/> inside the activation-property.
-         |
-        <profile>
-          <id>env-dev</id>
-          <activation>
-            <property>
-              <name>target-env</name>
-              <value>dev</value>
-            </property>
-          </activation>
-          <properties>
-            <tomcatPath>/path/to/tomcat/instance</tomcatPath>
-          </properties>
-        </profile>
-
-        -->
 
         <profile>
-            <id>github</id>
-            <!-- enable snapshots for the built in central repo to direct -->
-            <!-- all requests to nexus via the mirror -->
+            <id>se-nexus</id>
             <repositories>
                 <repository>
                     <id>central</id>
                     <url>http://central</url>
-                    <releases>
-                        <enabled/>
-                    </releases>
-                    <snapshots>
-                        <enabled/>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>eclipse</id>
-                    <url>https://repo.eclipse.org/content/groups/releases/</url>
-                    <releases>
-                        <enabled/>
-                    </releases>
-                    <snapshots>
-                        <enabled/>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>topobyte</id>
-                    <url>http://mvn.topobyte.de/</url>
-                    <releases>
-                        <enabled/>
-                    </releases>
-                    <snapshots>
-                        <enabled/>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>maven-central</id>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <url>http://central.maven.org/maven2/</url>
+                    <releases><enabled /></releases>
+                    <snapshots><enabled /></snapshots>
                 </repository>
             </repositories>
             <pluginRepositories>
                 <pluginRepository>
-                    <id>maven-central</id>
-                    <url>http://central.maven.org/maven2/</url>
-                    <releases>
-                        <enabled/>
-                    </releases>
-                    <snapshots>
-                        <enabled/>
-                    </snapshots>
-                </pluginRepository>
-                <pluginRepository>
-                    <id>eclipse</id>
-                    <url>https://repo.eclipse.org/content/groups/releases/</url>
-                    <releases>
-                        <enabled/>
-                    </releases>
-                    <snapshots>
-                        <enabled/>
-                    </snapshots>
+                    <id>central</id>
+                    <url>http://central</url>
+                    <releases><enabled /></releases>
+                    <snapshots><enabled /></snapshots>
                 </pluginRepository>
             </pluginRepositories>
         </profile>
     </profiles>
 
-
-    <!-- activeProfiles
-     | List of profiles that are active for all builds.
-     |
-    <activeProfiles>
-      <activeProfile>alwaysActiveProfile</activeProfile>
-      <activeProfile>anotherAlwaysActiveProfile</activeProfile>
-    </activeProfiles>
-    -->
     <activeProfiles>
-        <activeProfile>github</activeProfile>
+        <activeProfile>se-nexus</activeProfile>
     </activeProfiles>
-
-
-</settings>
+</settings>
\ No newline at end of file
-- 
GitLab