Development: Additional dependency updates

.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

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

@@ -148,6 +148,10 @@ 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
     implementation platform("tech.jhipster:jhipster-dependencies:${jhipsterDependenciesVersion}")
 
@@ -159,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: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: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"
     }
@@ -210,6 +207,19 @@ dependencies {
     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'
+
+    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"
+    }
 }
 
 tasks.register("cleanResources", Delete) {

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:

gradle.properties

@@ -18,6 +18,7 @@ mapstructVersion=1.6.3
 archunitJunit5Version=1.3.0
 jacksonDatabindNullableVersion=0.2.6
 hazelcastSpringVersion=5.5.0
+logbackVersion=1.5.15
 mysqlVersion=9.1.0
 testcontainersVersion=1.20.4
 

src/main/docker/mysql.yml

@@ -2,7 +2,7 @@
 name: artemis-benchmarking
 services:
   mysql:
-    image: mysql:8.4.0
+    image: mysql:9.1.0
     volumes:
       - ./config/mysql:/etc/mysql/conf.d
     #   - ~/volumes/jhipster/artemis-benchmarking/mysql/:/var/lib/mysql/

src/test/java/de/tum/cit/aet/config/MysqlTestContainer.java

@@ -23,7 +23,7 @@ public void destroy() {
     @Override
     public void afterPropertiesSet() {
         if (null == mysqlContainer) {
-            mysqlContainer = new MySQLContainer<>("mysql:8.2.0")
+            mysqlContainer = new MySQLContainer<>("mysql:9.1.0")
                 .withDatabaseName("artemis-benchmarking")
                 .withTmpFs(Collections.singletonMap("/testtmpfs", "rw"))
                 .withLogConsumer(new Slf4jLogConsumer(log))