Skip to content

Commit

Permalink
Rename branch to 2024 to indicate that we mean the year. Change all p…
Browse files Browse the repository at this point in the history
…oms accordingly
  • Loading branch information
janekdererste committed Apr 13, 2024
1 parent 8c831f5 commit ee04702
Show file tree
Hide file tree
Showing 49 changed files with 131 additions and 131 deletions.
6 changes: 3 additions & 3 deletions benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>matsim-all</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
Expand Down Expand Up @@ -33,12 +33,12 @@
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim-examples</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
8 changes: 4 additions & 4 deletions contribs/accessibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand Down Expand Up @@ -37,12 +37,12 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>matrixbasedptrouter</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.trove4j</groupId>
Expand Down Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.matsim.contrib</groupId>-->
Expand Down
2 changes: 1 addition & 1 deletion contribs/accidents/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand Down
4 changes: 2 additions & 2 deletions contribs/analysis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -13,7 +13,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.osgeo</groupId>
Expand Down
16 changes: 8 additions & 8 deletions contribs/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand All @@ -30,37 +30,37 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>osm</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>sumo</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>emissions</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>noise</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>freight</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
<exclusions>
<!-- Logging levels are all messed up without this exclusion -->
<exclusion>
Expand Down
8 changes: 4 additions & 4 deletions contribs/av/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -16,19 +16,19 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>taxi</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions contribs/bicycle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>osm</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions contribs/cadytsIntegration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
</dependencies>
<inceptionYear>2012</inceptionYear>
Expand Down
4 changes: 2 additions & 2 deletions contribs/carsharing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -12,7 +12,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
6 changes: 3 additions & 3 deletions contribs/commercialTrafficApplications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -14,13 +14,13 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>freight</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contribs/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand Down
2 changes: 1 addition & 1 deletion contribs/decongestion/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion contribs/discrete_mode_choice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
12 changes: 6 additions & 6 deletions contribs/drt-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -15,25 +15,25 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>ev</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>informed-mode-choice</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>simwrapper</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand All @@ -45,7 +45,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>vsp</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>

Expand Down
8 changes: 4 additions & 4 deletions contribs/drt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -15,19 +15,19 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>common</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions contribs/dvrp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>contrib</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.matsim.contrib</groupId>
Expand All @@ -24,17 +24,17 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>common</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>ev</artifactId>
<version>24.1-SNAPSHOT</version>
<version>2024.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
Loading

0 comments on commit ee04702

Please sign in to comment.