diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index f8104490737..264981a5e6b 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>matsim-all</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
@@ -33,12 +33,12 @@
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
diff --git a/contribs/accessibility/pom.xml b/contribs/accessibility/pom.xml
index 45d1f56723b..abb39ba6ff8 100644
--- a/contribs/accessibility/pom.xml
+++ b/contribs/accessibility/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -37,12 +37,12 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>matrixbasedptrouter</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>roadpricing</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.trove4j</groupId>
@@ -70,7 +70,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>analysis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 <!--		<dependency>-->
 <!--			<groupId>org.matsim.contrib</groupId>-->
diff --git a/contribs/accidents/pom.xml b/contribs/accidents/pom.xml
index 365d6c8a8d0..52a08183516 100644
--- a/contribs/accidents/pom.xml
+++ b/contribs/accidents/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/analysis/pom.xml b/contribs/analysis/pom.xml
index 8238a60b8bb..f96aef9f25b 100644
--- a/contribs/analysis/pom.xml
+++ b/contribs/analysis/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.matsim.contrib</groupId>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>roadpricing</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgeo</groupId>
diff --git a/contribs/application/pom.xml b/contribs/application/pom.xml
index f15326461c8..a214d01e05c 100644
--- a/contribs/application/pom.xml
+++ b/contribs/application/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -30,37 +30,37 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>otfvis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>osm</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>sumo</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>analysis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>emissions</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>noise</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>freight</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<exclusions>
 				<!-- Logging levels are all messed up without this exclusion -->
 				<exclusion>
diff --git a/contribs/av/pom.xml b/contribs/av/pom.xml
index a582c84499c..fe6b03df2cf 100644
--- a/contribs/av/pom.xml
+++ b/contribs/av/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -16,19 +16,19 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>dvrp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>taxi</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>drt</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
diff --git a/contribs/bicycle/pom.xml b/contribs/bicycle/pom.xml
index e49da35da22..4224e67c1c4 100644
--- a/contribs/bicycle/pom.xml
+++ b/contribs/bicycle/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -23,7 +23,7 @@
       <dependency>
           <groupId>org.matsim.contrib</groupId>
           <artifactId>osm</artifactId>
-          <version>16.0-SNAPSHOT</version>
+          <version>25.0-SNAPSHOT</version>
           <scope>compile</scope>
       </dependency>
   </dependencies>
diff --git a/contribs/cadytsIntegration/pom.xml b/contribs/cadytsIntegration/pom.xml
index cbda10dfafe..eede4067cb7 100644
--- a/contribs/cadytsIntegration/pom.xml
+++ b/contribs/cadytsIntegration/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -17,7 +17,7 @@
   	<dependency>
   		<groupId>org.matsim.contrib</groupId>
   		<artifactId>analysis</artifactId>
-  		<version>16.0-SNAPSHOT</version>
+  		<version>25.0-SNAPSHOT</version>
   	</dependency>
   </dependencies>
   <inceptionYear>2012</inceptionYear>
diff --git a/contribs/carsharing/pom.xml b/contribs/carsharing/pom.xml
index fd1052f7365..28905e9e8ac 100644
--- a/contribs/carsharing/pom.xml
+++ b/contribs/carsharing/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -12,7 +12,7 @@
   	<dependency>
   		<groupId>org.matsim.contrib</groupId>
   		<artifactId>dvrp</artifactId>
-  		<version>16.0-SNAPSHOT</version>
+  		<version>25.0-SNAPSHOT</version>
   	</dependency>
   </dependencies>
 </project>
diff --git a/contribs/commercialTrafficApplications/pom.xml b/contribs/commercialTrafficApplications/pom.xml
index c842aa58055..8da0eaa5958 100644
--- a/contribs/commercialTrafficApplications/pom.xml
+++ b/contribs/commercialTrafficApplications/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -14,13 +14,13 @@
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>freight</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>drt</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/contribs/common/pom.xml b/contribs/common/pom.xml
index 106a9e01e46..4b3103dd412 100644
--- a/contribs/common/pom.xml
+++ b/contribs/common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/decongestion/pom.xml b/contribs/decongestion/pom.xml
index 42c6ad098c0..70fc8cd6f77 100644
--- a/contribs/decongestion/pom.xml
+++ b/contribs/decongestion/pom.xml
@@ -2,7 +2,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
 	<dependencies>
 		<dependency>
diff --git a/contribs/discrete_mode_choice/pom.xml b/contribs/discrete_mode_choice/pom.xml
index 4a025583000..1fd9d1bfa26 100644
--- a/contribs/discrete_mode_choice/pom.xml
+++ b/contribs/discrete_mode_choice/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/contribs/drt-extensions/pom.xml b/contribs/drt-extensions/pom.xml
index d3ccd511acd..321cc6a2346 100644
--- a/contribs/drt-extensions/pom.xml
+++ b/contribs/drt-extensions/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -15,25 +15,25 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>drt</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>ev</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>informed-mode-choice</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>simwrapper</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -45,7 +45,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>vsp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/contribs/drt/pom.xml b/contribs/drt/pom.xml
index f04956d8ea0..a617d7257f3 100644
--- a/contribs/drt/pom.xml
+++ b/contribs/drt/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -15,19 +15,19 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>dvrp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>otfvis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>common</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/contribs/dvrp/pom.xml b/contribs/dvrp/pom.xml
index b16770af5e8..d251a658042 100644
--- a/contribs/dvrp/pom.xml
+++ b/contribs/dvrp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -24,17 +24,17 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>otfvis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>common</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>ev</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/contribs/emissions/pom.xml b/contribs/emissions/pom.xml
index cd6b9bf42a5..708c37a7987 100644
--- a/contribs/emissions/pom.xml
+++ b/contribs/emissions/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>analysis</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/contribs/ev/pom.xml b/contribs/ev/pom.xml
index ba04bbce066..dc920fd01ee 100644
--- a/contribs/ev/pom.xml
+++ b/contribs/ev/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>common</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/contribs/freight/pom.xml b/contribs/freight/pom.xml
index 3c805db83f3..2cda31e9aec 100644
--- a/contribs/freight/pom.xml
+++ b/contribs/freight/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -55,13 +55,13 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>roadpricing</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>otfvis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
@@ -77,7 +77,7 @@
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- This comes from jsprit, but is outdated there. Unclear, when the next release is coming.
diff --git a/contribs/freightreceiver/pom.xml b/contribs/freightreceiver/pom.xml
index 85415824719..4e1a0d4025b 100644
--- a/contribs/freightreceiver/pom.xml
+++ b/contribs/freightreceiver/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -28,13 +28,13 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>freight</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>
diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml
index 511f16993b9..ad6db585a41 100644
--- a/contribs/hybridsim/pom.xml
+++ b/contribs/hybridsim/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/informed-mode-choice/pom.xml b/contribs/informed-mode-choice/pom.xml
index ee62e49fbc5..23743ab7bc5 100644
--- a/contribs/informed-mode-choice/pom.xml
+++ b/contribs/informed-mode-choice/pom.xml
@@ -9,14 +9,14 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>application</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<exclusions>
 				<exclusion>
 					<groupId>xerces</groupId>
diff --git a/contribs/integration/pom.xml b/contribs/integration/pom.xml
index 20f72b2e851..3eb83eb1ffa 100644
--- a/contribs/integration/pom.xml
+++ b/contribs/integration/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<build>
@@ -80,7 +80,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>accessibility</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.geotools.jdbc</groupId>
@@ -90,18 +90,18 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>analysis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>dvrp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>drt</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/contribs/locationchoice/pom.xml b/contribs/locationchoice/pom.xml
index 37b90dc074b..f27f0ba5cee 100644
--- a/contribs/locationchoice/pom.xml
+++ b/contribs/locationchoice/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -24,12 +24,12 @@
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>otfvis</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
 	    <dependency>
 		    <groupId>org.matsim.contrib</groupId>
 		    <artifactId>analysis</artifactId>
-		    <version>16.0-SNAPSHOT</version>
+		    <version>25.0-SNAPSHOT</version>
 		    <scope>test</scope>
 	    </dependency>
     </dependencies>
diff --git a/contribs/matrixbasedptrouter/pom.xml b/contribs/matrixbasedptrouter/pom.xml
index ff4f4debf6a..e3db2642e76 100644
--- a/contribs/matrixbasedptrouter/pom.xml
+++ b/contribs/matrixbasedptrouter/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/minibus/pom.xml b/contribs/minibus/pom.xml
index a37195ed075..e6936d49aae 100644
--- a/contribs/minibus/pom.xml
+++ b/contribs/minibus/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>org.matsim</groupId>
       <artifactId>matsim</artifactId>
-      <version>16.0-SNAPSHOT</version>
+      <version>25.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <!-- only needed for external jar, no code dependency -->
diff --git a/contribs/multimodal/pom.xml b/contribs/multimodal/pom.xml
index 88e9882f54f..f3fa3012d1c 100644
--- a/contribs/multimodal/pom.xml
+++ b/contribs/multimodal/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/noise/pom.xml b/contribs/noise/pom.xml
index 159b9e8947f..85190d66a6b 100644
--- a/contribs/noise/pom.xml
+++ b/contribs/noise/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.matsim.contrib</groupId>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>analysis</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.geotools/gt-geojson -->
         <dependency>
diff --git a/contribs/osm/pom.xml b/contribs/osm/pom.xml
index f9adf283615..28497848002 100644
--- a/contribs/osm/pom.xml
+++ b/contribs/osm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/contribs/otfvis/pom.xml b/contribs/otfvis/pom.xml
index 82054bf73eb..c5e4654e38a 100644
--- a/contribs/otfvis/pom.xml
+++ b/contribs/otfvis/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<build>
 		<plugins>
diff --git a/contribs/parking/pom.xml b/contribs/parking/pom.xml
index c244e4edb62..33209a9bdd1 100644
--- a/contribs/parking/pom.xml
+++ b/contribs/parking/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -12,17 +12,17 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>multimodal</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>otfvis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>dvrp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/contribs/pom.xml b/contribs/pom.xml
index 9d49de8bfc1..2f975bd0163 100644
--- a/contribs/pom.xml
+++ b/contribs/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>matsim-all</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
diff --git a/contribs/protobuf/pom.xml b/contribs/protobuf/pom.xml
index 0cf9ae143fc..57d78a396bb 100644
--- a/contribs/protobuf/pom.xml
+++ b/contribs/protobuf/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/pseudosimulation/pom.xml b/contribs/pseudosimulation/pom.xml
index 56b3b3b9bfc..a048bde28dd 100644
--- a/contribs/pseudosimulation/pom.xml
+++ b/contribs/pseudosimulation/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>org.matsim.contrib</groupId>
       <artifactId>common</artifactId>
-      <version>16.0-SNAPSHOT</version>
+      <version>25.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
diff --git a/contribs/railsim/pom.xml b/contribs/railsim/pom.xml
index b6172ab206c..5db59edcbbd 100644
--- a/contribs/railsim/pom.xml
+++ b/contribs/railsim/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>contrib</artifactId>
 		<groupId>org.matsim</groupId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.sbb.matsim.contrib</groupId>
diff --git a/contribs/roadpricing/pom.xml b/contribs/roadpricing/pom.xml
index 0de37eb7223..f41dd694f13 100644
--- a/contribs/roadpricing/pom.xml
+++ b/contribs/roadpricing/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
diff --git a/contribs/sbb-extensions/pom.xml b/contribs/sbb-extensions/pom.xml
index d11ffa60cc1..cb1f6b93cf0 100644
--- a/contribs/sbb-extensions/pom.xml
+++ b/contribs/sbb-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.matsim</groupId>
         <artifactId>contrib</artifactId>
-        <version>16.0-SNAPSHOT</version>
+        <version>25.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/shared_mobility/pom.xml b/contribs/shared_mobility/pom.xml
index 98dc83f49d3..5b5dc027853 100644
--- a/contribs/shared_mobility/pom.xml
+++ b/contribs/shared_mobility/pom.xml
@@ -9,19 +9,19 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>common</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/contribs/signals/pom.xml b/contribs/signals/pom.xml
index 8c611680311..ba6edd853a1 100644
--- a/contribs/signals/pom.xml
+++ b/contribs/signals/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>org.matsim</groupId>
       <artifactId>matsim-examples</artifactId>
-      <version>16.0-SNAPSHOT</version>
+      <version>25.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.matsim.contrib</groupId>
       <artifactId>otfvis</artifactId>
-      <version>16.0-SNAPSHOT</version>
+      <version>25.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/contribs/simulatedannealing/pom.xml b/contribs/simulatedannealing/pom.xml
index 1a39953fb2c..4eb3030dbc7 100644
--- a/contribs/simulatedannealing/pom.xml
+++ b/contribs/simulatedannealing/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>common</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/contribs/simwrapper/pom.xml b/contribs/simwrapper/pom.xml
index b7557529aec..8eafac20903 100644
--- a/contribs/simwrapper/pom.xml
+++ b/contribs/simwrapper/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -16,7 +16,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>application</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 
 
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>vsp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/contribs/small-scale-traffic-generation/pom.xml b/contribs/small-scale-traffic-generation/pom.xml
index da651408230..87526b2f9fc 100644
--- a/contribs/small-scale-traffic-generation/pom.xml
+++ b/contribs/small-scale-traffic-generation/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
 
     <dependencies>
@@ -15,13 +15,13 @@
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>application</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.matsim.contrib</groupId>
             <artifactId>freight</artifactId>
-            <version>16.0-SNAPSHOT</version>
+            <version>25.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>
diff --git a/contribs/socnetsim/pom.xml b/contribs/socnetsim/pom.xml
index 9f24f4d23f4..15f6d81f68a 100644
--- a/contribs/socnetsim/pom.xml
+++ b/contribs/socnetsim/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.matsim</groupId>
     <artifactId>contrib</artifactId>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.matsim.contrib</groupId>
diff --git a/contribs/sumo/pom.xml b/contribs/sumo/pom.xml
index 760a2ea6bb2..b6e960f8ced 100644
--- a/contribs/sumo/pom.xml
+++ b/contribs/sumo/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>
diff --git a/contribs/taxi/pom.xml b/contribs/taxi/pom.xml
index a8b5bca4f64..4a4eba8380c 100644
--- a/contribs/taxi/pom.xml
+++ b/contribs/taxi/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.matsim.contrib</groupId>
@@ -28,17 +28,17 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>dvrp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>drt</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>ev</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
diff --git a/contribs/vsp/pom.xml b/contribs/vsp/pom.xml
index c871cf3ebd9..d51a236a9de 100644
--- a/contribs/vsp/pom.xml
+++ b/contribs/vsp/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>contrib</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -22,59 +22,59 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>multimodal</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>taxi</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>dvrp</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>parking</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>freight</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>accessibility</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>emissions</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>minibus</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>common</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>analysis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>informed-mode-choice</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 <!--		<dependency>-->
 <!--			<groupId>org.processing</groupId>-->
@@ -97,17 +97,17 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>otfvis</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>noise</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>signals</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openstreetmap.osmosis</groupId>
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>cadyts-integration</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
@@ -174,12 +174,12 @@
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>drt</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openjfx</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index ebfee09b200..7343e57b74b 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>matsim-all</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>jar</packaging>
diff --git a/matsim/pom.xml b/matsim/pom.xml
index 5b5d4f34017..753d01ddf7b 100644
--- a/matsim/pom.xml
+++ b/matsim/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.matsim</groupId>
 		<artifactId>matsim-all</artifactId>
-		<version>16.0-SNAPSHOT</version>
+		<version>25.0-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -180,7 +180,7 @@
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim-examples</artifactId>
-			<version>16.0-SNAPSHOT</version>
+			<version>25.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/pom.xml b/pom.xml
index 6e5e91602e4..e0118c6c009 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>org.matsim</groupId>
     <artifactId>matsim-all</artifactId>
     <packaging>pom</packaging>
-    <version>16.0-SNAPSHOT</version>
+    <version>25.0-SNAPSHOT</version>
     <name>MATSim-All</name>
     <modules>
         <module>matsim</module>