Skip to content

Commit

Permalink
Merge branch 'master' into gpkg-support
Browse files Browse the repository at this point in the history
  • Loading branch information
nkuehnel authored Mar 12, 2024
2 parents f9830fb + 7f7c824 commit e7c1a6c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion matsim/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.6.0</version>
<version>3.7.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly-release.xml</descriptor>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
<maven.compiler.release>17</maven.compiler.release>
<argLine></argLine>

<log4j.version>2.23.0</log4j.version>
<log4j.version>2.23.1</log4j.version>
<geotools.version>29.5</geotools.version>
<osmosis.version>0.49.2</osmosis.version>
<jts.version>1.19.0</jts.version>
<guice.version>7.0.0</guice.version>
<jackson.version>2.16.1</jackson.version>
<jackson.version>2.16.2</jackson.version>
<jogl.version>2.5.0</jogl.version>
<junit.version>5.10.2</junit.version>
</properties>
Expand Down Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.0</version>
<version>1.26.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand Down

0 comments on commit e7c1a6c

Please sign in to comment.