Merge branch 'master' into dependabot/maven/org.codehaus.plexus-plexu…

…s-utils-4.0.2

.github/workflows/code-coverage.yaml

@@ -31,4 +31,4 @@ jobs:
           files: ./matsim/target/site/jacoco/jacoco.xml
 
     env:
-      MAVEN_OPTS: -Xmx6g
+      MAVEN_OPTS: -Xmx2g

.github/workflows/deploy-on-pr-merge.yaml

@@ -49,4 +49,4 @@ jobs:
         uses: advanced-security/maven-dependency-submission-action@v4
 
     env:
-      MAVEN_OPTS: -Xmx6g
+      MAVEN_OPTS: -Xmx2g

.github/workflows/deploy-on-release-created.yaml

@@ -44,4 +44,4 @@ jobs:
           file: matsim/target/matsim-${{ github.event.release.tag_name }}-release.zip
           tag: ${{ github.event.release.tag_name }}
     env:
-      MAVEN_OPTS: -Xmx6g
+      MAVEN_OPTS: -Xmx2g

.github/workflows/deploy-weekly.yaml

@@ -39,4 +39,4 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.REPOMATSIM_TOKEN }}
 
     env:
-      MAVEN_OPTS: -Xmx6g
+      MAVEN_OPTS: -Xmx2g

.github/workflows/full-integration.yaml

@@ -38,7 +38,7 @@ jobs:
         run: mvn verify -P release --batch-mode --fail-at-end -D'maven.test.redirectTestOutputToFile' -D'matsim.preferLocalDtds=true'
 
     env:
-      MAVEN_OPTS: -Xmx6
+      MAVEN_OPTS: -Xmx2g
 
   verify-full-integration-successful:
     # always() - to ensure this job is executed (regardless of the status of the previous job)

.github/workflows/verify-push.yaml

@@ -101,7 +101,7 @@ jobs:
         working-directory: ${{matrix.module}}
 
     env:
-      MAVEN_OPTS: -Xmx6g
+      MAVEN_OPTS: -Xmx2g
 
   verify-all-jobs-successful:
     # always() - to ensure this job is executed (regardless of the status of the previous job)

pom.xml

@@ -30,7 +30,7 @@
         <maven.compiler.release>21</maven.compiler.release>
         <argLine></argLine>
 
-        <log4j.version>2.24.0</log4j.version>
+        <log4j.version>2.24.2</log4j.version>
         <geotools.version>31.3</geotools.version>
 		<osmosis.version>0.49.2</osmosis.version>
         <jts.version>1.20.0</jts.version>