feat: integrate beta branch changes including sound events, model fixes and CI improvements

.github/workflows/build-pr.yml

@@ -18,11 +18,11 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 24
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
       - name: Build on ${{ matrix.os }}
-        run: ./gradlew clean build test
+        run: ./gradlew clean build
       - name: Generate JaCoCo Coverage Report
         if: matrix.os == 'ubuntu-latest'
         run: ./gradlew jacocoTestReport

.github/workflows/sematic-releases.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 24
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
       - name: Install dependencies
@@ -64,6 +64,21 @@ jobs:
             VERSION=$(cat version.txt)
             echo "release_version=$VERSION" >> $GITHUB_OUTPUT
           fi
+      - name: Get Version
+        id: get_version_env
+        run: echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV
+      - name: Upload BOM to Dependency-Track
+        if: steps.get_version_env.outputs.VERSION != ''
+        uses: DependencyTrack/gh-upload-sbom@v3
+        with:
+          serverhostname: ${{ secrets.DEPENDENCYTRACK_HOSTNAME }}
+          apikey: ${{ secrets.DEPENDENCYTRACK_APIKEY }}
+          projectname: "Vulpes Backend"
+          projectversion: ${{ env.VERSION }}
+          projecttags: 'docker,application,micronaut'
+          bomfilename: "build/reports/cyclonedx/bom.xml"
+          autocreate: true
+          parent: 'a5b26cf1-d8e0-4815-b727-0a355a2354f6'
   docker:
     name: Build Docker Artifacts
     runs-on: ubuntu-latest
@@ -80,7 +95,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 24
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
       - name: Build Docker Artifacts

.releaserc.json

@@ -11,7 +11,7 @@
       "@semantic-release/exec",
       {
         "verifyConditionsCmd": "./gradlew check",
-        "publishCmd": "./gradlew -Pversion=${nextRelease.version} publish && echo '${nextRelease.version}' > version.txt"
+        "publishCmd": "./gradlew -Pversion=${nextRelease.version} publish cyclonedxBom && echo '${nextRelease.version}' > version.txt"
       }
     ],
     "@semantic-release/git",

build.gradle.kts

@@ -1,15 +1,16 @@
 plugins {
     alias(libs.plugins.micronaut.application)
     alias(libs.plugins.micronaut.aot)
-    alias(libs.plugins.micronaut.test.resources)
+//    alias(libs.plugins.micronaut.test.resources) // TODO: Needs be fixed, ref: https://github.com/micronaut-projects/micronaut-gradle-plugin/issues/1195
     jacoco
     `maven-publish`
     id("org.openapi.generator") version "7.20.0"
+    alias(libs.plugins.cyclonedx)
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 
@@ -36,7 +37,6 @@ dependencies {
     implementation(mn.micronaut.openapi)
     implementation(mn.validation)
     implementation(mn.swagger.core)
-    implementation(mn.micronaut.management)
     implementation(mn.micronaut.micrometer.core)
     implementation(mn.micronaut.micrometer.registry.prometheus)
     // External Dependencies
@@ -52,17 +52,20 @@ dependencies {
 
     testImplementation(mn.junit.jupiter.api)
     testImplementation(mn.junit.jupiter.params)
-    testRuntimeOnly(mn.junit.jupiter.engine)
     testImplementation(mn.testcontainers.core)
     testImplementation(mn.testcontainers.mariadb)
-    testImplementation("org.testcontainers:junit-jupiter")
     testImplementation(mn.micronaut.test.rest.assured)
+    testImplementation(mn.micronaut.validation)
     testImplementation(mn.micronaut.test.resources.extensions.core)
     testImplementation(mn.micronaut.test.resources.extensions.junit.platform)
     // Faker library for JUnit tests
-    testImplementation("net.datafaker:datafaker:2.5.4")
-}
+    testImplementation(libs.testcontainers.junit)
+    testImplementation(libs.datafaker)
+    testImplementation(libs.hibernate.validator)
+    testImplementation(libs.jakarta.validation)
 
+    testRuntimeOnly(mn.junit.jupiter.engine)
+}
 
 application {
     mainClass.set("net.onelitefeather.vulpes.backend.VulpesBackend")
@@ -91,7 +94,7 @@ micronaut {
 tasks {
     compileJava {
         options.encoding = "UTF-8"
-        options.release = 21
+        options.release = 25
         options.forkOptions.jvmArgs = listOf("-Dmicronaut.openapi.views.spec=rapidoc.enabled=true,openapi-explorer.enabled=true,swagger-ui.enabled=true,swagger-ui.theme=flattop")
     }
     jacocoTestReport {

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.parallel=true
 # org.gradle.warning.mode=all
 # org.gradle.logging.level=info
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -Dmicronaut.openapi.views.spec=redoc.enabled=true,rapidoc.enabled=true,openapi-explorer.enabled=true,swagger-ui.enabled=true,swagger-ui.theme=flattop
-micronautVersion=4.8.0
+micronautVersion=4.10.2
 
 # The version of the Vulpes API
 version=999.0.0-SNAPSHOT

settings.gradle.kts

@@ -33,16 +33,27 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             version("micronaut", "4.6.2")
-            version("vulpes.model", "1.6.0")
+            version("vulpes.model", "1.6.0-beta.14")
             version("uuid.creator", "6.1.1")
+            version("datafaker", "2.4.2")
+            version("jetbrains.annotation", "26.0.2")
+            version("hibernate.validator", "9.0.1.Final")
+            version("jakarta.validation", "3.1.1")
+            version("cyclonedx", "3.0.1")
 
             library("uuid.creator", "com.github.f4b6a3", "uuid-creator").versionRef("uuid.creator")
             library("vulpes.api", "net.onelitefeather", "vulpes-model").versionRef("vulpes.model")
-            library("jetbrains.annotation", "org.jetbrains", "annotations").version("26.1.0")
+            library("jetbrains.annotation", "org.jetbrains", "annotations").versionRef("jetbrains.annotation")
+            library("datafaker", "net.datafaker", "datafaker").versionRef("datafaker")
+            library("testcontainers.junit", "org.testcontainers", "junit-jupiter").withoutVersion()
+
+            library("hibernate.validator", "org.hibernate.validator", "hibernate-validator").versionRef("hibernate.validator")
+            library("jakarta.validation", "jakarta.validation", "jakarta.validation-api").versionRef("jakarta.validation")
 
             plugin("micronaut.application", "io.micronaut.application").versionRef("micronaut")
             plugin("micronaut.aot", "io.micronaut.aot").versionRef("micronaut")
             plugin("micronaut.test-resources", "io.micronaut.test-resources").versionRef("micronaut")
+            plugin("cyclonedx", "org.cyclonedx.bom").versionRef("cyclonedx")
         }
     }
 }

src/main/java/net/onelitefeather/vulpes/backend/controller/AttributeController.java

@@ -11,16 +11,17 @@
 import io.micronaut.http.annotation.PathVariable;
 import io.micronaut.http.annotation.Post;
 import io.micronaut.http.annotation.Produces;
+import io.micronaut.validation.Validated;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.inject.Inject;
-import jakarta.validation.Valid;
 import net.onelitefeather.vulpes.backend.domain.attribute.AttributeModelDTO;
 import net.onelitefeather.vulpes.backend.domain.attribute.AttributeModelResponseDTO;
 import net.onelitefeather.vulpes.backend.service.AttributeService;
+import net.onelitefeather.vulpes.backend.validation.ValidationGroup;
 
 import java.util.List;
 import java.util.UUID;
@@ -58,7 +59,8 @@ public AttributeController(AttributeService attributeService) {
             )
     )
     @Post
-    public HttpResponse<AttributeModelResponseDTO> add(@Valid @Body AttributeModelDTO model) {
+    @Validated(groups = ValidationGroup.Create.class)
+    public HttpResponse<AttributeModelResponseDTO> add(@Body AttributeModelDTO model) {
         AttributeModelResponseDTO.AttributeModelDTO createdAttribute = attributeService.createAttribute(model);
         return HttpResponse.ok(createdAttribute);
     }
@@ -86,7 +88,8 @@ public HttpResponse<AttributeModelResponseDTO> add(@Valid @Body AttributeModelDT
             )
     )
     @Post("/update")
-    public HttpResponse<AttributeModelResponseDTO> update(@Valid @Body AttributeModelDTO model) {
+    @Validated(groups = ValidationGroup.Update.class)
+    public HttpResponse<AttributeModelResponseDTO> update(@Body AttributeModelDTO model) {
         AttributeModelResponseDTO result = attributeService.updateAttribute(model);
         if (result instanceof AttributeModelResponseDTO.AttributeModelErrorDTO) {
             return HttpResponse.notFound(result);
@@ -144,7 +147,7 @@ public HttpResponse<AttributeModelResponseDTO> delete(@PathVariable UUID id) {
                     schema = @Schema(implementation = AttributeModelResponseDTO.AttributeModelDTO.class)
             )
     )
-    @Delete("/delete/all")
+    @Delete("/delete")
     public HttpResponse<List<AttributeModelResponseDTO>> deleteAll() {
         List<AttributeModelResponseDTO> result = attributeService.deleteAllAttributes();
         return HttpResponse.ok(result);
@@ -173,7 +176,7 @@ public HttpResponse<List<AttributeModelResponseDTO>> deleteAll() {
             )
     )
     @Produces(MediaType.APPLICATION_JSON)
-    @Get(uris = {"/all"})
+    @Get(uris = {"/"})
     public HttpResponse<Page<AttributeModelResponseDTO.AttributeModelDTO>> getAll(Pageable pageable) {
         Page<AttributeModelResponseDTO.AttributeModelDTO> models = attributeService.getAllAttributes(pageable);
         return HttpResponse.ok(models);