diff --git a/Jenkinsfile b/Jenkinsfile index 8cb60b1ed..3a5014105 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ kind: Pod spec: containers: - name: maven-sumo - image: eclipsemosaic/mosaic-ci:jdk11-sumo-1.18.0 + image: eclipsemosaic/mosaic-ci:jdk11-sumo-1.19.0 command: - cat tty: true diff --git a/README.md b/README.md index a6af1195a..e959b49c5 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,8 @@ For further questions we are available via mosaic@fokus.fraunhofer.de For a successful build you need the following software to be installed: * **Maven 3.1.x** or higher. -* **Java 11, or 17** - We recommend using the [Adoptium OpenJDK (aka Eclipse Temurin)](https://adoptium.net/?variant=openjdk11). -* **SUMO 1.18.0** - Additionally, the environment variable `SUMO_HOME` should be configured properly. +* **Java 11**, 17, or 21 - We recommend using the [Adoptium OpenJDK (aka Eclipse Temurin)](https://adoptium.net/?variant=openjdk11). +* **SUMO 1.19.0** - Older versions > 1.2.0 are most probably supported, but not tested. The environment variable `SUMO_HOME` should be configured properly. ## Build diff --git a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/SumoVersion.java b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/SumoVersion.java index 5c1386b4e..ab0982146 100644 --- a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/SumoVersion.java +++ b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/SumoVersion.java @@ -43,6 +43,7 @@ public enum SumoVersion { SUMO_1_16_x("1.16.*", TraciVersion.API_20), SUMO_1_17_x("1.17.*", TraciVersion.API_20), SUMO_1_18_x("1.18.*", TraciVersion.API_20), + SUMO_1_19_x("1.19.*", TraciVersion.API_21), /** * the lowest version supported by this client. @@ -52,7 +53,7 @@ public enum SumoVersion { /** * the highest version supported by this client. */ - HIGHEST(SUMO_1_18_x.sumoVersion, SUMO_1_18_x.traciVersion); + HIGHEST(SUMO_1_19_x.sumoVersion, SUMO_1_19_x.traciVersion); private final String sumoVersion; private final TraciVersion traciVersion; diff --git a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/TraciVersion.java b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/TraciVersion.java index 873838a45..0763a7652 100644 --- a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/TraciVersion.java +++ b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/TraciVersion.java @@ -21,6 +21,7 @@ public enum TraciVersion { API_18(18), API_19(19), API_20(20), + API_21(21), /** * the lowest version supported by this client. @@ -30,7 +31,7 @@ public enum TraciVersion { /** * the highest version supported by this client. */ - HIGHEST(API_20.getApiVersion()); + HIGHEST(API_21.getApiVersion()); private final int apiVersion; diff --git a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/traci/VehicleAdd.java b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/traci/VehicleAdd.java index fee3e64a4..f166cd421 100644 --- a/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/traci/VehicleAdd.java +++ b/fed/mosaic-sumo/src/main/java/org/eclipse/mosaic/fed/sumo/bridge/traci/VehicleAdd.java @@ -35,7 +35,7 @@ public class VehicleAdd */ @SuppressWarnings("WeakerAccess") public VehicleAdd() { - super(TraciVersion.HIGHEST); + super(TraciVersion.API_20); write() .command(CommandChangeVehicleValue.COMMAND) diff --git a/test/ci/ci-image-mvn-sumo/Dockerfile b/test/ci/ci-image-mvn-sumo/Dockerfile index 3e798eaf3..060076985 100644 --- a/test/ci/ci-image-mvn-sumo/Dockerfile +++ b/test/ci/ci-image-mvn-sumo/Dockerfile @@ -9,6 +9,6 @@ WORKDIR /home/jenkins RUN apt-get update && \ apt-get install -y --allow-unauthenticated software-properties-common && \ # adjust this output string to bypass potential caches - echo "Installing SUMO 1.18.0" && \ + echo "Installing SUMO 1.19.0" && \ add-apt-repository ppa:sumo/stable && \ apt-get install -y sumo \ No newline at end of file