Merge remote-tracking branch 'origin/feature/1-create-new-application' into feature/2-dataaccess

# Conflicts:
#	pom.xml
#	src/main/resources/application.properties

Author: Piotr Kubicki

.github/dependabot.yml

@@ -9,4 +9,10 @@ updates:
     directory: "/"  # Root directory where pom.xml is located
     schedule:
       interval: "weekly"  # Dependabot will check for updates every week
-    open-pull-requests-limit: 5  # Optional: Limit the number of open PRs from Dependabot
+    target-branch: "main"
+
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "feature/5-security"   # 👈 second branch config

.github/workflows/ci.yml

@@ -37,4 +37,4 @@ jobs:
         with:
           name: surefire-failsafe-html-report
           path: target/reports/surefire.html
-          retention-days: 90
+          retention-days: 20

HELP.md

@@ -1,8 +1,3 @@
-# Read Me First
-The following was discovered as part of building this project:
-
-* The original package name 'com.capgemini.training.appointment-booking-app' is invalid and this project uses 'com.capgemini.training.appointment_booking_app' instead.
-
 # Getting Started
 
 ### Reference Documentation

README.md

@@ -16,7 +16,7 @@ The repository grows in complexity and functionality across branches:
 
 | Branch | Description                                                            |
 |--------|------------------------------------------------------------------------|
-| `main` | Base Spring Boot setup with basic health and H2 endpoints              |
+| `main` | Base Spring Boot setup with basic health endpoints                     |
 | `feature/1-create-new-application` | Same as main                                                           |
 | `feature/2-dataaccess` | Persistence layer with Spring Data JPA and H2, part 1                  |
 | `feature/2-dataaccess-repositories` | Persistence layer with Spring Data JPA and H2, part 2                  |
@@ -31,7 +31,7 @@ After starting the application, you can access the following in your browser:
 | URL | Available from | Description |
 |-----|----------------|-------------|
 | [http://localhost:8080/actuator/health](http://localhost:8080/actuator/health) | `main` | Basic application health check |
-| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `main` | In-memory H2 database console |
+| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `feature/2-dataaccess` | In-memory H2 database console |
 | [http://localhost:8080/swagger-ui/index.html](http://localhost:8080/swagger-ui/index.html) | `feature/4-services` | OpenAPI UI for testing and exploring REST API |
 
 ## 🛠 Tech Stack

pom.xml

@@ -5,79 +5,66 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.4.4</version>
+		<version>3.5.6</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.capgemini.training</groupId>
-	<artifactId>appointment-booking-app</artifactId>
+	<artifactId>appointment-booking</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>appointment-booking-app</name>
+	<name>appointment-booking</name>
 	<description>Demo project for Spring Boot</description>
-	<url/>
-	<licenses>
-		<license/>
-	</licenses>
-	<developers>
-		<developer/>
-	</developers>
-	<scm>
-		<connection/>
-		<developerConnection/>
-		<tag/>
-		<url/>
-	</scm>
+
 	<properties>
 		<java.version>21</java.version>
 	</properties>
 	<dependencies>
+        <!-- 1) Dependencies to run the application on web-server + features to help monitor and manage a Spring Boot application: -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+
+        <!-- 2) Dependencies to provide data access layer and H2 in-memory database: -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-			<version>2.2.224</version>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<annotationProcessorPaths>
-						<path>
-							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
-						</path>
-					</annotationProcessorPaths>
-				</configuration>
-			</plugin>
+			<!--
+			  Not strictly mandatory, but in most Maven-based Spring Boot projects, it's highly recommended,
+			  because it simplifies packaging and deployment.
+			  The spring-boot-maven-plugin enables packaging the application as an executable JAR,
+			  which includes all dependencies and a manifest pointing to the main class.
+			  It simplifies running the app via `java -jar` and integrates with Maven's lifecycle.
+			  This plugin is essential for deploying Spring Boot applications and supports features
+			  like layered JARs for Docker and custom packaging.
+			-->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>

…ng/AppointmentBookingAppApplication.java …oking/AppointmentBookingApplication.javasrc/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java renamed to src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplication.java src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplication.java renamed to src/main/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplication.java

@@ -4,10 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class AppointmentBookingAppApplication {
+public class AppointmentBookingApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(AppointmentBookingAppApplication.class, args);
+		SpringApplication.run(AppointmentBookingApplication.class, args);
 	}
 
 }

src/main/resources/application.properties

@@ -1,17 +1,17 @@
 application.title=Appointment Booking Application
 
-spring.application.name=appointment-booking-app
+spring.application.name=appointment-booking
+
+management.endpoint.health.show-components=always
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
 
 spring.h2.console.enabled=true
 
 spring.datasource.url=jdbc:h2:mem:appointmentbooking
 spring.datasource.username=sa
 spring.datasource.password=password
 
-management.endpoint.health.show-components=always
-management.endpoint.health.show-details=always
-management.endpoints.web.exposure.include=*
-
 spring.flyway.locations=classpath:db/migration
 spring.flyway.enabled=true
 spring.flyway.clean-on-validation-error=true

…/AppointmentBookingAppApplicationIT.java …ing/AppointmentBookingApplicationIT.javasrc/test/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplicationIT.java renamed to src/test/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplicationIT.java src/test/java/com/capgemini/training/appointmentbooking/AppointmentBookingAppApplicationIT.java renamed to src/test/java/com/capgemini/training/appointmentbooking/AppointmentBookingApplicationIT.java

@@ -4,10 +4,11 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class AppointmentBookingAppApplicationIT {
+class AppointmentBookingApplicationIT {
 
 	@Test
 	void contextLoads() {
+		// loads application context
 	}
 
 }