Test ci.

.gitea/workflows/build-and-deploy.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - spring-boot-4
 
 jobs:
   build-and-deploy:
@@ -19,18 +20,18 @@ jobs:
           mkdir -p ~/.ssh
           echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-          git clone -b hexagonal-reforged ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no'
+          git clone ssh://gitea@gitea.takiguchi.ovh:12960/Codiki/codiki-properties.git --config core.sshCommand='ssh -o StrictHostKeyChecking=no'
 
       - name: 📄 Edit configuration
         run: |
           sed -i "s/<POSTGRES_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_user)/g" ./codiki-properties/application-prod.yml
           cp ./codiki-properties/application-prod.yml ./backend/codiki-launcher/src/main/resources/application.yml
           sed -i "s/<POSTGRES_ADMIN_PASSWORD>/$(cat ./codiki-properties/passwords/postgresql/codiki_admin)/g" ./docker-compose.yml
-      
+
       - name: 🔨 Build backend docker image
         run: |
           sudo /usr/bin/docker build -t codiki-backend -f ./Dockerfile-backend . --no-cache
-          
+
       - name: 📦 Extract backend docker image into archive
         run: |
           sudo /usr/bin/docker save codiki-backend:latest -o ./codiki-backend.tar
@@ -42,7 +43,7 @@ jobs:
       - name: 📦 Extract frontend docker image into archive
         run: |
           sudo /usr/bin/docker save codiki-frontend:latest -o ./codiki-frontend.tar
-      
+
       - name: 📤 Transfer artifacts to remote server
         env:
           SSH_PRIVATE_KEY: ${{ secrets.PROD_SSH_PRIVATE_KEY }}
@@ -70,6 +71,6 @@ jobs:
             cd $REMOTE_PATH
             sudo /usr/bin/docker load < $REMOTE_PATH/codiki-backend.tar
             sudo /usr/bin/docker load < $REMOTE_PATH/codiki-frontend.tar
-            sudo /usr/bin/docker compose down
+            sudo /usr/bin/docker compose --file /home/codiki/docker-compose.yml down
-            sudo /usr/bin/docker compose up --detach
+            sudo /usr/bin/docker compose --file /home/codiki/docker-compose.yml up --detach
           EOC

backend/build.gradle.kts

@@ -26,10 +26,10 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("org.springframework.boot:spring-boot-dependencies:3.5.5"))
+        implementation(platform("org.springframework.boot:spring-boot-dependencies:4.1.1"))
-        compileOnly("org.projectlombok:lombok:1.18.40")
+        compileOnly("org.projectlombok:lombok:1.18.46")
-        annotationProcessor("org.projectlombok:lombok:1.18.40")
+        annotationProcessor("org.projectlombok:lombok:1.18.46")
-        testImplementation("org.assertj:assertj-core:3.27.4")
+        testImplementation("org.assertj:assertj-core:3.27.7")
         testImplementation("org.junit.jupiter:junit-jupiter-api")
         testImplementation("org.junit.jupiter:junit-jupiter-params")
         testImplementation("org.springframework.boot:spring-boot-starter-test")
@@ -43,7 +43,7 @@ subprojects {
 
 dependencyManagement {
     imports {
-        mavenBom("org.springframework.boot:spring-boot-dependencies:3.5.5")
+        mavenBom("org.springframework.boot:spring-boot-dependencies:4.1.1")
     }
 }
 

backend/codiki-application/build.gradle.kts

@@ -6,6 +6,6 @@ dependencies {
     implementation(project(":codiki-domain"))
     implementation("org.springframework:spring-context")
     implementation("org.springframework.boot:spring-boot-starter-security")
-    implementation("com.auth0:java-jwt:4.5.0")
+    implementation("com.auth0:java-jwt:4.6.0")
-    implementation("org.apache.commons:commons-lang3") //:3.18.0
+    implementation("org.apache.commons:commons-lang3")
 }

backend/codiki-exposition/build.gradle.kts

@@ -7,5 +7,5 @@ dependencies {
     implementation(project(":codiki-domain"))
     implementation("org.springframework.boot:spring-boot-starter-web")
     implementation("org.springframework.boot:spring-boot-starter-security")
-    implementation("org.apache.tika:tika-core:3.2.3")
+    implementation("org.apache.tika:tika-core:4.0.0")
 }

backend/codiki-infrastructure/build.gradle.kts

@@ -7,5 +7,5 @@ dependencies {
     implementation(project(":codiki-domain"))
     implementation("org.springframework:spring-context")
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
-    implementation("org.postgresql:postgresql:42.7.5")
+    implementation("org.postgresql:postgresql:42.7.13")
 }

backend/codiki-infrastructure/src/main/java/org/codiki/infrastructure/configuration/JpaConfiguration.java

@@ -1,6 +1,6 @@
 package org.codiki.infrastructure.configuration;
 
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 

backend/codiki-launcher/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.springframework.boot") version "3.5.5"
+    id("org.springframework.boot") version "4.1.1"
     id("io.spring.dependency-management") version "1.1.7"
 }
 

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       POSTGRES_PASSWORD: <POSTGRES_PASSWORD>
       PGDATA: /var/lib/postgresql/data/pgdata
     volumes:
-      - "./docker/postgresql/pgdata:/var/lib/postgresql/data/pgdata"
+      - "/home/codiki/database:/var/lib/postgresql/data/pgdata"
     restart: always
 
   codiki-backend:
@@ -24,7 +24,7 @@ services:
     ports:
       - "50011:8080"
     volumes:
-      - "/opt/codiki/pictures:/opt/codiki/pictures"
+      - "/home/codiki/pictures:/opt/codiki/pictures"
     networks:
       - "codiki-network"
     restart: always

frontend/package.json

@@ -17,26 +17,26 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "21.2.10",
+    "@angular/animations": "22.1.5",
-    "@angular/cdk": "21.2.8",
+    "@angular/cdk": "22.1.5",
-    "@angular/common": "21.2.10",
+    "@angular/common": "22.1.5",
-    "@angular/compiler": "21.2.10",
+    "@angular/compiler": "22.1.5",
-    "@angular/core": "21.2.10",
+    "@angular/core": "22.1.5",
-    "@angular/forms": "21.2.10",
+    "@angular/forms": "22.1.5",
-    "@angular/material": "21.2.8",
+    "@angular/material": "22.1.5",
-    "@angular/platform-browser": "21.2.10",
+    "@angular/platform-browser": "22.1.5",
-    "@angular/platform-browser-dynamic": "21.2.10",
+    "@angular/platform-browser-dynamic": "22.1.5",
-    "@angular/router": "21.2.10",
+    "@angular/router": "22.1.5",
     "rxjs": "7.8.2",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@angular/build": "21.2.8",
+    "@angular/build": "22.1.7",
-    "@angular/cli": "21.2.8",
+    "@angular/cli": "22.1.7",
-    "@angular/compiler-cli": "21.2.10",
+    "@angular/compiler-cli": "22.1.5",
-    "@angular/localize": "21.2.10",
+    "@angular/localize": "22.1.5",
     "@types/jasmine": "6.0.0",
-    "jasmine-core": "6.2.0",
+    "jasmine-core": "6.3.0",
-    "typescript": "5.9.3"
+    "typescript": "6.0.3"
   }
 }