Skip to content

Commit baef169

Browse files
author
Piotr Kubicki
committed
Merge remote-tracking branch 'origin/feature/4-services' into feature/5-security
# Conflicts: # pom.xml
2 parents af006f7 + 8237a5d commit baef169

File tree

11 files changed

+177
-125
lines changed

11 files changed

+177
-125
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@ updates:
99
directory: "/" # Root directory where pom.xml is located
1010
schedule:
1111
interval: "weekly" # Dependabot will check for updates every week
12-
open-pull-requests-limit: 5 # Optional: Limit the number of open PRs from Dependabot
12+
target-branch: "main"
13+
14+
- package-ecosystem: "maven"
15+
directory: "/"
16+
schedule:
17+
interval: "weekly"
18+
target-branch: "feature/5-security" # 👈 second branch config

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
with:
3838
name: surefire-failsafe-html-report
3939
path: target/reports/surefire.html
40-
retention-days: 90
40+
retention-days: 20

HELP.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
# Read Me First
2-
The following was discovered as part of building this project:
3-
4-
* The original package name 'com.capgemini.training.appointment-booking-app' is invalid and this project uses 'com.capgemini.training.appointment_booking_app' instead.
5-
61
# Getting Started
72

83
### Reference Documentation

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ The repository grows in complexity and functionality across branches:
1616

1717
| Branch | Description |
1818
|--------|------------------------------------------------------------------------|
19-
| `main` | Base Spring Boot setup with basic health and H2 endpoints |
20-
| `feature/1-create-new-application` | Same as main |
19+
| `main` | Base Spring Boot setup with basic health endpoints |
20+
| `feature/1-create-new-application` | (Almost) same as main |
2121
| `feature/2-dataaccess` | Persistence layer with Spring Data JPA and H2, part 1 |
2222
| `feature/2-dataaccess-repositories` | Persistence layer with Spring Data JPA and H2, part 2 |
2323
| `feature/3-business-logic` | Service layer and business logic introduced |
@@ -31,7 +31,7 @@ After starting the application, you can access the following in your browser:
3131
| URL | Available from | Description |
3232
|-----|----------------|-------------|
3333
| [http://localhost:8080/actuator/health](http://localhost:8080/actuator/health) | `main` | Basic application health check |
34-
| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `main` | In-memory H2 database console |
34+
| [http://localhost:8080/h2-console](http://localhost:8080/h2-console) | `feature/2-dataaccess` | In-memory H2 database console |
3535
| [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 |
3636

3737
## 🛠 Tech Stack

0 commit comments

Comments
 (0)