Merge branch 'develop' into bug-fixes-2024-2-14

CDOT-CV · Feb 21, 2024 · 7da5e7b · 7da5e7b
2 parents 7cbcf5f + 5da7db2
commit 7da5e7b
Show file tree

Hide file tree

Showing 24 changed files with 729 additions and 210 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.1-openjdk-11 as builder
+FROM maven:3.8-eclipse-temurin-21-alpine as builder
 
 WORKDIR /home
 
@@ -38,7 +38,7 @@ WORKDIR /home/jpo-conflictvisualizer-api
 
 RUN mvn clean package -DskipTests
 # ENTRYPOINT ["tail", "-f", "/dev/null"]
-FROM openjdk:11-jre
+FROM eclipse-temurin:21-jre-alpine
 
 WORKDIR /home
 

diff --git a/jpo-conflictmonitor b/jpo-conflictmonitor
diff --git a/jpo-conflictvisualizer-api/pom.xml b/jpo-conflictvisualizer-api/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.8</version>
+		<version>3.1.3</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>usdot.jpo.ode</groupId>
@@ -15,7 +15,7 @@
 	<name>jpo-conflictvisualizer-api</name>
 	<description>Conflict Visualizer</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>21</java.version>
 		<!-- <thymeleaf.version>3.0.3.RELEASE</thymeleaf.version>
     	<thymeleaf-layout-dialect.version>2.2.1</thymeleaf-layout-dialect.version> -->
 	</properties>
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.14.2</version>
+			<version>2.15.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.ws.rs</groupId>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.24</version>
+			<version>1.18.30</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -87,7 +87,7 @@
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-ode-core</artifactId>
-			<version>1.3.0</version>
+			<version>1.6.0-SNAPSHOT</version>
 			<!-- required exclusion to preserve keycloak versions -->
 			<exclusions>
 				<exclusion>
@@ -99,29 +99,29 @@
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-ode-plugins</artifactId>
-			<version>1.3.0</version>
+			<version>1.6.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-geojsonconverter</artifactId>
-			<version>1.0.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<classifier>jpo-geojsonconverter</classifier>
 		</dependency>
 		<dependency>
 			<groupId>usdot.jpo.ode</groupId>
 			<artifactId>jpo-conflictmonitor</artifactId>
-			<version>1.0.0</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<classifier>jpo-conflictmonitor</classifier>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.12.0</version>
+			<version>3.14.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-ui</artifactId>
-			<version>1.6.14</version>
+			<version>1.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -142,15 +142,23 @@
 			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.keycloak</groupId>
-			<artifactId>keycloak-spring-boot-starter</artifactId>
-			<version>21.0.2</version>
-			<!-- <version>20.0.3</version> -->
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-oauth2-client</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.keycloak</groupId>-->
+<!--			<artifactId>keycloak-spring-boot-starter</artifactId>-->
+<!--			<version>21.0.2</version>-->
+<!--			&lt;!&ndash; <version>20.0.3</version> &ndash;&gt;-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-admin-client</artifactId>
-			<version>21.0.2</version>
+			<version>23.0.6</version>
 			<!-- <version>20.0.3</version> -->
 		</dependency>
 		<dependency>
@@ -169,17 +177,17 @@
 		<dependency>
 			<groupId>org.xhtmlrenderer</groupId>
 			<artifactId>flying-saucer-pdf</artifactId>
-			<version>9.1.20</version>
+			<version>9.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.itextpdf</groupId>
 			<artifactId>itextpdf</artifactId>
-			<version>5.5.13</version>
+			<version>5.5.13.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.knowm.xchart</groupId>
 			<artifactId>xchart</artifactId>
-			<version>3.8.3</version>
+			<version>3.8.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.awaitility</groupId>
@@ -190,13 +198,13 @@
 		<dependency>
 			<groupId>com.sendgrid</groupId>
 			<artifactId>sendgrid-java</artifactId>
-			<version>4.6.0</version>
+			<version>4.10.1</version>
 		  </dependency>
 		<!-- https://mvnrepository.com/artifact/com.postmarkapp/postmark -->
 		<dependency>
 			<groupId>com.postmarkapp</groupId>
 			<artifactId>postmark</artifactId>
-			<version>1.10.21</version>
+			<version>1.11.1</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -211,23 +219,27 @@
 							<artifactId>lombok</artifactId>
 						</exclude>
 					</excludes>
-					<fork>false</fork>
 				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M7</version>
+				<version>3.2.5</version>
 				<configuration>
 					<enableProcessChecker>all</enableProcessChecker>
 					<shutdown>exit</shutdown>
+					<!-- Prevent JDK 21 warnings related to Mockito during tests. -->
+					<!-- See:  https://github.com/mockito/mockito/issues/3037 -->
+					<argLine>
+						-XX:+EnableDynamicAgentLoading
+					</argLine>
 				</configuration>
 				<dependencies>
 					<dependency>
 						<!-- Force test to use junit4.7 -->
 						<groupId>org.apache.maven.surefire</groupId>
 						<artifactId>surefire-junit47</artifactId>
-						<version>3.0.0-M7</version>
+						<version>3.2.5</version>
 					</dependency>
 				</dependencies>
 			</plugin>

diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/ConflictApiApplication.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/ConflictApiApplication.java
@@ -30,17 +30,17 @@ public static void main(String[] args) {
 
     }
 
-    @Bean
-    public WebMvcConfigurer corsConfigurer() {
-        return new WebMvcConfigurer() {
-            @Override
-            public void addCorsMappings(CorsRegistry registry) {
-                ConflictMonitorApiProperties props = new ConflictMonitorApiProperties();
-                registry.addMapping("/**").allowedOrigins(props.getCors());
-                // registry.addMapping("/**").allowedMethods("*");
-            }
-        };
-    }
+//    @Bean
+//    public WebMvcConfigurer corsConfigurer() {
+//        return new WebMvcConfigurer() {
+//            @Override
+//            public void addCorsMappings(CorsRegistry registry) {
+//                ConflictMonitorApiProperties props = new ConflictMonitorApiProperties();
+//                registry.addMapping("/**").allowedOrigins(props.getCors());
+//                // registry.addMapping("/**").allowedMethods("*");
+//            }
+//        };
+//    }
 
 
 

diff --git a/...lictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/ConflictMonitorApiProperties.java b/...lictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/ConflictMonitorApiProperties.java
@@ -21,7 +21,7 @@
 import java.util.Arrays;
 import java.util.Properties;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/KeycloakConfig.java b/jpo-conflictvisualizer-api/src/main/java/us/dot/its/jpo/ode/api/KeycloakConfig.java