resolve conflits

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/deploy-container.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     environment:
       name: artemis-performance-test0.artemis.cit.tum.de
       url: https://artemis-performance-test0.artemis.cit.tum.de

.husky/pre-commit

@@ -1,5 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-
-"$(dirname "$0")/../npmw" exec --no-install lint-staged
+lint-staged --shell

.run/Benchmarking (Server).run.xml

@@ -2,10 +2,10 @@
   <configuration default="false" name="Benchmarking (Server)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="dev,local" />
     <module name="Artemis-Benchmarking.main" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="de.tum.cit.ase.ArtemisBenchmarkingApp" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="de.tum.cit.aet.ArtemisBenchmarkingApp" />
     <option name="VM_PARAMETERS" value="-XX:+ShowCodeDetailsInExceptionMessages -Duser.country=US -Duser.language=en -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>

.run/Benchmarking (Server-Prod).run.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Benchmarking (Server-Prod)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="prod,local" />
     <module name="Artemis-Benchmarking.main" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="de.tum.cit.ase.ArtemisBenchmarkingApp" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="de.tum.cit.aet.ArtemisBenchmarkingApp" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.yo-rc.json

@@ -24,7 +24,7 @@
     "microfrontend": null,
     "microfrontends": [],
     "nativeLanguage": "en",
-    "packageName": "de.tum.cit.ase",
+    "packageName": "de.tum.cit.aet",
     "prodDatabaseType": "mysql",
     "reactive": false,
     "searchEngine": false,

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:8.7-jdk21 AS build
+FROM gradle:8.12-jdk21 AS build
 
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src

build.gradle

@@ -1,3 +1,5 @@
+import com.gorylenko.GenerateGitPropertiesTask
+
 plugins {
     id "checkstyle"
     id "java"
@@ -6,21 +8,21 @@ plugins {
     id "eclipse"
     id "jacoco"
     id "org.springframework.boot"
-    id "com.google.cloud.tools.jib" version "3.4.2"
+    id "com.google.cloud.tools.jib" version "3.4.4"
     id "com.gorylenko.gradle-git-properties" version "2.4.2"
-    id "org.openapi.generator" version "7.6.0"
-    id "com.github.node-gradle.node" version "7.0.2"
-    id "org.sonarqube" version "5.0.0.4638"
+    id "org.openapi.generator" version "7.10.0"
+    id "com.github.node-gradle.node" version "7.1.0"
+    id "org.sonarqube" version "6.0.1.5171"
     id "com.diffplug.spotless" version "6.25.0"
-    id "com.github.andygoossens.gradle-modernizer-plugin" version "1.9.2"
+    id "com.github.andygoossens.gradle-modernizer-plugin" version "1.10.0"
     id "org.liquibase.gradle" version "2.2.2"
     // this allows us to find outdated dependencies via ./gradlew dependencyUpdates
     id "com.github.ben-manes.versions" version "0.51.0"
     // jhipster-needle-gradle-plugins - JHipster will add additional gradle plugins here
 }
 
-group = "de.tum.cit.ase"
-version = "0.1.2"
+group = "de.tum.cit.aet"
+version = "0.1.3"
 
 description = ""
 
@@ -54,7 +56,7 @@ apply from: "gradle/cache.gradle"
 apply from: "gradle/liquibase.gradle"
 // jhipster-needle-gradle-apply-from - JHipster will add additional gradle scripts to be applied here
 
-if (project.hasProperty("prod") || project.hasProperty("gae")) {
+if (project.hasProperty("prod")) {
     apply from: "gradle/profile_prod.gradle"
 } else {
     apply from: "gradle/profile_dev.gradle"
@@ -64,20 +66,6 @@ if (project.hasProperty("war")) {
     apply from: "gradle/war.gradle"
 }
 
-if (project.hasProperty("gae")) {
-    apply plugin: 'maven'
-    apply plugin: 'org.springframework.boot.experimental.thin-launcher'
-    apply plugin: 'io.spring.dependency-management'
-
-    dependencyManagement {
-        imports {
-            mavenBom "tech.jhipster:jhipster-dependencies:${jhipsterDependenciesVersion}"
-        }
-    }
-    appengineStage.dependsOn thinResolve
-}
-
-
 idea {
     module {
         excludeDirs += files("node_modules")
@@ -97,7 +85,7 @@ eclipse {
 defaultTasks "bootRun"
 
 springBoot {
-    mainClass = "de.tum.cit.ase.ArtemisBenchmarkingApp"
+    mainClass = "de.tum.cit.aet.ArtemisBenchmarkingApp"
 }
 
 test {
@@ -121,22 +109,23 @@ modernizer {
 
 
 check.dependsOn integrationTest
-task testReport(type: TestReport) {
-    destinationDirectory = file("$buildDir/reports/tests")
-    testResults.from(test)
+
+tasks.register("testReport", TestReport) {
+    destinationDirectory.set(layout.buildDirectory.dir("reports/tests"))
+    testResults.from(tasks.named("test"))
 }
 
-task integrationTestReport(type: TestReport) {
-    destinationDirectory = file("$buildDir/reports/tests")
-    testResults.from(integrationTest)
+tasks.register("integrationTestReport", TestReport) {
+    destinationDirectory.set(layout.buildDirectory.dir("reports/tests"))
+    testResults.from(tasks.named("integrationTest"))
 }
 
 gitProperties {
     failOnNoGitDirectory = false
     keys = ["git.branch", "git.commit.id.abbrev", "git.commit.id.describe"]
 }
 
-tasks.withType(com.gorylenko.GenerateGitPropertiesTask).configureEach {
+tasks.withType(GenerateGitPropertiesTask).configureEach {
   outputs.doNotCacheIf("Task is always executed") { true }
 }
 
@@ -159,10 +148,12 @@ repositories {
 }
 
 dependencies {
+    annotationProcessor "org.hibernate.orm:hibernate-jpamodelgen:${hibernateVersion}"
+    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
+    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+
     // import JHipster dependencies BOM
-    if (!project.hasProperty("gae")) {
-        implementation platform("tech.jhipster:jhipster-dependencies:${jhipsterDependenciesVersion}")
-    }
+    implementation platform("tech.jhipster:jhipster-dependencies:${jhipsterDependenciesVersion}")
 
     // Use ", version: jhipsterDependenciesVersion, changing: true" if you want
     // to use a SNAPSHOT release instead of a stable release
@@ -172,40 +163,33 @@ dependencies {
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hibernate6"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-hppc"
     implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310"
-    testImplementation "org.testcontainers:junit-jupiter:${testcontainersVersion}"
-    testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}"
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-api"
-    implementation "com.zaxxer:HikariCP"
-    implementation "org.apache.commons:commons-lang3"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-api:2.7.0"
+    implementation "com.zaxxer:HikariCP:6.2.1"
+    implementation "org.apache.commons:commons-lang3:3.17.0"
     implementation "org.openapitools:jackson-databind-nullable:${jacksonDatabindNullableVersion}"
     // Openapi generator uses javax namespace for now https://github.com/OpenAPITools/openapi-generator/pull/13593
     implementation "javax.annotation:javax.annotation-api:1.3.2"
     implementation "javax.validation:validation-api:2.0.1.Final"
-    annotationProcessor "org.hibernate.orm:hibernate-jpamodelgen:${hibernateVersion}"
     implementation "org.hibernate.orm:hibernate-core"
-    implementation "org.hibernate.validator:hibernate-validator"
+    implementation "org.hibernate.validator:hibernate-validator:8.0.2.Final"
     implementation "org.mapstruct:mapstruct:${mapstructVersion}"
-    annotationProcessor "org.mapstruct:mapstruct-processor:${mapstructVersion}"
-    annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-loader-tools:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-actuator:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-cache:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-webflux:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"
-    testImplementation "org.testcontainers:jdbc:${testcontainersVersion}"
     implementation "org.springframework.boot:spring-boot-starter-logging:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-mail:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-security:${springBootVersion}"
     implementation "org.springframework.boot:spring-boot-starter-thymeleaf:${springBootVersion}"
-    testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
-    testImplementation "org.springframework.boot:spring-boot-test:${springBootVersion}"
-    testImplementation "org.springframework.security:spring-security-test:${springSecurityVersion}"
-    testImplementation("com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}") {
-        exclude group: "org.slf4j", module: "slf4j-api"
-    }
-    testRuntimeOnly("com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}") {
-        exclude group: "org.slf4j", module: "slf4j-api"
-    }
+
+    // NOTE: the following dependencies use the newer versions explicitly to avoid other dependencies to use older versions
+    implementation "ch.qos.logback:logback-classic:${logbackVersion}"
+    implementation "ch.qos.logback:logback-core:${logbackVersion}"
+
+    // use newest version of commons-compress to avoid security issues through outdated dependencies
+    implementation "org.apache.commons:commons-compress:1.27.1"
+
     implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") {
         exclude module: "spring-boot-starter-undertow"
     }
@@ -214,10 +198,10 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${springBootVersion}"
     implementation "org.springframework.security:spring-security-data:${springSecurityVersion}"
 
-    implementation "io.micrometer:micrometer-registry-prometheus:1.13.0"
-    implementation "io.dropwizard.metrics:metrics-core"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.14.2"
+    implementation "io.dropwizard.metrics:metrics-core:4.2.29"
     implementation "org.springframework.security:spring-security-messaging:${springSecurityVersion}"
-    implementation "commons-io:commons-io:2.16.1"
+    implementation "commons-io:commons-io:2.18.0"
     implementation "com.thedeanda:lorem:2.2"
     implementation "org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r"
     // https://search.maven.org/artifact/org.eclipse.jgit/org.eclipse.jgit
@@ -237,30 +221,34 @@ dependencies {
 
     implementation "io.reactivex.rxjava3:rxjava:3.1.8"
     implementation 'io.netty:netty-resolver-dns-native-macos:4.1.100.Final:osx-aarch_64'
+    implementation "org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r"
+    implementation "io.reactivex.rxjava3:rxjava:3.1.10"
+    implementation 'io.netty:netty-resolver-dns-native-macos:4.1.116.Final:osx-aarch_64'
     implementation 'com.opencsv:opencsv:5.9'
-}
 
-if (project.hasProperty("gae")) {
-    task createPom {
-        def basePath = 'build/resources/main/META-INF/maven'
-        doLast {
-            pom {
-                withXml(dependencyManagement.pomConfigurer)
-            }.writeTo("${basePath}/${project.group}/${project.name}/pom.xml")
-        }
+    testImplementation "org.testcontainers:jdbc:${testcontainersVersion}"
+    testImplementation "org.testcontainers:junit-jupiter:${testcontainersVersion}"
+    testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}"
+    testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
+    testImplementation "org.springframework.boot:spring-boot-test:${springBootVersion}"
+    testImplementation "org.springframework.security:spring-security-test:${springSecurityVersion}"
+    testImplementation("com.tngtech.archunit:archunit-junit5-api:${archunitJunit5Version}") {
+        exclude group: "org.slf4j", module: "slf4j-api"
+    }
+    testRuntimeOnly("com.tngtech.archunit:archunit-junit5-engine:${archunitJunit5Version}") {
+        exclude group: "org.slf4j", module: "slf4j-api"
     }
-    bootJar.dependsOn = [createPom]
 }
 
-task cleanResources(type: Delete) {
-    delete "build/resources"
+tasks.register("cleanResources", Delete) {
+    delete(layout.buildDirectory.dir("resources"))
 }
 
 wrapper {
-    gradleVersion = "8.7"
+    gradleVersion = "8.12"
 }
 
-task webapp_test(type: NpmTask) {
+tasks.register("webapp_test", NpmTask) {
     inputs.property('appVersion', project.version)
     inputs.files("package-lock.json")
         .withPropertyName('package-lock')
@@ -285,30 +273,29 @@ task webapp_test(type: NpmTask) {
         outputs.file("build/test-results/clover.xml")
         .withPropertyName("clover-result")
 
-    dependsOn npmInstall,compileTestJava
+    dependsOn(tasks.named("npmInstall"), tasks.named("compileTestJava"))
     args = ["run", "webapp:test"]
 }
 
-if (project.hasProperty("nodeInstall")) {
-    node {
-        version = "20.10.0"
-        npmVersion = "10.2.4"
-        download = true
-    }
+node {
+    download = true
+    version = "${node_version}"
+    npmVersion = "${npm_version}"
+}
 
-    // Copy local node and npm to a fixed location for npmw
-    def fixedNode = tasks.register("fixedNode", Copy) {
-        from nodeSetup
-        into 'build/node'
-    }
-    tasks.named("nodeSetup").configure { finalizedBy fixedNode }
+// Copy local node and npm to a fixed location for npmw
+def fixedNode = tasks.register("fixedNode", Copy) {
+    from nodeSetup
+    into 'build/node'
+}
+tasks.named("nodeSetup").configure { finalizedBy fixedNode }
 
-    def fixedNpm = tasks.register("fixedNpm", Copy) {
-        from npmSetup
-        into 'build/node'
-    }
-    tasks.named("npmSetup").configure { finalizedBy fixedNpm }
+def fixedNpm = tasks.register("fixedNpm", Copy) {
+    from npmSetup
+    into 'build/node'
 }
+tasks.named("npmSetup").configure { finalizedBy fixedNpm }
+
 
 test.dependsOn webapp_test
 compileJava.dependsOn processResources
@@ -332,4 +319,6 @@ tasks.named("dependencyUpdates").configure {
 
 // Available commands:
 //
-// 1) Find dependency updates:                      ./gradlew dependencyUpdates -Drevision=release
+// 1) Build production:                             ./gradlew -Pprod -Pwar clean bootWar
+// 2) Execute tests without coverage report:        ./gradlew test -x webapp
+// 3) Find dependency updates:                      ./gradlew dependencyUpdates -Drevision=release

docker-compose.prod.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   nginx:
-    image: nginx:1.26.0-alpine-slim
+    image: nginx:1.27.3-alpine-slim
     ports:
       - '80:80'
       - '443:443'

docker-compose.yml

@@ -18,7 +18,7 @@ services:
     restart: always
 
   mysql:
-    image: mysql:8.4.0
+    image: mysql:9.1.0
     volumes:
       - artemis-mysql-data:/var/lib/mysql
     env_file: