fix: pom after merge from branch 3

Author: Piotr Kubicki

pom.xml

@@ -20,6 +20,10 @@
 		<querydsl.version>5.1.0</querydsl.version>
 		<maven-surefire-report-plugin.version>3.5.4</maven-surefire-report-plugin.version>
 		<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
+		<swagger-annotations.version>2.2.39</swagger-annotations.version>
+		<jackson-databind-nullable.version>0.2.6</jackson-databind-nullable.version>
+		<springdoc-openapi.version>2.8.5</springdoc-openapi.version>
+		<openapi-generator-maven-plugin.version>7.11.0</openapi-generator-maven-plugin.version>
 	</properties>
 	<dependencies>
         <!-- 1) Dependencies to run the application on web-server + features to help monitor and manage a Spring Boot application: -->
@@ -91,23 +95,23 @@
 			<artifactId>spring-boot-starter-validation</artifactId>
 		</dependency>
 
-		<!-- Dependencies required for OpenAPI code generation -->
+		<!-- 6) Dependencies required for OpenAPI code generation -->
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
 			<artifactId>swagger-annotations</artifactId>
-			<version>2.2.28</version>
+			<version>${swagger-annotations.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.openapitools</groupId>
 			<artifactId>jackson-databind-nullable</artifactId>
-			<version>0.2.6</version>
+			<version>${jackson-databind-nullable.version}</version>
 		</dependency>
 
-		<!-- Dependencies for OpenAPI documentation and Swagger UI -->
+		<!-- 7) Dependencies for OpenAPI documentation and Swagger UI -->
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.8.5</version>
+			<version>${springdoc-openapi.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -197,49 +201,6 @@
 			</plugin>
 
 			<!-- Spotless -->
-			<plugin>
-				<groupId>org.openapitools</groupId>
-				<artifactId>openapi-generator-maven-plugin</artifactId>
-				<version>7.11.0</version>
-				<executions>
-					<execution>
-						<id>appointmentBooking</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-						<configuration>
-							<inputSpec>${project.basedir}/api/openapi.yml</inputSpec>
-							<output>${project.build.directory}/generated-sources/openapi</output>
-							<cleanupOutput>true</cleanupOutput>
-							<generatorName>spring</generatorName>
-							<apiPackage>com.capgemini.training.appointmentbooking.service.api</apiPackage>
-							<modelPackage>com.capgemini.training.appointmentbooking.service.model</modelPackage>
-							<!--<supportingFilesToGenerate>ApiUtil.java</supportingFilesToGenerate>-->
-							<generateApiTests>false</generateApiTests>
-							<generateModelTests>false</generateModelTests>
-							<configOptions>
-<!--								<delegatePattern>true</delegatePattern>-->
-								<useTags>true</useTags>
-								<library>spring-boot</library>
-								<interfaceOnly>true</interfaceOnly>
-								<skipDefaultInterface>true</skipDefaultInterface>
-								<useSpringBoot3>true</useSpringBoot3>
-								<useOptional>true</useOptional>
-								<useBeanValidation>true</useBeanValidation>
-								<dateLibrary>java-time</dateLibrary>
-								<generateBuilders>false</generateBuilders>
-								<generateConstructorWithAllArgs>true</generateConstructorWithAllArgs>
-								<additionalModelTypeAnnotations>
-									@lombok.Generated
-									@lombok.ToString
-								</additionalModelTypeAnnotations>
-								<documentationProvider>source</documentationProvider>
-								<annotationLibrary>swagger2</annotationLibrary>
-							</configOptions>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>com.diffplug.spotless</groupId>
 				<artifactId>spotless-maven-plugin</artifactId>
@@ -290,6 +251,49 @@
 					<generatedSourcesDirectory>target/generated-sources/annotations</generatedSourcesDirectory>
 				</configuration>
 			</plugin>
+
+			<!-- OpenAPI Generator Maven Plugin -->
+			<plugin>
+				<groupId>org.openapitools</groupId>
+				<artifactId>openapi-generator-maven-plugin</artifactId>
+				<version>${openapi-generator-maven-plugin.version}</version>
+				<executions>
+					<execution>
+						<id>appointmentBooking</id>
+						<goals>
+							<goal>generate</goal>
+						</goals>
+						<configuration>
+							<inputSpec>${project.basedir}/api/openapi.yml</inputSpec>
+							<output>${project.build.directory}/generated-sources/openapi</output>
+							<cleanupOutput>true</cleanupOutput>
+							<generatorName>spring</generatorName>
+							<apiPackage>com.capgemini.training.appointmentbooking.service.api</apiPackage>
+							<modelPackage>com.capgemini.training.appointmentbooking.service.model</modelPackage>
+							<generateApiTests>false</generateApiTests>
+							<generateModelTests>false</generateModelTests>
+							<configOptions>
+								<useTags>true</useTags>
+								<library>spring-boot</library>
+								<interfaceOnly>true</interfaceOnly>
+								<skipDefaultInterface>true</skipDefaultInterface>
+								<useSpringBoot3>true</useSpringBoot3>
+								<useOptional>true</useOptional>
+								<useBeanValidation>true</useBeanValidation>
+								<dateLibrary>java-time</dateLibrary>
+								<generateBuilders>false</generateBuilders>
+								<generateConstructorWithAllArgs>true</generateConstructorWithAllArgs>
+								<additionalModelTypeAnnotations>
+									@lombok.Generated
+									@lombok.ToString
+								</additionalModelTypeAnnotations>
+								<documentationProvider>source</documentationProvider>
+								<annotationLibrary>swagger2</annotationLibrary>
+							</configOptions>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>