#cm Updating junit versions and testing dependency versions.

philterd · Apr 3, 2024 · 57b9c04 · 57b9c04
1 parent 1ba0b35
commit 57b9c04
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 29 deletions.
diff --git a/phileas-core/pom.xml b/phileas-core/pom.xml
@@ -135,7 +135,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
+			<artifactId>junit-jupiter-engine</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>

diff --git a/phileas-model/pom.xml b/phileas-model/pom.xml
@@ -159,7 +159,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
+			<artifactId>junit-jupiter-engine</artifactId>
 			<version>${junit.version}</version>
 			<scope>test</scope>
 		</dependency>

diff --git a/phileas-processors/phileas-processors-structured/phileas-processors-structured-fhir/pom.xml b/phileas-processors/phileas-processors-structured/phileas-processors-structured-fhir/pom.xml
@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-processors/phileas-processors-unstructured/pom.xml b/phileas-processors/phileas-processors-unstructured/pom.xml
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services-split/pom.xml b/phileas-services-split/pom.xml
@@ -22,7 +22,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-ai/pom.xml b/phileas-services/phileas-services-ai/pom.xml
@@ -32,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-alerts/pom.xml b/phileas-services/phileas-services-alerts/pom.xml
@@ -34,7 +34,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-anonymization/pom.xml b/phileas-services/phileas-services-anonymization/pom.xml
@@ -37,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-disambiguation/pom.xml b/phileas-services/phileas-services-disambiguation/pom.xml
@@ -33,7 +33,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-metrics/pom.xml b/phileas-services/phileas-services-metrics/pom.xml
@@ -41,7 +41,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-pdf/pom.xml b/phileas-services/phileas-services-pdf/pom.xml
@@ -47,7 +47,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-policies/pom.xml b/phileas-services/phileas-services-policies/pom.xml
@@ -42,7 +42,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/phileas-services/phileas-services-split/pom.xml b/phileas-services/phileas-services-split/pom.xml
@@ -22,7 +22,7 @@
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -89,13 +89,16 @@
 		<libphonenumber.version>8.13.4</libphonenumber.version>
 		<log4j.version>2.19.0</log4j.version>
 		<lucene.version>8.3.0</lucene.version>
+		<maven.compiler.version>3.8.1</maven.compiler.version>
+		<maven.failsafe.version>3.2.5</maven.failsafe.version>
+		<maven.surefire.version>3.2.5</maven.surefire.version>
 		<micrometer.version>1.10.2</micrometer.version>
 		<mockito.version>5.4.0</mockito.version>
 		<nv-i18n.version>1.27</nv-i18n.version>
 		<opennlp.version>2.1.0</opennlp.version>
 		<pdfbox.version>2.0.23</pdfbox.version>
 		<redis-mock.version>0.1.6</redis-mock.version>
-		<redisson.version>3.19.1</redisson.version>
+		<redisson.version>3.27.2</redisson.version>
 		<retrofit.version>2.9.0</retrofit.version>
 		<scala.major.version>2.12</scala.major.version>
 		<segment.version>2.0.1</segment.version>
@@ -107,7 +110,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.8.1</version>
+					<version>${maven.compiler.version}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -121,19 +124,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.2</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.platform</groupId>
-						<artifactId>junit-platform-surefire-provider</artifactId>
-						<version>1.3.2</version>
-					</dependency>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit.version}</version>
-					</dependency>
-				</dependencies>
+				<version>${maven.surefire.version}</version>
 				<configuration>
 					<argLine>-Xmx8g --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED</argLine>
 					<excludes>
@@ -147,7 +138,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>2.22.2</version>
+				<version>${maven.failsafe.version}</version>
 				<configuration>
 					<includes>
 						<include>**/*IT.java</include>