Commit a3268a78 authored by Jean Meurice's avatar Jean Meurice

Version & License update

parent c64c7cfc
Pipeline #185173 failed with stage
in 34 seconds
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
image: maven:3-jdk-8 image: maven:3-jdk-8
......
# (c) https://github.com/MontiCore/monticore
script: script:
- git checkout ${TRAVIS_BRANCH} - git checkout ${TRAVIS_BRANCH}
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report --settings "settings.xml" - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install cobertura:cobertura org.eluder.coveralls:coveralls-maven-plugin:report --settings "settings.xml"
......
<!-- (c) https://github.com/MontiCore/monticore -->
# Server # Server
![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/build.svg) ![pipeline](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/build.svg)
![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/coverage.svg) ![coverage](https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/server/badges/master/coverage.svg)
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- (c) https://github.com/MontiCore/monticore -->
<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"> <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">
<parent> <parent>
<artifactId>montisim</artifactId> <artifactId>montisim</artifactId>
......
<!-- (c) https://github.com/MontiCore/monticore --> <!--
(c) https://github.com/MontiCore/monticore
The license generally applicable for this project
can be found under https://github.com/MontiCore/monticore.
-->
<zone> <zone>
<name>World</name> <name>World</name>
<isCustomLogin>false</isCustomLogin> <isCustomLogin>false</isCustomLogin>
......
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
version: "3" version: "3"
services: services:
......
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
FROM postgres:latest FROM postgres:latest
COPY ./db-create-script.sql /docker-entrypoint-initdb.d/ COPY ./db-create-script.sql /docker-entrypoint-initdb.d/
\ No newline at end of file
--
-- (c) https://github.com/MontiCore/monticore
--
-- The license generally applicable for this project
-- can be found under https://github.com/MontiCore/monticore.
--
-- --
-- PostgreSQL database dump -- PostgreSQL database dump
-- --
......
@rem (c) https://github.com/MontiCore/monticore @REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
sqlite3 world.db ".read sqlite-world.sql" sqlite3 world.db ".read sqlite-world.sql"
#!/bin/bash #!/bin/bash
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
sqlite3 world_linux.db ".read sqlite-world.sql" sqlite3 world_linux.db ".read sqlite-world.sql"
--
-- (c) https://github.com/MontiCore/monticore
--
-- The license generally applicable for this project
-- can be found under https://github.com/MontiCore/monticore.
--
CREATE TABLE area ( CREATE TABLE area (
id integer NOT NULL PRIMARY KEY AUTOINCREMENT, id integer NOT NULL PRIMARY KEY AUTOINCREMENT,
minx double precision NOT NULL, minx double precision NOT NULL,
......
--
-- (c) https://github.com/MontiCore/monticore
--
-- The license generally applicable for this project
-- can be found under https://github.com/MontiCore/monticore.
--
@rem (c) https://github.com/MontiCore/monticore @REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
REM Batch script REM Batch script
SET CONFIG_DIR=main\resources SET CONFIG_DIR=main\resources
......
#!/bin/bash #!/bin/bash
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
CONFIG_DIR="main/resources" CONFIG_DIR="main/resources"
CONFIG_FILE="config.properties" CONFIG_FILE="config.properties"
......
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
# This script re-compile all *.fmu files in the current directory using # This script re-compile all *.fmu files in the current directory using
# current available c++ compiler. This makes the fmu files compatible with # current available c++ compiler. This makes the fmu files compatible with
......
/* (c) https://github.com/MontiCore/monticore */
sim Aachen { sim Aachen {
sim_duration 4h; sim_duration 4h;
......
/* (c) https://github.com/MontiCore/monticore */
sim Aachen { sim Aachen {
sim_duration 4h; sim_duration 4h;
......
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
map=/extensions/AllInOne/aachen.osm map=/extensions/AllInOne/aachen.osm
mapName=Aachen2 mapName=Aachen2
flat_map=true flat_map=true
......
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!-- (c) https://github.com/MontiCore/monticore --> <!--
(c) https://github.com/MontiCore/monticore
The license generally applicable for this project
can be found under https://github.com/MontiCore/monticore.
-->
<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/xsd/maven-4.0.0.xsd"> <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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>server</artifactId> <artifactId>server</artifactId>
<groupId>montisim</groupId> <groupId>montisim</groupId>
<version>2.0.0</version> <version>2.0.1</version>
<packaging>pom</packaging> <packaging>jar</packaging>
<!--<modules>--> <!--<modules>-->
<!--<module>rpc</module>--> <!--<module>rpc</module>-->
...@@ -15,15 +22,17 @@ ...@@ -15,15 +22,17 @@
<properties> <properties>
<montisim.commons.version>1.0.9</montisim.commons.version> <montisim.commons.version>1.0.10</montisim.commons.version>
<montisim.simulation.version>2.0.2</montisim.simulation.version> <montisim.simulation.version>2.0.2</montisim.simulation.version>
<montisim.controller.version>1.0.3</montisim.controller.version> <montisim.controller.version>1.0.4</montisim.controller.version>
<montisim.rmimodelserver.version>1.1.4</montisim.rmimodelserver.version>
<montisim.simlang.version>1.0.1</montisim.simlang.version>
<smartfox.version>2.13</smartfox.version> <smartfox.version>2.13</smartfox.version>
<!-- .. Plugins ....................................................... --> <!-- .. Plugins ....................................................... -->
<assembly.plugin>2.5.4</assembly.plugin> <assembly.plugin>2.5.4</assembly.plugin>
<compiler.plugin>3.3</compiler.plugin> <!-- <compiler.plugin>3.3</compiler.plugin> -->
<source.plugin>2.4</source.plugin> <source.plugin>2.4</source.plugin>
<shade.plugin>2.4.3</shade.plugin> <shade.plugin>2.4.3</shade.plugin>
<jacoco.plugin>0.8.1</jacoco.plugin> <jacoco.plugin>0.8.1</jacoco.plugin>
...@@ -160,7 +169,7 @@ ...@@ -160,7 +169,7 @@
<dependency> <dependency>
<groupId>montisim</groupId> <groupId>montisim</groupId>
<artifactId>rmi-model-server</artifactId> <artifactId>rmi-model-server</artifactId>
<version>1.1.3</version> <version>${montisim.rmimodelserver.version}</version>
</dependency> </dependency>
<!-- Autopilot --> <!-- Autopilot -->
<dependency> <dependency>
...@@ -172,7 +181,7 @@ ...@@ -172,7 +181,7 @@
<dependency> <dependency>
<groupId>de.monticore.lang.montisim</groupId> <groupId>de.monticore.lang.montisim</groupId>
<artifactId>SimLang</artifactId> <artifactId>SimLang</artifactId>
<version>1.0.1</version> <version>${montisim.simlang.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.monticore.lang.montisim</groupId> <groupId>de.monticore.lang.montisim</groupId>
...@@ -218,8 +227,8 @@ ...@@ -218,8 +227,8 @@
</activation> </activation>
<properties> <properties>
<script.extension>.bat</script.extension> <script.extension>.bat</script.extension>
<sfs.directory>C:\SmartFoxServer_2X\SFS2X</sfs.directory> <sfs.directory>${project.basedir}/../../SFS2X</sfs.directory>
<sfs.extensions>${sfs.directory}\extensions\AllInOne</sfs.extensions> <sfs.extensions>${sfs.directory}/extensions/AllInOne</sfs.extensions>
</properties> </properties>
</profile> </profile>
<profile> <profile>
...@@ -248,7 +257,7 @@ ...@@ -248,7 +257,7 @@
<!-- Other Configuration --> <!-- Other Configuration -->
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin}</version> <version>3.8.0</version>
<configuration> <configuration>
<useIncrementalCompilation>true</useIncrementalCompilation> <useIncrementalCompilation>true</useIncrementalCompilation>
<source>${java.version}</source> <source>${java.version}</source>
...@@ -299,7 +308,7 @@ ...@@ -299,7 +308,7 @@
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>package rwth.server.extensions.ZoneExt</mainClass> <mainClass>rwth.server.extensions.ZoneExt</mainClass>
</transformer> </transformer>
</transformers> </transformers>
<outputFile>${sfs.extensions}/${project.name}.jar</outputFile> <outputFile>${sfs.extensions}/${project.name}.jar</outputFile>
...@@ -330,35 +339,32 @@ ...@@ -330,35 +339,32 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- to add copyright information automatically--> <!-- to add copyright information automatically-->
<!--
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>3.0</version> <version>3.0</version>
<configuration> <configuration>
<header>${project.baseUri}/src/license/se/license.txt</header> <header>${project.baseUri}/src/license/se/license.txt</header>
<properties> <excludes>
<owner>Michael von Wenckstern</owner> <exclude>**/README</exclude>
<email>vonwenckstern@se-rwth.de</email> <exclude>**/src/test/resources/**</exclude>
</properties> <exclude>**/src/main/resources/**</exclude>
<excludes> <exclude>**/license/**</exclude>
<exclude>**/README</exclude> </excludes>
<exclude>src/test/resources/**</exclude> </configuration>
<exclude>src/main/resources/**</exclude> <executions>
<exclude>src/license/**</exclude> <execution>
</excludes> <goals>
</configuration> <goal>format</goal>
<executions> </goals>
<execution> <phase>process-sources</phase>
<goals> </execution>
<goal>format</goal> </executions>
</goals> </plugin>
<phase>process-sources</phase>
</execution>
</executions>
</plugin>
-->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
......
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
FROM openjdk:8-jdk FROM openjdk:8-jdk
WORKDIR /app WORKDIR /app
......
<!-- (c) https://github.com/MontiCore/monticore -->
This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also This is the simulation server module. It provides a set of RESTful APIs for setting up, running simulation and also
retrieving the results. retrieving the results.
......
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
cp ./target/classes/app.db app.db cp ./target/classes/app.db app.db
cp ./target/restful-2.0.0.jar app.jar cp ./target/restful-2.0.0.jar app.jar
......
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
version: "3" version: "3"
services: services:
......
# (c) https://github.com/MontiCore/monticore #
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
swagger: "2.0" swagger: "2.0"
info: info:
description: "API doc for MontiSim server" description: "API doc for MontiSim server"
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- (c) https://github.com/MontiCore/monticore --> <!--
(c) https://github.com/MontiCore/monticore
The license generally applicable for this project
can be found under https://github.com/MontiCore/monticore.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
...@@ -8,7 +15,7 @@ ...@@ -8,7 +15,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.4.RELEASE</version> <version>2.1.5</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
...@@ -19,7 +26,6 @@ ...@@ -19,7 +26,6 @@
<properties> <properties>
<montisim.simulation.version>2.0.2</montisim.simulation.version> <montisim.simulation.version>2.0.2</montisim.simulation.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
...@@ -62,6 +68,7 @@ ...@@ -62,6 +68,7 @@
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jgrapht</groupId> <groupId>org.jgrapht</groupId>
<artifactId>jgrapht-core</artifactId> <artifactId>jgrapht-core</artifactId>
...@@ -209,6 +216,12 @@ ...@@ -209,6 +216,12 @@
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>RELEASE</version> <version>RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -270,7 +283,7 @@ ...@@ -270,7 +283,7 @@
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
<finalName>restful</finalName> <!--<finalName>restful</finalName>-->
</build> </build>
<distributionManagement> <distributionManagement>
......
#!/usr/bin/env bash #!/usr/bin/env bash
# (c) https://github.com/MontiCore/monticore #