Skip to content

Commit

Permalink
release: set version to 23.0
Browse files Browse the repository at this point in the history
* release: updated CHANGELOG
* feat: added projection information to release scenarios
* ci: updated version of jenkins agent
* doc: extented scheme for sumo_config.json with information about subscription values

Signed-off-by: Karl Schrab <[email protected]>
  • Loading branch information
kschrab authored Apr 20, 2023
1 parent 2bd527f commit ba4b3ea
Show file tree
Hide file tree
Showing 38 changed files with 52 additions and 38 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Changelog Eclipse MOSAIC 23.0 (April 2023)

* [A+] Perceived objects provide dimension information (length, width, height).
* [A+] The perception module can now detect traffic lights and their current states.
* [A+] Vehicles and other units are finally able to send V2X messages during their shutdown procedure.
* [A-] Resolved issues in perception module, e.g., when multiple apps used perception modifiers simultaneously.
* [M+] The RTI now detects the OS type of the local host by itself.
* [M-] Fixed minor bugs in RTI, Logging, and JSON-Scheme files.
* [S+] Scenario-Convert is now able to import building information to an existing scenario database.
* [T+] Improved handling of vehicles which are teleported by SUMO.
* [T+] Several data related to trains can now be read from SUMO.
* [T+] Now supports SUMO 1.16.0
* [X+] Introduced OpenDRIVE support for PHABMACS (Extended).

# Changelog Eclipse MOSAIC 22.1 (October 2022)

* [A+] Perception module is now working with viewing angles larger than 180 degrees.
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
memory: "2Gi"
cpu: "1"
- name: jnlp
image: 'eclipsecbijenkins/basic-agent:3.35'
image: 'eclipsecbijenkins/basic-agent:3107.v665000b_51092'
volumeMounts:
- mountPath: "/home/jenkins/.m2/settings-security.xml"
name: "settings-security-xml"
Expand Down
2 changes: 1 addition & 1 deletion app/tutorials/example-applications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion app/tutorials/highway-management/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion app/tutorials/traffic-light-communication/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion app/tutorials/weather-warning/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion bundle/src/assembly/resources/fed/ns3/ns3_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/23.0.zip"
ns3_url="https://www.nsnam.org/releases/$ns3_version_affix.tar.bz2"

###### more automatic parameters #########
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ check_shell
required_programs=( unzip tar bison flex protoc gcc python )
required_libraries=( "libprotobuf-dev >= 3.7.0" "libxml2-dev" )

omnet_federate_url="https://github.com/mosaic-addons/omnetpp-federate/archive/refs/tags/22.1.zip"
omnet_federate_url="https://github.com/mosaic-addons/omnetpp-federate/archive/refs/tags/23.0.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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<net version="1.6" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="-395635.35,-5826456.24" convBoundary="0.00,0.00,15681.22,10052.78" origBoundary="395635.35,5826456.24,411316.57,5836509.02" projParameter="!"/>
<location netOffset="-395635.35,-5826456.24" convBoundary="0.00,0.00,15681.22,10052.78" origBoundary="395635.35,5826456.24,411316.57,5836509.02" projParameter="+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<edge id=":1005286556_0" function="internal">
<lane id=":1005286556_0_0" index="0" speed="13.89" length="0.30" shape="872.73,4157.73 872.55,4157.48"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<net version="1.6" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="-691174.08,-5789894.65" convBoundary="0.00,0.00,10417.53,1414.70" origBoundary="691174.08,5789894.65,701591.61,5791309.35" projParameter="!"/>
<location netOffset="-691174.08,-5789894.65" convBoundary="0.00,0.00,10417.53,1414.70" origBoundary="691174.08,5789894.65,701591.61,5791309.35" projParameter="+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<edge id=":1288275815_0" function="internal">
<lane id=":1288275815_0_0" index="0" speed="36.11" length="0.30" shape="3500.19,314.14 3499.90,314.07"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<net version="1.6" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="-691174.08,-5789894.65" convBoundary="0.00,0.00,10417.53,1414.70" origBoundary="691174.08,5789894.65,701591.61,5791309.35" projParameter="!"/>
<location netOffset="-691174.08,-5789894.65" convBoundary="0.00,0.00,10417.53,1414.70" origBoundary="691174.08,5789894.65,701591.61,5791309.35" projParameter="+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<edge id=":1288275815_0" function="internal">
<lane id=":1288275815_0_0" index="0" speed="36.11" length="0.30" shape="3500.19,314.14 3499.90,314.07"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<net version="1.6" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

<location netOffset="-385769.05,-5819239.15" convBoundary="0.00,0.00,4124.17,464.03" origBoundary="385769.05,5819239.15,389893.22,5819703.18" projParameter="!"/>
<location netOffset="-385769.05,-5819239.15" convBoundary="0.00,0.00,4124.17,464.03" origBoundary="385769.05,5819239.15,389893.22,5819703.18" projParameter="+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>

<edge id=":21487142_0" function="internal">
<lane id=":21487142_0_0" index="0" speed="13.89" length="18.83" shape="284.48,163.66 281.82,158.87 279.22,156.10 276.09,153.70 271.86,150.01"/>
Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-cell/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-environment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-mapping/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-ns3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-omnetpp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-output/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-sns/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-sumo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion fed/mosaic-sumo/src/main/resources/CSumoScheme.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"default": true
},
"subscriptions": {
"description": "An optional list of subscriptions for each vehicle in the simulation. The less subscriptions given, the faster the simulation. Per default (if this list is set to null), all subscriptions are activated. Please note, that some components expect specific information, such as the road position. If this information is not subscribed, these components may fail.",
"description": "An optional list of subscriptions for each vehicle in the simulation. The less subscriptions given, the faster the simulation. Per default (if this list is set to null), all subscriptions are activated. Please note, that some components expect specific information, such as the road position. If this information is not subscribed, these components may fail. Possible values are: [\"roadposition\", \"leader\", \"signals\", \"emissions\", \"trains\"]",
"type": "array",
"items": { "type": "string" }
},
Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-communication/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-database/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-docker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-geomath/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-interactions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-network/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-objects/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-routing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion lib/mosaic-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<packaging>pom</packaging>

<name>Eclipse MOSAIC Parent</name>
Expand Down Expand Up @@ -79,7 +79,7 @@
</modules>

<properties>
<mosaic.version>23.0-SNAPSHOT</mosaic.version>
<mosaic.version>23.0</mosaic.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceTarget>1.8</project.build.sourceTarget>
<skip.coverage>true</skip.coverage>
Expand Down
2 changes: 1 addition & 1 deletion rti/mosaic-rti-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion rti/mosaic-rti-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion rti/mosaic-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ protected MosaicSimulation createSimulation() {

protected void printVersionAndCopyrightInfo() {
System.out.println("Eclipse MOSAIC [Version " + MosaicVersion.get().toString() + "]");
System.out.println("Copyright (c) 2022 Fraunhofer FOKUS and others. All rights reserved.");
System.out.println("Copyright (c) 2023 Fraunhofer FOKUS and others. All rights reserved.");
System.out.println("License EPL-2.0: Eclipse Public License Version 2 [https://eclipse.org/legal/epl-v20.html].");
System.out.println();
}
Expand Down
2 changes: 1 addition & 1 deletion test/mosaic-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.mosaic</groupId>
<artifactId>mosaic-parent</artifactId>
<version>23.0-SNAPSHOT</version>
<version>23.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit ba4b3ea

Please sign in to comment.