Skip to content

Commit

Permalink
Merge pull request #3618 from matsim-org/3575-poms-replace-hardcoded-…
Browse files Browse the repository at this point in the history
…version-by-projectparentversion

pom.xml in contribs: use ${project.parent.version} for dependencys..
  • Loading branch information
kt86 authored Dec 2, 2024
2 parents d60c92a + 04ccc72 commit eae7c42
Show file tree
Hide file tree
Showing 31 changed files with 84 additions and 84 deletions.
6 changes: 3 additions & 3 deletions contribs/accessibility/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>matrixbasedptrouter</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</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>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.matsim.contrib</groupId>-->
Expand Down
2 changes: 1 addition & 1 deletion contribs/analysis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</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 @@ -40,37 +40,37 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>osm</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>sumo</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>emissions</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>noise</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>freight</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<exclusions>
<!-- Logging levels are all messed up without this exclusion -->
<exclusion>
Expand Down Expand Up @@ -151,7 +151,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions contribs/av/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>taxi</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contribs/bicycle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>osm</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contribs/cadytsIntegration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
<inceptionYear>2012</inceptionYear>
Expand Down
2 changes: 1 addition & 1 deletion contribs/carsharing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions contribs/commercialTrafficApplications/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>freight</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions contribs/drt-extensions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>ev</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>informed-mode-choice</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>simwrapper</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
Expand All @@ -45,7 +45,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>vsp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions contribs/drt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>common</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions contribs/dvrp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>common</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>ev</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion contribs/emissions/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 1 addition & 1 deletion contribs/ev/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>common</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
6 changes: 3 additions & 3 deletions contribs/freight/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>roadpricing</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>


Expand All @@ -85,7 +85,7 @@
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim-examples</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<!-- This comes from jsprit, but is outdated there. Unclear, when the next release is coming.
Expand Down
4 changes: 2 additions & 2 deletions contribs/freightreceiver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>freight</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim-examples</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>

</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contribs/informed-mode-choice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>application</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
Expand Down
8 changes: 4 additions & 4 deletions contribs/integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>accessibility</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.geotools.jdbc</groupId>
Expand All @@ -90,18 +90,18 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions contribs/locationchoice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion contribs/minibus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>org.matsim</groupId>
<artifactId>matsim</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<!-- only needed for external jar, no code dependency -->
Expand Down
2 changes: 1 addition & 1 deletion contribs/noise/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>analysis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.geotools/gt-geojson -->
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions contribs/parking/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>multimodal</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>otfvis</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.matsim.contrib</groupId>
<artifactId>dvrp</artifactId>
<version>2025.0-SNAPSHOT</version>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit eae7c42

Please sign in to comment.