Merge remote-tracking branch 'remotes/origin/main' into feature/add-i…

…nitial-documentation
FraunhoferIOSB · Dec 6, 2023 · ef1a2a0 · ef1a2a0
2 parents 6b9d7ba + 91fda9e
commit ef1a2a0
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/.github/workflows/maven-build-pr.yml b/.github/workflows/maven-build-pr.yml
@@ -29,7 +29,7 @@ jobs:
             ${{ runner.os }}-maven
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: 17

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -28,7 +28,7 @@ jobs:
         restore-keys: ${{ runner.os }}-maven
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: 17

diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -38,7 +38,7 @@ jobs:
           ${{ runner.os }}-maven
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: 17

diff --git a/core/pom.xml b/core/pom.xml
@@ -15,6 +15,16 @@
         <root.basedir>${project.parent.basedir}</root.basedir>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
         <dependency>
             <groupId>de.fraunhofer.iosb.ilt.faaast.service</groupId>
             <artifactId>model</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -48,37 +48,37 @@
     </distributionManagement>
     <properties>
         <assertj.version>3.24.2</assertj.version>
-        <checkstyle.version>10.12.4</checkstyle.version>
+        <checkstyle.version>10.12.5</checkstyle.version>
         <commons.codec.version>1.16.0</commons.codec.version>
         <commons.io.version>2.14.0</commons.io.version>
         <commons.lang3.version>3.13.0</commons.lang3.version>
         <faaast.service.version>0.6.0-SNAPSHOT</faaast.service.version>
         <h2.version>2.2.224</h2.version>
-        <hibernate.version>6.3.1.Final</hibernate.version>
-        <jackson.version>2.15.3</jackson.version>
+        <hibernate.version>6.4.0.Final</hibernate.version>
+        <jackson.version>2.16.0</jackson.version>
         <junit.version>4.13.2</junit.version>
-        <logback.version>1.4.11</logback.version>
+        <logback.version>1.4.14</logback.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.plugin.assembly.version>3.6.0</maven.plugin.assembly.version>
-        <maven.plugin.checkstyle.version>3.3.0</maven.plugin.checkstyle.version>
+        <maven.plugin.checkstyle.version>3.3.1</maven.plugin.checkstyle.version>
         <maven.plugin.compiler.version>3.11.0</maven.plugin.compiler.version>
-        <maven.plugin.dependency.version>3.6.0</maven.plugin.dependency.version>
-        <maven.plugin.failsafe.version>3.1.2</maven.plugin.failsafe.version>
+        <maven.plugin.dependency.version>3.6.1</maven.plugin.dependency.version>
+        <maven.plugin.failsafe.version>3.2.2</maven.plugin.failsafe.version>
         <maven.plugin.gpg.version>3.1.0</maven.plugin.gpg.version>
         <maven.plugin.jacoco.version>0.8.10</maven.plugin.jacoco.version>
         <maven.plugin.jar.version>3.3.0</maven.plugin.jar.version>
-        <maven.plugin.javadoc.version>3.6.0</maven.plugin.javadoc.version>
+        <maven.plugin.javadoc.version>3.6.3</maven.plugin.javadoc.version>
         <maven.plugin.license.version>2.0.0</maven.plugin.license.version>
         <maven.plugin.nexus-staging.version>1.6.13</maven.plugin.nexus-staging.version>
-        <maven.plugin.owasp.version>8.1.2</maven.plugin.owasp.version>
+        <maven.plugin.owasp.version>8.4.3</maven.plugin.owasp.version>
         <maven.plugin.picocli.version>4.7.5</maven.plugin.picocli.version>
         <maven.plugin.release.version>2.5.3</maven.plugin.release.version>
         <maven.plugin.shade.version>3.5.1</maven.plugin.shade.version>
         <maven.plugin.source.version>3.3.0</maven.plugin.source.version>
-        <maven.plugin.spotless.version>2.35.0</maven.plugin.spotless.version>
+        <maven.plugin.spotless.version>2.40.0</maven.plugin.spotless.version>
         <picocli.version>4.7.5</picocli.version>
-        <postgres.version>42.6.0</postgres.version>
+        <postgres.version>42.7.0</postgres.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <root.basedir>${project.basedir}</root.basedir>
         <slf4j.version>2.0.9</slf4j.version>
@@ -89,7 +89,7 @@
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.language>java</sonar.language>
         <sonar.organization>fraunhofer-iosb</sonar.organization>
-        <spring.boot.version>3.1.5</spring.boot.version>
+        <spring.boot.version>3.2.0</spring.boot.version>
     </properties>
     <dependencies>
         <dependency>