Merge pull request #36 from matsim-vsp/kmt_cleanupPom

Update pom: Use MATSim as parent dependency
matsim-vsp · May 13, 2024 · 642b1cf · 642b1cf
2 parents 4377f0b + 697d456
commit 642b1cf
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 72 deletions.
diff --git a/.github/workflows/GithubActionsCI_maven.yml b/.github/workflows/GithubActionsCI_maven.yml
@@ -17,12 +17,12 @@ jobs:
 
     steps:
       - name: Checkout git repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'zulu'
           cache: maven
 

diff --git a/pom.xml b/pom.xml
@@ -10,17 +10,14 @@
 	<name>zeroCUTS project</name>
 	<description>zeroCUTS project</description>
 
-	<properties>
-		<matsim.version>25.0-PR3212</matsim.version>
-<!--        <matsim.version>16.0-SNAPSHOT</matsim.version>-->
-
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.release>17</maven.compiler.release>
-		<argLine/>
-
-
-	</properties>
+	<parent>
+		<groupId>org.matsim</groupId>
+		<artifactId>matsim-all</artifactId>
+		<version>2025.0-2024w20</version>
+		<!--		    <version>2025.0-PR3245</version>-->
+		<!--        <version>2025.0-SNAPSHOT</version>-->
+		<relativePath/>
+	</parent>
 
 	<repositories>
 
@@ -42,74 +39,70 @@
 			<id>matsim</id>
 			<url>https://repo.matsim.org/repository/matsim</url>
 		</repository>
-
 	</repositories>
 
 	<dependencies>
-
 		<!-- This is the matsim "core": -->
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim</artifactId>
-			<version>${matsim.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<!-- This is the matsim freight contrib: -->
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>freight</artifactId>
-			<version>${matsim.version}</version>
-			<!--<scope>compile</scope> -->
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<!-- This is the matsim vsp contrib: -->
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>vsp</artifactId>
-			<version>${matsim.version}</version>
-			<!--<scope>compile</scope> -->
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<!-- This is the matsim application contrib: -->
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>application</artifactId>
-			<version>${matsim.version}</version>
-			<!--<scope>compile</scope> -->
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<!-- This is the matsim small-scale-traffic-generation contrib: -->
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>small-scale-traffic-generation</artifactId>
-			<version>${matsim.version}</version>
-			<!--<scope>compile</scope> -->
+			<version>${project.parent.version}</version>
 		</dependency>
 
-
-
-
 		<dependency>
 			<groupId>org.matsim.contrib</groupId>
 			<artifactId>emissions</artifactId>
-			<version>${matsim.version}</version>
+			<version>${project.parent.version}</version>
 		</dependency>
 
 		<!--MATSim test infrastructure. Not transitive. -->
 		<dependency>
 			<groupId>org.matsim</groupId>
 			<artifactId>matsim</artifactId>
 			<type>test-jar</type>
-			<version>${matsim.version}</version>
+			<version>${project.parent.version}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<!-- Junit 5 testing. Version is inherited from the parent project (MATSim), thus not needed here -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.10.1</version>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
 			<scope>test</scope>
 		</dependency>
-
 
 	</dependencies>
 
@@ -213,44 +206,5 @@
 			</plugin>
 		</plugins>
 
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.0.0-M7</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-failsafe-plugin</artifactId>
-					<version>3.0.0-M7</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.2.2</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-source-plugin</artifactId>
-					<version>3.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>3.3.1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-install-plugin</artifactId>
-					<version>3.0.0-M1</version>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.6.3</version>
-				</plugin>
-			</plugins>
-		</pluginManagement>
 	</build>
 </project>