Skip to content

Commit 47328c6

Browse files
committed
Merge branch 'bugfix/spring-boot-run-failures' into bugfix/get-rid-of-lombok-data-annotation
2 parents 61aa003 + c871585 commit 47328c6

2 files changed

Lines changed: 12 additions & 19 deletions

File tree

  • mflix/server/java-spring

mflix/server/java-spring/pom.xml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>org.projectlombok</groupId>
6060
<artifactId>lombok</artifactId>
61-
<optional>true</optional>
61+
<scope>provided</scope>
6262
</dependency>
6363

6464
<!-- Force version for Commons Lang used by SpringDoc (CVE-2025-48924) -->
@@ -100,12 +100,6 @@
100100
<artifactId>langchain4j-voyage-ai</artifactId>
101101
<version>${langchain4j.version}</version>
102102
</dependency>
103-
104-
<dependency>
105-
<groupId>org.projectlombok</groupId>
106-
<artifactId>lombok</artifactId>
107-
<scope>provided</scope>
108-
</dependency>
109103
</dependencies>
110104

111105
<build>
@@ -114,29 +108,28 @@
114108
<plugin>
115109
<groupId>org.springframework.boot</groupId>
116110
<artifactId>spring-boot-maven-plugin</artifactId>
111+
<configuration>
112+
<excludes>
113+
<exclude>
114+
<groupId>org.projectlombok</groupId>
115+
<artifactId>lombok</artifactId>
116+
</exclude>
117+
</excludes>
118+
</configuration>
117119
</plugin>
118120

121+
<!-- Maven Compiler Plugin - Process Lombok and suppress annotation processing warnings -->
119122
<plugin>
120123
<groupId>org.apache.maven.plugins</groupId>
121124
<artifactId>maven-compiler-plugin</artifactId>
122125
<configuration>
123-
<source>${java.version}</source>
124-
<target>${java.version}</target>
125-
<encoding>${project.build.sourceEncoding}</encoding>
126126
<annotationProcessorPaths>
127127
<path>
128128
<groupId>org.projectlombok</groupId>
129129
<artifactId>lombok</artifactId>
130+
<version>${lombok.version}</version>
130131
</path>
131132
</annotationProcessorPaths>
132-
</configuration>
133-
</plugin>
134-
135-
<!-- Maven Compiler Plugin - Suppress annotation processing warnings -->
136-
<plugin>
137-
<groupId>org.apache.maven.plugins</groupId>
138-
<artifactId>maven-compiler-plugin</artifactId>
139-
<configuration>
140133
<compilerArgs>
141134
<arg>-Xlint:-options</arg>
142135
</compilerArgs>

mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export MONGODB_URI="mongodb+srv://username:password@cluster.mongodb.net/sample_m
4242
Or use a `.env` file in the `server/java-spring` directory:
4343

4444
```
45-
MONGODB_URI=mongodb+srv://username:password@cluster.mongodb.net/sample_mflix?retryWrites=true&w=majority
45+
MONGODB_URI="mongodb+srv://username:password@cluster.mongodb.net/sample_mflix?retryWrites=true&w=majority"
4646
```
4747

4848
### Run the Tests

0 commit comments

Comments
 (0)