Merge branch 'master' into develop

# Conflicts:
#	hello/src/main/java/com/ak/app/MainApp.java

Author: ak-git

.github/workflows/actions.yml

@@ -14,40 +14,44 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: oracle
-          java-version: 23
+          java-version: 25
           cache: 'gradle'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@73536630a5c2294ff55c4e352d46981d96c301d9
         with:
-          gradle-version: '8.12.1'
+          gradle-version: '9.4.0'
       - name: Cache SonarCloud packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
+          key: ${{ runner.os }}-sonar-${{ hashFiles('**/build.gradle') }}
+          restore-keys: ${{ runner.os }}-sonar-
       - name: Cache Gradle packages
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: ${{ runner.os }}-gradle-
       - name: Build and analyze
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: gradle build jacocoAggregatedReport sonar --info
+        run: gradle build jacocoTestReport sonar --info
       - name: Compute version
         run: |
           gradle version
           echo "BUILD_VERSION=$(gradle version | grep Version | awk '{ print $2 }')" >> $GITHUB_ENV
       - name: Login to Docker Hub
-        run: docker login -u $DOCKER_USER -p ${{ secrets.DOCKER_PASSWORD }}
+        env:
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
       - name: Build and tag the Docker image
         run: docker build -t $DOCKER_USER/$DOCKER_IMAGE:${{ env.BUILD_VERSION }} -t $DOCKER_USER/$DOCKER_IMAGE:latest .
       - name: Push the Docker image

.gitignore

@@ -35,3 +35,8 @@ profile
 
 # TLS Certificates
 .certs/
+
+# Logs
+*.log
+log*.gz
+log*.tmp

.idea/compiler.xml

@@ -1,19 +1,22 @@
-FROM openjdk:23
+FROM openjdk:25-jdk-slim@sha256:4d9bb48a3d5c2015a5e67eeab7575b6b11eda252aee651e632ef57d24aaf2d82
 
 # Create a custom user with UID 1234 and GID 1234
 # https://www.docker.com/blog/understanding-the-docker-user-instruction/
-RUN groupadd -g 1234 customgroup && \
-    useradd -m -u 1234 -g customgroup customuser
+RUN groupadd -g 1234 runner-group && \
+    useradd -m -u 1234 -g runner-group runner
 
-# Switch to the custom user
-USER customuser
+# Set the directory for executing future commands
+WORKDIR /home/runner
 
-# Copy the app files from host machine to image filesystem
-COPY --link hello/build/libs/hello-all.jar /home/customuser/hello-all.jar
+# Extract from .tar and copy the app files from host machine to image filesystem
+ADD hello/build/distributions/hello-*.tar .
+RUN mv hello-* app && chown -R runner:runner-group app && mkdir data && chown -R runner:runner-group data
 
-# Set the directory for executing future commands
-WORKDIR /home/customuser
+# Switch to the custom user
+USER runner
 
 # Run the Main class
 # https://docs.docker.com/reference/build-checks/json-args-recommended/
-ENTRYPOINT ["java", "-jar", "/home/customuser/hello-all.jar"]
+ENTRYPOINT ["/home/runner/app/bin/hello"]
+
+EXPOSE 8080/tcp

.idea/misc.xml

@@ -21,7 +21,7 @@
 ### Update version and add git tag
 
 ```shell
-git tag 2025.01
+git tag 2026.01
 ```
 
 ## Update dependencies

.idea/runConfigurations/SimpleApp__sonarqube_.xml

@@ -6,7 +6,6 @@ plugins {
     id 'jacoco'
     alias(libs.plugins.spotbugs)
     alias(libs.plugins.ben.manes.versions)
-    alias(libs.plugins.nebula.lint)
     alias(libs.plugins.sonarqube)
     alias(libs.plugins.jacocolog)
     alias(libs.plugins.jgitver)
@@ -52,7 +51,7 @@ allprojects {
     }
 
     jacoco {
-        toolVersion = '0.8.12'
+        toolVersion = '0.8.14'
     }
 
     jacocoTestReport {
@@ -73,7 +72,7 @@ subprojects {
 
     java {
         toolchain {
-            languageVersion = JavaLanguageVersion.of(23)
+            languageVersion = JavaLanguageVersion.of(25)
         }
     }
 

Dockerfile

@@ -1,4 +1,9 @@
 services:
   simple-app:
     container_name: simple-app
-    image: a002k/simple-app:latest
+    image: a002k/simple-app:latest
+    volumes:
+      - simple-app:/home/runner/data
+
+volumes:
+  simple-app:

README.md

@@ -1,6 +1,7 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.caching=true
-org.gradle.parallel=true
+org.gradle.parallel=false
+org.gradle.configuration-cache=false
 dependency.analysis.print.build.health=true
 sonar.projectKey=ak-git_SimpleApp
 sonar.organization=ak-git