Merge branch 'steve-master' into MailUserAtTransactionStop

# Conflicts:
#	src/main/java/de/rwth/idsg/steve/repository/dto/User.java
#	src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java
#	src/main/java/de/rwth/idsg/steve/service/MailService.java
#	src/main/java/de/rwth/idsg/steve/service/MailServiceDefault.java
#	src/main/java/de/rwth/idsg/steve/service/NotificationService.java
#	src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java
#	src/main/java/de/rwth/idsg/steve/web/controller/UsersController.java

Author: goekay

.github/workflows/main.yml

@@ -6,8 +6,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-22.04 ]
-        java: [ '17', '21' ]
+        os: [ ubuntu-latest ]
+        java: [ '21', '23' ]
         db: [ 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.4.30', 'mariadb:10.5.21', 'mariadb:10.6.14' ]
     runs-on: ${{ matrix.os }}
     services:
@@ -21,9 +21,9 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Java ${{ matrix.Java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
@@ -42,7 +42,7 @@ jobs:
       - name: Start the app and visit signin web page
         run: |
           sudo apt-get install -y elinks
-          java -Djava.net.preferIPv4Stack=true -jar target/steve.jar &
+          java -Djava.net.preferIPv4Stack=true -jar target/steve.war &
           sleep 30
           elinks -dump -no-references http://localhost:8080/steve/manager/signin
           killall java

.github/workflows/review.yml

@@ -5,14 +5,14 @@ jobs:
   license-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
-      - name: Set up Java 17
-        uses: actions/setup-java@v4
+      - name: Set up Java
+        uses: actions/setup-java@v5
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           cache: maven
 
@@ -21,8 +21,8 @@ jobs:
   checkstyle:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk
+FROM eclipse-temurin:21-jdk
 
 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
 
@@ -22,5 +22,5 @@ COPY . /code
 # Build and run steve, requires a db to be available on port 3306
 CMD dockerize -wait tcp://mariadb:3306 -timeout 60s && \
 	./mvnw clean package -Pdocker -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" && \
-	java -XX:MaxRAMPercentage=85 -jar target/steve.jar
+	java -XX:MaxRAMPercentage=85 -jar target/steve.war
 

README.md

@@ -1,4 +1,4 @@
-![SteVe](src/main/resources/webapp/static/images/logo.png) 
+![SteVe](src/main/webapp/static/images/logo.png) 
 
 [![build and run tests](https://github.com/steve-community/steve/actions/workflows/main.yml/badge.svg)](https://github.com/steve-community/steve/actions/workflows/main.yml)
 
@@ -38,7 +38,7 @@ https://github.com/steve-community/steve/wiki/Charging-Station-Compatibility
 ### System Requirements
 
 SteVe requires 
-* JDK 17 or newer
+* JDK 21 or newer
 * Maven 
 * MySQL or MariaDB. You should use [one of these](.github/workflows/main.yml#L11) supported versions.
 
@@ -72,17 +72,17 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
 
 3. Configure SteVe **before** building:
 
-    The basic configuration is defined in [main.properties](src/main/resources/config/prod/main.properties):
-      - You _must_ change [database configuration](src/main/resources/config/prod/main.properties#L9-L13)
-      - You _must_ change [the host](src/main/resources/config/prod/main.properties#L22) to the correct IP address of your server
-      - You _must_ change [web interface credentials](src/main/resources/config/prod/main.properties#L17-L18)
-      - You _can_ access the application via HTTPS, by [enabling it and setting the keystore properties](src/main/resources/config/prod/main.properties#L32-L35)
+    The basic configuration is defined in [application-prod.properties](src/main/resources/application-prod.properties):
+      - You _must_ change [database configuration](src/main/resources/application-prod.properties)
+      - You _must_ change [the host](src/main/resources/application-prod.properties) to the correct IP address of your server
+      - You _must_ change [web interface credentials](src/main/resources/application-prod.properties)
+      - You _can_ access the application via HTTPS, by [enabling it and setting the keystore properties](src/main/resources/application-prod.properties)
      
     For advanced configuration please see the [Configuration wiki](https://github.com/steve-community/steve/wiki/Configuration)
 
 4. Build SteVe:
 
-    To compile SteVe simply use Maven. A runnable `jar` file containing the application and configuration will be created in the subdirectory `steve/target`.
+    To compile SteVe simply use Maven. A runnable `war` file containing the application and configuration will be created in the subdirectory `steve/target`.
 
     ```
     # ./mvnw package
@@ -93,15 +93,15 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
     To start the application run (please do not run SteVe as root):
 
     ```
-    # java -jar target/steve.jar
+    # java -jar target/steve.war
     ```
 
 # Docker
 
 If you prefer to build and start this project via docker (you can skip the steps 1, 4 and 5 from above), this can be done as follows: `docker compose up -d`
 
 Because the docker compose file is written to build the project for you, you still have to change the project configuration settings from step 3.
-Instead of changing the [main.properties in the prod directory](src/main/resources/config/prod/main.properties), you have to change the [main.properties in the docker directory](src/main/resources/config/docker/main.properties). There you have to change all configurations which are described in step 3.
+Instead of changing the [application-prod.properties](src/main/resources/application-prod.properties), you have to change the [application-docker.properties](src/main/resources/application-docker.properties). There you have to change all configurations which are described in step 3.
 The database password for the user "steve" has to be the same as you have configured it in the docker compose file.
 
 With the default docker compose configuration, the web interface will be accessible at: `http://localhost:8180`

k8s/docker/Dockerfile

@@ -1,27 +1,52 @@
-FROM eclipse-temurin:17-jdk
+FROM eclipse-temurin:21-jdk AS base
 MAINTAINER daynnnnn
 
+# Setting environment variables
 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
 
+# Arguments for database configuration
 ARG DB_HOST
 ARG DB_USERNAME
 ARG DB_PASSWORD
 ARG DB_DATABASE
 ARG DB_PORT
 
+# Build Stage
+FROM base as build
+
+# Set the working directory for the build stage
 WORKDIR /code
 
+# Copy project files to the build stage
 ADD /src /code/src
 ADD /website /code/website
 ADD /pom.xml /code/pom.xml
+ADD mvnw /code/mvnw
+ADD .mvn /code/.mvn
 
+# Replace placeholders in pom.xml with actual environment values
 RUN sed -i 's|${db.ip}|${env.DB_HOST}|g' pom.xml
 RUN sed -i 's|${db.port}|${env.DB_PORT}|g' pom.xml
 RUN sed -i 's|${db.user}|${env.DB_USERNAME}|g' pom.xml
 RUN sed -i 's|${db.password}|${env.DB_PASSWORD}|g' pom.xml
 RUN sed -i 's|${db.schema}|${env.DB_DATABASE}|g' pom.xml
+RUN sed -i 's|${server.host}|${env.SERVER_HOST}|g' pom.xml
+
+# Make the Maven wrapper executable
+RUN chmod +x mvnw
 
+# Build the project
 RUN ./mvnw clean package -Pkubernetes -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
 
-CMD java -jar target/steve.jar
+# Release Stage
+FROM base AS release
+
+# Copy relevant files from the build stage
+COPY --from=build /code/target/steve.jar /app/steve.war
+COPY --from=build /code/target/libs /app/libs
+
+# Expose any necessary ports (example: 8080)
+EXPOSE 8080
 
+# Define the entrypoint for the release stage
+CMD ["java", "-jar", "/app/steve.war"]

k8s/yaml/Deployment.yaml

@@ -28,6 +28,8 @@ spec:
           value: ""
         - name: DB_DATABASE
           value: ""
+        - name: SERVER_HOST
+          value: "0.0.0.0"
         - name: ADMIN_USERNAME
           value: ""
         - name: ADMIN_PASSWORD