Merge branch 'master' into 367-chargingprofilepurpose-missing-parameter-for-txprofile

# Conflicts:
#	src/main/java/de/rwth/idsg/steve/ocpp/task/ClearChargingProfileTask.java
#	src/main/java/de/rwth/idsg/steve/ocpp/task/SetChargingProfileTask.java
#	src/main/java/de/rwth/idsg/steve/service/ChargePointService16_Client.java

Author: goekay

.github/dependabot.yml

@@ -11,3 +11,7 @@ updates:
       interval: "weekly"
       day: "saturday"
 
+  - package-ecosystem: "github-actions"
+    directory: "/" 
+    schedule:
+      interval: "weekly"

.github/workflows/main.yml

@@ -6,9 +6,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-18.04, ubuntu-20.04 ]
-        java: [ '11', '15' ]
-        db: [ 'mysql:5.7.35', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.5' ]
+        os: [ ubuntu-22.04, ubuntu-24.04 ]
+        java: [ '17', '21' ]
+        db: [ 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.4.30', 'mariadb:10.5.21', 'mariadb:10.6.14' ]
     runs-on: ${{ matrix.os }}
     services:
       mysql:
@@ -21,12 +21,12 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
       - name: Set up Java ${{ matrix.Java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: maven
 
       - name: Set up MySQL
@@ -35,11 +35,9 @@ jobs:
           mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE DATABASE stevedb_test_2aa6a783d47d;" -v
           mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "CREATE USER 'steve'@'%' IDENTIFIED BY 'changeme';" -v
           mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT ALL PRIVILEGES ON stevedb_test_2aa6a783d47d.* TO 'steve'@'%';" -v
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SELECT ON mysql.proc TO 'steve'@'%';" -v || true
-          mysql -h 127.0.0.1 -P 3306 -uroot -proot -e "GRANT SUPER ON *.* TO 'steve'@'%';" -v || true
 
       - name: Build with Maven
-        run: mvn -B -V -Dmaven.javadoc.skip=true -Ptest clean package --file pom.xml
+        run: ./mvnw -B -V -Dmaven.javadoc.skip=true -Ptest clean package --file pom.xml
 
       - name: Start the app and visit signin web page
         run: |

.github/workflows/review.yml

@@ -0,0 +1,35 @@
+name: analyze and review code
+on: [ push, pull_request ]
+
+jobs:
+  license-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up Java 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Check with Maven
+        run: mvn -B -V license:check --file pom.xml
+  checkstyle:
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Run Checkstyle
+        uses: nikitasavinov/checkstyle-action@master
+        with:
+          checkstyle_config: './checkstyle.xml'
+          workdir: './src/main/java'
+          reporter: 'github-pr-check'
+          tool_name: 'checkstyle'

.mvn/wrapper/maven-wrapper.jar

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

.mvn/wrapper/maven-wrapper.properties

@@ -1,16 +1,13 @@
-FROM maven:3.6.1-jdk-11
+FROM eclipse-temurin:17-jdk
 
 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
 
 MAINTAINER Ling Li
 
 # Download and install dockerize.
 # Needed so the web container will wait for MariaDB to start.
-ENV DOCKERIZE_VERSION v0.6.1
-RUN wget --no-verbose https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
-    && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
-
+ENV DOCKERIZE_VERSION v0.19.0
+RUN curl -sfL https://github.com/powerman/dockerize/releases/download/"$DOCKERIZE_VERSION"/dockerize-`uname -s`-`uname -m` | install /dev/stdin /usr/local/bin/dockerize
 
 EXPOSE 8180
 EXPOSE 8443
@@ -24,6 +21,6 @@ COPY . /code
 # Wait for the db to startup(via dockerize), then 
 # Build and run steve, requires a db to be available on port 3306
 CMD dockerize -wait tcp://mariadb:3306 -timeout 60s && \
-	mvn clean package -Pdocker -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" && \
-	java -jar target/steve.jar
+	./mvnw clean package -Pdocker -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" && \
+	java -XX:MaxRAMPercentage=85 -jar target/steve.jar
 

Dockerfile

@@ -1,5 +1,5 @@
-SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
-Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+${project.name} - ${project.description} - ${project.organization.url}
+Copyright (C) ${license.git.copyrightYears} ${owner}
 All Rights Reserved.
 
 This program is free software: you can redistribute it and/or modify

LICENSE-HEADER.txt

@@ -14,6 +14,10 @@ SteVe is considered as an open platform to implement, test and evaluate novel id
 The project is distributed under [GPL](LICENSE.txt) and is free to use. 
 If you are going to deploy it we are happy to see the [logo](website/logo/managed-by-steve.pdf) on a charge point.
 
+## Relation to Powerfill
+
+[Powerfill](https://powerfill.co/) is a SaaS company to expand beyond the basics of SteVe: While SteVe covers the basics of OCPP functionality in a DIY sense, Powerfill offers more and enterprise features with ease of use. [See the announcement](https://github.com/steve-community/steve/issues/1643) and [sign up for early access](https://powerfill.co/early-access/).
+
 ### Charge Point Support
 
 Electric charge points using the following OCPP versions are supported:
@@ -25,15 +29,18 @@ Electric charge points using the following OCPP versions are supported:
 * OCPP1.6S
 * OCPP1.6J
 
+⚠️ Currently, Steve doesn't support [the OCPP-1.6 security whitepaper](https://openchargealliance.org/wp-content/uploads/2023/11/OCPP-1.6-security-whitepaper-edition-3-2.zip) yet (see [#100](https://github.com/steve-community/steve/issues/100)) and anyone can send events to a public steve instance once the chargebox id is known.
+Please, don't expose a Steve instance without knowing that risk.
+
 For Charging Station compatibility please check:
 https://github.com/steve-community/steve/wiki/Charging-Station-Compatibility
 
 ### System Requirements
 
 SteVe requires 
-* JDK 11 (both Oracle JDK and OpenJDK are supported)
+* JDK 17 or newer
 * Maven 
-* MariaDB 10.2.1 or later. MySQL 5.7.7 or later works as well, but especially MySQL 8 introduces more hassle. We suggest MariaDB 10.3.
+* MySQL or MariaDB. You should use [one of these](.github/workflows/main.yml#L11) supported versions.
 
 to build and run. 
 
@@ -47,26 +54,12 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
 
     Make sure MySQL is reachable via TCP (e.g., remove `skip-networking` from `my.cnf`).
     The following MySQL statements can be used as database initialization (adjust database name and credentials according to your setup).
-    
-    * For MariaDB (all versions) and MySQL 5.7:
-        ```
-        CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-        CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';
-        GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost';
-        GRANT SELECT ON mysql.proc TO 'steve'@'localhost';
-        ```
-    
-    * For MySQL 8:
-        ```
-        CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-        CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';
-        GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost';
-        GRANT SUPER ON *.* TO 'steve'@'localhost';
-        ```
-        Note: The statement `GRANT SUPER [...]` is only necessary to execute some of the previous migration files and is only needed for the initial database setup. Afterwards, you can remove this privilege by executing 
-        ```
-        REVOKE SUPER ON *.* FROM 'steve'@'localhost';
-        ```
+
+    ```
+    CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';
+    GRANT ALL PRIVILEGES ON stevedb.* TO 'steve'@'localhost';
+    ```
         
 2. Download and extract tarball:
 
@@ -92,7 +85,7 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
     To compile SteVe simply use Maven. A runnable `jar` file containing the application and configuration will be created in the subdirectory `steve/target`.
 
     ```
-    # mvn package
+    # ./mvnw package
     ```
 
 5. Run SteVe:
@@ -105,13 +98,13 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
 
 # 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`
+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.
+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.
-The database password for the user "steve" has to be the same as you have configured it in the docker-compose file.
+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`
+With the default docker compose configuration, the web interface will be accessible at: `http://localhost:8180`
 
 # Kubernetes
 
@@ -143,7 +136,6 @@ After SteVe has successfully started, you can access the web interface using the
 
     http://<your-server-ip>:<port>/steve/manager
     
-The default port number is 8080.
 
 ### Add a charge point
 

README.md

@@ -34,6 +34,12 @@
         <property name="message" value="Line has trailing spaces."/>
     </module>
 
+    <!-- Checks for Size Violations.                    -->
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
+
     <module name="TreeWalker">
 
         <!-- <property name="cacheFile" value="${checkstyle.cache.file}"/> -->
@@ -88,9 +94,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber"/>
 
@@ -125,7 +128,7 @@
 
         <!-- Checks for common coding problems               -->
         <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <module name="AvoidInlineConditionals"/>
+        <!-- <module name="AvoidInlineConditionals"/> -->
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <!-- <module name="HiddenField"/> -->

src/main/resources/checkstyle.xml renamed to checkstyle.xml

@@ -7,16 +7,22 @@ volumes:
 services:
 
   db:
-    image: mariadb:10.4
+    # Pinning MariaDB to point release 10.4.30 works around the issues with the
+    # database migrations seen with 10.4.31 in issue #1212.
+    #
+    # TODO: Get database migrations to work with the latest point releases of
+    # MariaDB 10.4.
+    image: mariadb:10.4.30
+    restart: unless-stopped
     ports:
       - 3306:3306
     environment:
       MYSQL_RANDOM_ROOT_PASSWORD: "yes"
       MYSQL_DATABASE: stevedb
       MYSQL_USER: steve
       MYSQL_PASSWORD: changeme
-
   app:
+    restart: unless-stopped
     build: .
     links:
       - "db:mariadb"
@@ -27,3 +33,4 @@ services:
       - "8443:8443"
     depends_on:
       - db
+