Merge branch 'master' into TripAnalysis-add-filter

matsim-org · Apr 2, 2024 · 5095b6d · 5095b6d
2 parents 680f55e + bc0b198
commit 5095b6d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/contribs/hybridsim/pom.xml b/contribs/hybridsim/pom.xml
@@ -10,7 +10,7 @@
   <name>hybridsim</name>
 
   <properties>
-    <protobuf.version>4.26.0</protobuf.version>
+    <protobuf.version>4.26.1</protobuf.version>
     <grpc.version>1.62.2</grpc.version>
   </properties>
 

diff --git a/contribs/protobuf/pom.xml b/contribs/protobuf/pom.xml
@@ -11,7 +11,7 @@
     <name>protobuf</name>
 
     <properties>
-        <protobuf.version>4.26.0</protobuf.version>
+        <protobuf.version>4.26.1</protobuf.version>
     </properties>
 
     <dependencies>

diff --git a/matsim/pom.xml b/matsim/pom.xml
@@ -222,7 +222,7 @@
 		<dependency>
 			<groupId>com.github.luben</groupId>
 			<artifactId>zstd-jni</artifactId>
-			<version>1.5.5-11</version>
+			<version>1.5.6-1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.validation</groupId>

diff --git a/pom.xml b/pom.xml
@@ -138,7 +138,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.15.1</version>
+                <version>2.16.0</version>
             </dependency>
             <dependency>
                 <groupId>com.opencsv</groupId>
@@ -353,7 +353,7 @@
 			<dependency>
 				<groupId>net.bytebuddy</groupId>
 				<artifactId>byte-buddy</artifactId>
-				<version>1.14.12</version>
+				<version>1.14.13</version>
 				<scope>test</scope>
 			</dependency>