Merge remote-tracking branch 'onlineberatung/develop' into merge-with…

…-onlineberatung-08022025

# Conflicts:
#	.github/workflows/dockerImage.yml

.github/workflows/dockerImage.yml

@@ -6,7 +6,6 @@ on:
       - 'release'
       - 'staging'
       - 'develop'
-      - "tsys-release"
     tags:
       - "dockerImage.v.*"
       - "v*"
@@ -28,10 +27,9 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 17
           java-package: jdk
           architecture: x64
-
       - name: Caching maven dependencies
         uses: actions/cache@v4
         env:
@@ -183,6 +181,7 @@ jobs:
           custom-actions: |
             - text: View CI
               url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+
       - name: Publish to T-sys if T-sys release
         if: ${{ (github.ref == 'refs/heads/tsys-release') && (matrix.registry == 'ghcr.io') }}
         uses: fjogeleit/http-request-action@v1

.github/workflows/feature-branch.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup JVM
         uses: actions/setup-java@v1
         with:
-          java-version: 11.0.10
+          java-version: 17
           java-package: jdk
           architecture: x64
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk11
+FROM openjdk:17-oracle
 VOLUME ["/tmp","/log"]
 EXPOSE 8080
 ARG JAR_FILE

google_checks_light.xml

@@ -19,6 +19,7 @@
   <property name="severity" value="warning"/>
 
   <property name="fileExtensions" value="java, properties, xml"/>
+
   <!-- Excludes all 'module-info.java' files              -->
   <!-- See https://checkstyle.org/config_filefilters.html -->
   <module name="BeforeExecutionExclusionFileFilter">
@@ -47,6 +48,10 @@
   -->
 
   <module name="TreeWalker">
+    <module name="AbbreviationAsWordInName">
+      <property name="allowedAbbreviationLength" value="4"/>
+      <property name="ignoreFinal" value="true"/>
+    </module>
     <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -301,7 +306,7 @@
     </module>
     -->
     <module name="JavadocMethod">
-      <property name="scope" value="public"/>
+      <property name="accessModifiers" value="public"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
       <property name="allowedAnnotations" value="Override, Test"/>