Skip to content

Commit 300bbaa

Browse files
author
Ivan Franchin
committed
Project upgrade
- Upgrade to Spring Boot 3.4.5 - Upgrade to SpringDoc OpenAPI 2.8.6 - Move dockerImagePrefix from build.gradle to the build-docker-images.sh - Upgrade to Mongo Docker Image 8.0.6 - Upgrade to Keycloak Docker Image 26.2.1
1 parent 8ef7732 commit 300bbaa

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

book-service/build.gradle

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.4.3'
3+
id 'org.springframework.boot' version '3.4.5'
44
id 'io.spring.dependency-management' version '1.1.7'
55
}
66

@@ -27,10 +27,9 @@ repositories {
2727
}
2828

2929
ext {
30-
set('springdocOpenApiVersion', '2.8.5')
31-
set('keycloakVersion', '26.0.4')
30+
set('springdocOpenApiVersion', '2.8.6')
31+
set('keycloakVersion', '26.0.5')
3232
set('httpClient5Version', '5.4.1')
33-
set('dockerImagePrefix', 'ivanfranchin')
3433
}
3534

3635
// adding integration test
@@ -97,7 +96,3 @@ tasks.named('test') {
9796

9897
check.dependsOn integrationTest
9998
integrationTest.mustRunAfter test
100-
101-
tasks.named("bootBuildImage") {
102-
imageName = "${dockerImagePrefix}/${project.name}:${project.version}"
103-
}

book-service/src/integration-test/java/com/ivanfranchin/bookservice/AbstractTestcontainers.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public abstract class AbstractTestcontainers {
2626

2727
@Container
2828
@ServiceConnection
29-
private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:8.0.5");
29+
private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:8.0.6");
3030

31-
private static final GenericContainer<?> keycloakContainer = new GenericContainer<>("quay.io/keycloak/keycloak:26.1.4");
31+
private static final GenericContainer<?> keycloakContainer = new GenericContainer<>("quay.io/keycloak/keycloak:26.2.1");
3232

3333
protected static Keycloak keycloakBookService;
3434

book-service/src/test/java/com/ivanfranchin/bookservice/repository/BookRepositoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class BookRepositoryTest {
2424

2525
@Container
2626
@ServiceConnection
27-
private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:8.0.5");
27+
private static final MongoDBContainer mongoDBContainer = new MongoDBContainer("mongo:8.0.6");
2828

2929
@Autowired
3030
private MongoTemplate mongoTemplate;

build-docker-images.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
11
#!/usr/bin/env bash
22

3-
./gradlew book-service:clean book-service:bootBuildImage -x test -x integrationTest
3+
DOCKER_IMAGE_PREFIX="ivanfranchin"
4+
APP_NAME="book-service"
5+
APP_VERSION="1.0.0"
6+
DOCKER_IMAGE_NAME="${DOCKER_IMAGE_PREFIX}/${APP_NAME}:${APP_VERSION}"
7+
8+
./gradlew \
9+
"$APP_NAME":clean \
10+
"$APP_NAME":bootBuildImage \
11+
-x test \
12+
-x integrationTest \
13+
--imageName="$DOCKER_IMAGE_NAME"

init-environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

3-
MONGO_VERSION="8.0.5"
4-
KEYCLOAK_VERSION="26.1.4"
3+
MONGO_VERSION="8.0.6"
4+
KEYCLOAK_VERSION="26.2.1"
55

66
source scripts/my-functions.sh
77

0 commit comments

Comments
 (0)