Merge branch 'master' into 896-migrate-from-mysql-57-to-mysql-8

# Conflicts:
#	.github/workflows/main.yml
#	README.md
#	pom.xml

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:8.0', 'mariadb:10.3', 'mariadb:10.5' ]
+        os: [ ubuntu-20.04, ubuntu-22.04 ]
+        java: [ '11', '17' ]
+        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@v4
       - name: Set up Java ${{ matrix.Java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: maven
 
       - name: Set up MySQL
@@ -39,7 +39,7 @@ jobs:
           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,52 @@
+name: analyze and review code
+on: [ push, pull_request ]
+
+jobs:
+  license-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Set up Java 11
+        uses: actions/setup-java@v4
+        with:
+          java-version: 11
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Check with Maven
+        run: mvn -B -V license:check --file pom.xml
+  pmd:
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Run PMD
+        uses: pmd/pmd-github-action@v1
+        with:
+          version: 'latest'
+          sourcePath: './src/main/java'
+          rulesets: './src/main/resources/maven-pmd-plugin-default.xml'
+      - name: Fail build if there are violations
+        if: steps.pmd.outputs.violations != 0
+        run: exit 1
+  checkstyle:
+    runs-on: 'ubuntu-latest'
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Run Checkstyle
+        uses: nikitasavinov/checkstyle-action@master
+        with:
+          checkstyle_config: './src/main/resources/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:11-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" && \
+	./mvnw clean package -Pdocker -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2" && \
 	java -jar target/steve.jar
 

Dockerfile

@@ -1,5 +1,5 @@
-SteVe - SteckdosenVerwaltung - https://github.com/RWTH-i5-IDSG/steve
-Copyright (C) ${year}-${currentYear} ${owner}.
+${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

@@ -1,11 +1,11 @@
 ![SteVe](src/main/resources/webapp/static/images/logo.png) 
 
-[![build and run tests](https://github.com/RWTH-i5-IDSG/steve/actions/workflows/main.yml/badge.svg)](https://github.com/RWTH-i5-IDSG/steve/actions/workflows/main.yml)
+[![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)
 
 
 # Introduction
 
-SteVe started its life at the RWTH Aachen University in 2013. 
+SteVe started its life at the RWTH Aachen University [in 2013](https://github.com/steve-community/steve/issues/827). 
 The name is derived from _Steckdosenverwaltung_ in German (in English: socket administration). 
 The aim of SteVe is to support the deployment and popularity of electric mobility, so it is easy to install and to use. 
 It provides basic functions for the administration of charge points, user data, and RFID cards for user authentication and was tested successfully in operation.
@@ -26,14 +26,14 @@ Electric charge points using the following OCPP versions are supported:
 * OCPP1.6J
 
 For Charging Station compatibility please check:
-https://github.com/RWTH-i5-IDSG/steve/wiki/Charging-Station-Compatibility
+https://github.com/steve-community/steve/wiki/Charging-Station-Compatibility
 
 ### System Requirements
 
 SteVe requires 
-* JDK 11 (both Oracle JDK and OpenJDK are supported)
+* JDK 11 (both Oracle JDK and Adoptium are supported)
 * Maven 
-* MariaDB 10.3 or later. MySQL 8.0.x works as well.
+* MySQL or MariaDB. You should use [one of these](.github/workflows/main.yml#L11) supported versions.
 
 to build and run. 
 
@@ -63,7 +63,7 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
 
     You can download and extract the SteVe releases using the following commands (replace X.X.X with the desired version number):
     ```
-    wget https://github.com/RWTH-i5-IDSG/steve/archive/steve-X.X.X.tar.gz
+    wget https://github.com/steve-community/steve/archive/steve-X.X.X.tar.gz
     tar xzvf steve-X.X.X.tar.gz
     cd steve-X.X.X
     ```
@@ -76,14 +76,14 @@ SteVe is designed to run standalone, a java servlet container / web server (e.g.
       - 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)
      
-    For advanced configuration please see the [Configuration wiki](https://github.com/RWTH-i5-IDSG/steve/wiki/Configuration)
+    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`.
 
     ```
-    # mvn package
+    # ./mvnw package
     ```
 
 5. Run SteVe:
@@ -122,11 +122,11 @@ To access this publicaly, you'll also have to setup an ingress using something l
 
 # Ubuntu
 
-You'll find a tutorial how to prepare Ubuntu for SteVe here: https://github.com/RWTH-i5-IDSG/steve/wiki/Prepare-Ubuntu-VM-for-SteVe
+You'll find a tutorial how to prepare Ubuntu for SteVe here: https://github.com/steve-community/steve/wiki/Prepare-Ubuntu-VM-for-SteVe
 
 # AWS
 
-You'll find a tutorial how to setup SteVe in AWS using Lightsail here: https://github.com/RWTH-i5-IDSG/steve/wiki/Create-SteVe-Instance-in-AWS-Lightsail
+You'll find a tutorial how to setup SteVe in AWS using Lightsail here: https://github.com/steve-community/steve/wiki/Create-SteVe-Instance-in-AWS-Lightsail
 
 # First Steps
 
@@ -168,7 +168,7 @@ If you are in the EU and offer vehicle charging to other people using SteVe, kee
 
 Are you having issues?
 -----
-See the [FAQ](https://github.com/RWTH-i5-IDSG/steve/wiki/FAQ)
+See the [FAQ](https://github.com/steve-community/steve/wiki/FAQ)
 
 Acknowledgments
 -----

README.md

@@ -7,7 +7,12 @@ 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
     ports:
       - 3306:3306
     environment:

docker-compose.yml

@@ -1,4 +1,4 @@
-FROM maven:3.6.1-jdk-11
+FROM eclipse-temurin:11-jdk
 MAINTAINER daynnnnn
 
 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
@@ -21,7 +21,7 @@ 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 mvn clean package -Pkubernetes -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
+RUN ./mvnw clean package -Pkubernetes -Djdk.tls.client.protocols="TLSv1,TLSv1.1,TLSv1.2"
 
 CMD java -jar target/steve.jar
 

k8s/docker/Dockerfile

@@ -31,4 +31,8 @@ spec:
         - name: ADMIN_USERNAME
           value: ""
         - name: ADMIN_PASSWORD
-          value: ""
+          value: ""
+        - name: WEBAPI_KEY
+          value: "STEVE-API-KEY"
+        - name: WEBAPI_VALUE
+          value: ""