diff --git a/build.gradle b/build.gradle index 1d18ae5..ca692ad 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.3.0' - id 'io.spring.dependency-management' version '1.1.5' + id 'org.springframework.boot' version '3.4.0' + id 'io.spring.dependency-management' version '1.1.6' } group = 'app.mealsmadeeasy' @@ -54,15 +54,17 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' // Custom - implementation 'io.jsonwebtoken:jjwt-api:0.12.5' - implementation 'io.jsonwebtoken:jjwt-jackson:0.12.5' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.5' + implementation 'io.jsonwebtoken:jjwt-api:0.12.6' + implementation 'io.jsonwebtoken:jjwt-jackson:0.12.6' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6' - implementation 'org.commonmark:commonmark:0.22.0' - implementation 'org.jsoup:jsoup:1.17.2' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2' + implementation 'org.commonmark:commonmark:0.24.0' + implementation 'org.jsoup:jsoup:1.18.3' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2' - implementation 'io.minio:minio:8.5.11' + implementation 'io.minio:minio:8.5.14' + + compileOnly 'org.jetbrains:annotations:26.0.1' // https://mvnrepository.com/artifact/com.twelvemonkeys.imageio/imageio-webp runtimeOnly 'com.twelvemonkeys.imageio:imageio-webp:3.12.0' @@ -71,11 +73,11 @@ dependencies { // Custom testing testRuntimeOnly 'com.h2database:h2' - testImplementation 'org.testcontainers:testcontainers:1.20.0' - testImplementation 'org.testcontainers:junit-jupiter:1.20.0' - testImplementation "org.testcontainers:minio:1.20.0" + testImplementation 'org.testcontainers:testcontainers:1.20.4' + testImplementation 'org.testcontainers:junit-jupiter:1.20.4' + testImplementation "org.testcontainers:minio:1.20.4" - testFixturesImplementation 'org.hamcrest:hamcrest:2.2' + testFixturesImplementation 'org.hamcrest:hamcrest:3.0' } tasks.register('integrationTest', Test) { diff --git a/compose.yaml b/compose.yaml index 1115d62..885f34d 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,10 +1,11 @@ name: meals-made-easy-api services: db: - image: mysql:latest + container_name: meals-made-easy-api-mysql + image: mysql:lts ports: - - '55001:3306' - - '55000:33060' + - '55000:3306' + - '55001:33060' env_file: .env environment: MYSQL_DATABASE: meals_made_easy_api @@ -17,10 +18,11 @@ services: volumes: - mysql-data:/var/lib/mysql minio: + container_name: meals-made-easy-api-minio image: minio/minio:latest ports: - - 9000:9000 - - 9001:9001 + - '9000:9000' + - '9001:9001' env_file: - .env environment: @@ -50,7 +52,7 @@ services: MINIO_PORT: 9000 MINIO_ROOT_USER: minio-root ports: - - 8080:8080 + - '8080:8080' volumes: mysql-data: minio-data: