Merge branch 'dev' into ms/#53-switch-to-scala3

CHANGELOG.md

@@ -27,6 +27,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - New scheduling protocol [#650](https://github.com/ie3-institute/simona/issues/650)
 - Replaced akka with pekko [#641](https://github.com/ie3-institute/simona/issues/641)
 
+### Fixed
+- Removed a repeated line in the documentation of vn_simona config [#658](https://github.com/ie3-institute/simona/issues/658)
+- Removed version number "2.0" from the logo printed to console [#642](https://github.com/ie3-institute/simona/issues/642)
+
 ## [3.0.0] - 2023-08-07
 
 ### Added
@@ -123,6 +127,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed broken layout in RTD documentation [#500](https://github.com/ie3-institute/simona/issues/500)
 - Corrected tests in RefSystemTest [#560](https://github.com/ie3-institute/simona/issues/560)
 - Take log file event filters from `logback.xml` when defining the run log appender [#108](https://github.com/ie3-institute/simona/issues/108)
+- Fix rendering of references in documentation [#505](https://github.com/ie3-institute/simona/issues/505)
 
 ### Removed
 - Remove workaround for tscfg tmp directory [#178](https://github.com/ie3-institute/simona/issues/178)

build.gradle

@@ -7,7 +7,7 @@ plugins {
   id 'signing'
   id 'maven-publish' // publish to a maven repo (local or mvn central, has to be defined)
   id 'pmd' // code check, working on source code
-  id 'com.diffplug.spotless' version '6.23.0'// code format
+  id 'com.diffplug.spotless' version '6.23.3'// code format
   id "com.github.ben-manes.versions" version '0.50.0'
   id "de.undercouch.download" version "5.5.0" // downloads plugin
   id "kr.motd.sphinx" version "2.10.1" // documentation generation
@@ -101,12 +101,12 @@ dependencies {
 
   /* logging */
   implementation "com.typesafe.scala-logging:scala-logging_${scalaVersion}:3.9.5" // pekko scala logging
-  implementation "ch.qos.logback:logback-classic:1.4.13"
+  implementation "ch.qos.logback:logback-classic:1.4.14"
 
   /* testing */
   testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
   testImplementation 'org.scalatestplus:mockito-3-4_2.13:3.2.10.0'
-  testImplementation 'org.mockito:mockito-core:5.7.0' // mocking framework
+  testImplementation 'org.mockito:mockito-core:5.8.0' // mocking framework
   testImplementation "org.scalatest:scalatest_${scalaVersion}:3.2.17"
   testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8' //scalatest html output
   testImplementation group: 'org.pegdown', name: 'pegdown', version: '1.6.0'

docs/readthedocs/requirements.txt

@@ -1,7 +1,7 @@
-Sphinx==5.3.0
-sphinx-rtd-theme==1.3.0
+Sphinx==7.2.6
+sphinx-rtd-theme==2.0.0
 sphinxcontrib-plantuml==0.27
-myst-parser==1.0.0
-markdown-it-py==2.2.0
+myst-parser==2.0.0
+markdown-it-py==3.0.0
 sphinx-hoverxref==1.3.0
 sphinxcontrib-bibtex==2.6.1

input/samples/vn_simona/vn_simona.conf

@@ -4,7 +4,6 @@ include "../common/pekko.conf"
 # ATTENTION: Do not change this config file directly but use it as a base for your personal delta config for the
 # vn_simona scenario! Delta configs can be created by including the config you want to change
 # parameters from via include <path-to-config> (e.g. include "input/samples/vn_simona/vn_simona.conf") at the
-# parameters from via include <path-to-config> (e.g. include "input/samples/vn_simona/vn_simona.conf") at the
 # beginning of your config file and then just override the parameters you want to change!
 #########