Merge branch 'release/2021.21.0'

.github/workflows/build.yml

@@ -6,10 +6,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup Java 8
+      - name: Setup Java 11
         uses: actions/setup-java@v1
         with:
-          java-version: '8'
+          java-version: '11'
 
       - name: Setup Cache for Java/Gradle
         uses: actions/cache@v2

.gitpod.Dockerfile

@@ -1,13 +1,13 @@
 FROM gitpod/workspace-postgres
 
 RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
-             && sdk install java 8.0.265-open"
+             && sdk install java 11.0.13-tem"
 
 # disable angular analytics
 ENV NG_CLI_ANALYTICS=false
 
 # Docker build does not rebuild an image when a base image is changed, increase this counter to trigger it.
-ENV TRIGGER_REBUILD 3
+ENV TRIGGER_REBUILD 4
 
 RUN npm install -g @angular/cli 
 

.gradle-wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

cnf/build.bnd

@@ -95,5 +95,5 @@ testpath: \
 	Edge_Timedata;member=${filter;${p};io\.openems\.edge\.timedata\..*},\
 	Edge_TimeOfUseTariff;member=${filter;${p};io\.openems\.edge\.timeofusetariff\..*},\
 
-javac.source: 1.8
-javac.target: 1.8
+javac.source: 11
+javac.target: 11

cnf/pom.xml

@@ -108,6 +108,12 @@
 			<artifactId>v1_6</artifactId>
 			<version>1.0.1</version>
 		</dependency>
+		<!-- fr -->
+		<dependency>
+			<groupId>fr.turri</groupId>
+			<artifactId>aXMLRPC</artifactId>
+			<version>1.12.0</version>
+		</dependency>
 		<!-- info -->
 		<dependency>
 			<groupId>info.faljse</groupId>
@@ -125,7 +131,7 @@
 			<!-- Used by SDNotify -->
 			<groupId>net.java.dev.jna</groupId>
 			<artifactId>jna</artifactId>
-			<version>5.9.0</version>
+			<version>5.10.0</version>
 		</dependency>
 		<!-- org -->
 		<dependency>
@@ -193,16 +199,6 @@
 			<artifactId>org.apache.felix.webconsole.plugins.ds</artifactId>
 			<version>2.1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.xmlrpc-client</artifactId>
-			<version>3.1.3_1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.ws-commons-util</artifactId>
-			<version>1.0.2_2</version>
-		</dependency>
 		<dependency>
 			<groupId>org.dhatim</groupId>
 			<artifactId>fastexcel</artifactId>

doc/modules/ROOT/pages/single_document.adoc

@@ -1,7 +1,7 @@
 = OpenEMS - Open Energy Management System
 ifndef::toc[]
 (c) 2020 OpenEMS Association e.V.
-Version 2021.20.0
+Version 2021.21.0
 :sectnums:
 :sectnumlevels: 4
 :toc: