Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 16 additions & 23 deletions mflix/server/java-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.13</version>
<version>4.0.6</version>
<relativePath/>
</parent>

Expand All @@ -20,12 +20,11 @@

<properties>
<java.version>21</java.version>
<springdoc.version>2.8.13</springdoc.version>
<springdoc.version>3.0.3</springdoc.version>
<dotenv.version>5.1.0</dotenv.version>
<commons.lang3.version>3.20.0</commons.lang3.version>
<impsort.plugin.version>1.13.0</impsort.plugin.version>
<byte-buddy.version>1.17.8</byte-buddy.version>
<langchain4j.version>1.11.0-beta19</langchain4j.version>
<langchain4j.version>1.15.0-beta25</langchain4j.version>
</properties>

<dependencies>
Expand All @@ -50,7 +49,7 @@
<!-- Spring Dotenv - Load .env files -->
<dependency>
<groupId>me.paulschwarz</groupId>
<artifactId>springboot3-dotenv</artifactId>
<artifactId>springboot4-dotenv</artifactId>
<version>${dotenv.version}</version>
</dependency>

Expand All @@ -61,24 +60,11 @@
<scope>provided</scope>
</dependency>

<!-- Force version for Commons Lang used by SpringDoc (CVE-2025-48924) -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang3.version}</version>
</dependency>

<!-- SpringDoc OpenAPI (Swagger UI) -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Spring Boot Test Starter -->
Expand All @@ -88,24 +74,31 @@
<scope>test</scope>
</dependency>

<!-- Spring Boot WebMVC Test Starter (provides @WebMvcTest in SB4+) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webmvc-test</artifactId>
<scope>test</scope>
</dependency>

<!-- Testcontainers JUnit Jupiter integration -->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<!-- MongoDB Atlas Local container for Testcontainers -->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>mongodb</artifactId>
<artifactId>testcontainers-mongodb</artifactId>
<scope>test</scope>
</dependency>

<!-- Jackson Databind for JSON serialization/deserialization -->
<!-- Jackson 2 auto-configuration (SB4 defaults to Jackson 3; this opts back into Jackson 2) -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-jackson2</artifactId>
</dependency>

<!-- LangChain4j Voyage AI for vector embeddings -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ logging.logback.rollingpolicy.max-file-size=5MB
logging.logback.rollingpolicy.max-history=5

# Jackson Configuration (JSON serialization)
spring.jackson.default-property-inclusion=non_null
spring.jackson.serialization.write-dates-as-timestamps=false
spring.jackson2.default-property-inclusion=non_null

# API Documentation (Swagger/OpenAPI)
springdoc.api-docs.path=/api-docs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
import org.springframework.http.MediaType;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;
Expand Down