Merge pull request #999 from juherr/feature/upgrade-ci

Upgrade CI

Author: goekay

.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-20.04, ubuntu-22.04 ]
+        java: [ '11', '17' ]
+        db: [ 'mysql:5.7', 'mysql:8.0', 'mariadb:10.3', 'mariadb:10.4', 'mariadb:10.5', 'mariadb:10.6' ]
     runs-on: ${{ matrix.os }}
     services:
       mysql:
@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
-          distribution: 'adopt'
+          distribution: 'temurin'
           cache: maven
 
       - name: Set up MySQL

README.md

@@ -31,9 +31,9 @@ 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.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.
+* 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.4.
 
 to build and run. 
 
@@ -48,7 +48,7 @@ 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:
+    * For MariaDB (all LTS versions) and MySQL 5.7:
         ```
         CREATE DATABASE stevedb CHARACTER SET utf8 COLLATE utf8_unicode_ci;
         CREATE USER 'steve'@'localhost' IDENTIFIED BY 'changeme';