Release 21.1 (#152)

* removed "VSimRTI" from comments in weather-warning applications
* removed "com.dcaiti.vsimrti" from list of allower interaction classes
* use "mosaic.docker.no-detach=true" on Windows if not set explicitly
* Added changelog for 21.0 and 21.1
* use 21.1 tags in ns3/omnet installer
* include LICENSE file in mosaic-output.jar
* install and deploy in separate steps to avoid sporadic jenkins errors
* Set version to 21.1

Signed-off-by: Karl Schrab <karl.schrab@fokus.fraunhofer.de>

Jenkinsfile

@@ -142,6 +142,7 @@ spec:
                     // which makes it impossible to mount the correct settings.xml
                     // Therefore we are using a second container which is able to read the mounted settings.xml and is able to
                     // deploy the artifacts. The only drawback is, that this step again builds all artifacts.
+                    sh '/opt/tools/apache-maven/3.6.3/bin/mvn install -DskipTests'
                     sh '/opt/tools/apache-maven/3.6.3/bin/mvn deploy -DskipTests'
                 }
             }

app/tutorials/example-applications/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

app/tutorials/highway-management/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

app/tutorials/traffic-light-communication/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

app/tutorials/weather-warning/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
 

app/tutorials/weather-warning/src/main/java/org/eclipse/mosaic/app/tutorial/WeatherServerApp.java

@@ -66,8 +66,8 @@ public void onStartup() {
     }
 
     /**
-     * This method is called by VSimRTI when a previously triggered event is handed over to the
-     * application by VSimRTI for processing.
+     * This method is called by mosaic-application when a previously triggered event is handed over to the
+     * application for processing.
      * Events can be triggered be this application itself, e.g. to run a routine periodically.
      *
      * @param event The event to be processed
@@ -81,7 +81,7 @@ public void processEvent(Event event) throws Exception {
      * Method to let the WeatherServer send a DEN message periodically.
      * <p>
      * This method sends a DEN message and generates a new event during each call.
-     * When said event is triggered (via VSimRTI), processEvent() is called, which in turn calls sample().
+     * When said event is triggered, processEvent() is called, which in turn calls sample().
      * This way, sample() is called periodically at a given interval (given by the generated event time)
      * and thus the DENM is sent periodically at this interval.
      */
@@ -127,9 +127,7 @@ private Denm constructDenm() {
     }
 
     /**
-     * This method is called by VSimRTI when the vehicle that has been equipped with this application
-     * leaves the simulation.
-     * It is the last method called of this class during a simulation.
+     * This method is called by mosaic-application when the simulation has finished.
      */
     @Override
     public void onShutdown() {

app/tutorials/weather-warning/src/main/java/org/eclipse/mosaic/app/tutorial/WeatherWarningApp.java

@@ -66,8 +66,7 @@ public class WeatherWarningApp extends AbstractApplication<VehicleOperatingSyste
 
 
     /**
-     * This method is called by VSimRTI when the vehicle that has been equipped with this application
-     * enters the simulation.
+     * This method is called by mosaic-application when the vehicle enters the simulation.
      * It is the first method called of this class during a simulation.
      */
     @Override
@@ -91,8 +90,7 @@ public void onStartup() {
     }
 
     /**
-     * This method is called by VSimRTI when the vehicle that has been equipped with this application
-     * leaves the simulation.
+     * This method is called by mosaic-application when the vehicle leaves the simulation.
      * It is the last method called of this class during a simulation.
      */
     @Override
@@ -218,9 +216,9 @@ private void reactOnEnvironmentData(SensorType type, int strength) {
         }
 
         /*
-         * We want to send a DENM (Decentralized Environment Notification Message). A DENM, as a subclass of
-         * V2XMessage, requires a MessageRouting (so VSimRTI knows source and destination of the message),
-         * and a payload in the form of a DENMContent object. It contains fields such as the current timestamp
+         * We want to send a DENM (Decentralized Environment Notification Message). A Denm, as a subclass of
+         * V2xMessage, requires a MessageRouting (so the communication simulator knows source and destination of the message),
+         * and a payload in the form of a DenmContent object. It contains fields such as the current timestamp
          * of the sending node, the geo position of the sending node, warning type and event strength.
          */
         Denm denm = new Denm(mr, new DenmContent(getOs().getSimulationTime(), vehicleLongLat, roadId, type, strength, SPEED, 0.0f, vehicleLongLat, null, null));
@@ -238,14 +236,6 @@ private void reactOnEnvironmentData(SensorType type, int strength) {
     }
 
     private void reactUponDENMessageChangeRoute(Denm denm) {
-        /*
-         * NOTE: The route change happens only once. Further rerouting is not
-         * possible at the moment. The route information which could be used for
-         * rerouting is static. It was requested only once by VSimRTI from
-         * the traffic simulator. Otherwise the traffic simulator performance
-         * would decrease dramatically. This may change in the future.
-         * Until this, the routeChanged variable is used.
-         */
         final String affectedConnectionId = denm.getEventRoadId();
         final VehicleRoute routeInfo = Objects.requireNonNull(getOs().getNavigationModule().getCurrentRoute());
 

bundle/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

bundle/src/assembly/resources/fed/ns3/ns3_installer.sh

@@ -69,7 +69,7 @@ ns3_scratch="${ns3_simulator_folder}/scratch"
 ns3_source="${ns3_simulator_folder}/src"
 
 ####### semi automatic parameters ########
-ns3_federate_url="https://github.com/mosaic-addons/ns3-federate/archive/refs/heads/main.zip"
+ns3_federate_url="https://github.com/mosaic-addons/ns3-federate/archive/refs/tags/21.1.zip"
 ns3_url="https://www.nsnam.org/releases/$ns3_version_affix.tar.bz2"
 
 ###### more automatic parameters #########

bundle/src/assembly/resources/fed/omnetpp/omnet_installer.sh

@@ -46,7 +46,7 @@ check_shell
 required_programs=( unzip tar bison flex protoc gcc python )
 required_libraries=( "libprotobuf-dev >= 3.3.0" )
 
-omnet_federate_url="https://github.com/mosaic-addons/omnetpp-federate/archive/main.zip"
+omnet_federate_url="https://github.com/mosaic-addons/omnetpp-federate/archive/refs/tags/21.1.zip"
 omnet_src_url="https://github.com/omnetpp/omnetpp/releases/download/omnetpp-5.5.1/omnetpp-5.5.1-src-linux.tgz"
 inet_src_url="https://github.com/inet-framework/inet/releases/download/v4.1.1/inet-4.1.1-src.tgz"
 

fed/mosaic-application/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-cell/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-environment/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-mapping/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-ns3/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-omnetpp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-output/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -56,7 +56,8 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <includes>
-                        <include>META-INF/**/*.*</include>
+                        <include>META-INF/*</include>
+                        <include>META-INF/**/*</include>
                         <include>org/**/*.*</include>
                         <include>web/markers/*.*</include>
                         <include>web/visualizer.html</include>

fed/mosaic-output/src/main/java/org/eclipse/mosaic/fed/output/generator/file/format/InteractionFormatter.java

@@ -47,7 +47,7 @@ public InteractionFormatter(String separator, Map<String, List<List<String>>> in
         this.methodManagers = new HashMap<>();
 
         Map<String, Class<?>> interactionClasses = InteractionUtils.getAllSupportedInteractions(
-                "com.dcaiti.vsimrti", "com.dcaiti.mosaic"
+                "com.dcaiti.mosaic"
         );
 
         for (Entry<String, List<List<String>>> e : interactionDefinitions.entrySet()) {

fed/mosaic-sns/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

fed/mosaic-sumo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-communication/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-database/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-docker/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-docker/src/main/java/org/eclipse/mosaic/lib/docker/DockerClient.java

@@ -16,6 +16,7 @@
 package org.eclipse.mosaic.lib.docker;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -83,7 +84,7 @@ DockerContainer runImage(String image, String containerName, List<String> option
         }
 
         final Process p;
-        if ("true".equals(System.getProperty("mosaic.docker.no-detach"))) {
+        if ("true".equals(System.getProperty("mosaic.docker.no-detach", SystemUtils.IS_OS_WINDOWS ? "true" : "false"))) {
             logger.info("Starting container without detaching.");
             p = docker.run(image, options);
         } else {

lib/mosaic-docker/src/test/java/org/eclipse/mosaic/lib/docker/DockerClientTest.java

@@ -59,6 +59,8 @@ public void setUp() {
 
         when(commandLine.status(anyString())).thenReturn("", "", "Up 2 seconds");
         when(commandLine.port(anyString())).thenReturn("1337/tcp -> 0.0.0.0:7331\n");
+
+        System.setProperty("mosaic.docker.no-detach", "false");
     }
 
     @Test

lib/mosaic-geomath/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-interactions/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-network/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-objects/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-routing/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

lib/mosaic-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>org.eclipse.mosaic</groupId>
     <artifactId>mosaic-parent</artifactId>
-    <version>21.1-SNAPSHOT</version>
+    <version>21.1</version>
     <packaging>pom</packaging>
 
     <name>Eclipse MOSAIC Parent</name>
@@ -79,7 +79,7 @@
     </modules>
 
     <properties>
-        <mosaic.version>21.1-SNAPSHOT</mosaic.version>
+        <mosaic.version>21.1</mosaic.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceTarget>1.8</project.build.sourceTarget>
         <skip.coverage>true</skip.coverage>

rti/mosaic-rti-api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

rti/mosaic-rti-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.eclipse.mosaic</groupId>
         <artifactId>mosaic-parent</artifactId>
-        <version>21.1-SNAPSHOT</version>
+        <version>21.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>