Merge pull request #329 from matsim-vsp/kmt_removeDependency

remove dependency to vsp contrib, as it is no longer needed
matsim-vsp · Nov 15, 2024 · 530e21f · 530e21f
2 parents 0a26470 + 97b6937
commit 530e21f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,12 +37,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.matsim.contrib</groupId>
-			<artifactId>vsp</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-
 		<!--MATSim examples. Not transitive -->
 		<dependency>
 			<groupId>org.matsim</groupId>

diff --git a/...reight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java b/...reight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java
@@ -47,7 +47,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.TransportMode;
@@ -173,7 +172,7 @@ private static Config prepareConfig(String[] args) {
     return config;
   }
 
-  private static @NotNull Controler prepareControler(Scenario scenario) {
+  private static Controler prepareControler(Scenario scenario) {
     log.info("Prepare controler");
     Controler controler = new Controler(scenario);
     controler.addOverridingModule(

diff --git a/...ogistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java b/...ogistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java
@@ -26,7 +26,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.matsim.analysis.personMoney.PersonMoneyEventsAnalysisModule;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
@@ -159,7 +158,7 @@ private static Config prepareConfig(String[] args) {
     return config;
   }
 
-  private static @NotNull Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
+  private static Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
     log.info("Prepare controler");
     Controler controler = new Controler(scenario);
     controler.addOverridingModule(