Merge branch 'release/2020.9.0'

OpenEMS · Apr 23, 2020 · b9136f0 · b9136f0
2 parents 92862c1 + 60459e7
commit b9136f0
Show file tree

Hide file tree

Showing 139 changed files with 13,523 additions and 8,324 deletions.
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -13,13 +13,6 @@
 		revision=org.osgi.enroute:enterprise-api:7.0.0; \
 		readOnly=true; \
 		name="Enterprise Java APIs"
--plugin.3.R7.Impl: \
-	aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
-		snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \
-		releaseUrls=https://repo.maven.apache.org/maven2/; \
-		revision=org.osgi.enroute:impl-index:7.0.0; \
-		readOnly=true; \
-		name="OSGi R7 Reference Implementations"
 -plugin.4.Test: \
 	aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
 		snapshotUrls=https://oss.sonatype.org/content/repositories/osgi/; \

diff --git a/cnf/checkstyle.xml b/cnf/checkstyle.xml
@@ -13,7 +13,9 @@
   <property name="charset" value="UTF-8"/>
   <property name="fileExtensions" value="java, properties, xml"/>
   <module name="TreeWalker">
-    <module name="RequireThis"/>
+    <module name="RequireThis">
+      <property name="validateOnlyOverlapping" value="false"/>
+    </module>
     <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">
       <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -34,25 +34,27 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>28.2-jre</version>
+			<version>29.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>failureaccess</artifactId>
 			<version>1.0.1</version>
 		</dependency>
 		<dependency>
+			<!-- Used by org.influxdb: influxdb-java -->
 			<groupId>com.squareup.moshi</groupId>
 			<artifactId>moshi</artifactId>
 			<version>1.9.2</version>
 		</dependency>
 		<dependency>
+			<!-- Used by org.influxdb: influxdb-java -->
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>logging-interceptor</artifactId>
 			<version>3.14.7</version>
 		</dependency>
 		<dependency>
-			<!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp -->
+			<!-- Used by org.influxdb: influxdb-java -->
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 			<version>3.14.6</version>
@@ -70,15 +72,23 @@
 			<version>2.8.1</version>
 		</dependency>
 		<dependency>
+			<!-- Used by org.influxdb: influxdb-java -->
 			<groupId>com.squareup.retrofit2</groupId>
 			<artifactId>retrofit</artifactId>
 			<version>2.8.1</version>
 		</dependency>
 		<dependency>
+			<!-- HikariCP A solid, high-performance, JDBC connection pool at last. -->
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
 			<version>3.4.2</version>
 		</dependency>
+		<!-- commons -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.4</version>
+		</dependency>
 		<!-- info -->
 		<dependency>
 			<groupId>info.faljse</groupId>
@@ -104,6 +114,45 @@
 			<artifactId>commons-math3</artifactId>
 			<version>3.6.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.configadmin</artifactId>
+			<version>1.9.16</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.eventadmin</artifactId>
+			<version>1.5.0</version>
+		</dependency>
+		<dependency>
+			<!-- Apache Felix HTTP Service -->
+			<!-- Changelog: https://github.com/apache/felix-dev/commits/master/http -->
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.http.jetty</artifactId>
+			<version>4.0.18</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.metatype</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+		<dependency>
+			<!-- Apache Felix Service Component Runtime (SCR) -->
+			<!-- Changelog: https://github.com/apache/felix-dev/blob/master/scr/changelog.txt -->
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.scr</artifactId>
+			<version>2.1.20</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.webconsole</artifactId>
+			<version>4.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<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>
@@ -117,10 +166,14 @@
 		<dependency>
 			<groupId>org.dhatim</groupId>
 			<artifactId>fastexcel</artifactId>
-			<version>0.10.13</version>
+			<version>0.10.14</version>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.platform</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<version>3.15.200</version>
 		</dependency>
 		<dependency>
-			<!-- https://mvnrepository.com/artifact/org.influxdb/influxdb-java -->
 			<groupId>org.influxdb</groupId>
 			<artifactId>influxdb-java</artifactId>
 			<version>2.17</version>
@@ -143,12 +196,27 @@
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-api</artifactId>
-			<version>1.11.2</version>
+			<version>2.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
-			<artifactId>pax-logging-service</artifactId>
-			<version>1.11.2</version>
+			<artifactId>pax-logging-log4j1</artifactId>
+			<version>2.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.service.jdbc</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.util.function</artifactId>
+			<version>1.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.osgi</groupId>
+			<artifactId>org.osgi.util.promise</artifactId>
+			<version>1.1.1</version>
 		</dependency>
 		<dependency>
 			<!-- Used by io.openems.backend.metadata.odoo -->

diff --git a/doc/modules/ROOT/pages/single_document.adoc b/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 2020.8.0
+Version 2020.9.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -13,11 +13,11 @@
 
 -runrequires: \
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-api',\
-	bnd.identity;id='org.ops4j.pax.logging.pax-logging-service',\
+	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j1',\
 	bnd.identity;id='org.osgi.service.jdbc',\
 	bnd.identity;id='org.apache.felix.http.jetty',\
 	bnd.identity;id='org.apache.felix.webconsole',\
-	bnd.identity;id='org.eclipse.equinox.metatype',\
+	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\
 	bnd.identity;id='io.openems.backend.application',\
 	bnd.identity;id='io.openems.backend.b2brest',\
 	bnd.identity;id='io.openems.backend.b2bwebsocket',\
@@ -34,9 +34,9 @@
 -runbundles: \
 	Java-WebSocket;version='[1.4.1,1.4.2)',\
 	com.google.gson;version='[2.8.5,2.8.6)',\
-	com.google.guava;version='[28.2.0,28.2.1)',\
+	com.google.guava;version='[29.0.0,29.0.1)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
-	com.zaxxer.HikariCP;version='[2.4.7,2.4.8)',\
+	com.zaxxer.HikariCP;version='[3.4.2,3.4.3)',\
 	io.openems.backend.application;version='[1.0.0,1.0.1)',\
 	io.openems.backend.b2brest;version='[1.0.0,1.0.1)',\
 	io.openems.backend.b2bwebsocket;version='[1.0.0,1.0.1)',\
@@ -55,22 +55,25 @@
 	io.openems.backend.uiwebsocket.impl;version='[1.0.0,1.0.1)',\
 	io.openems.common;version='[1.0.0,1.0.1)',\
 	io.openems.shared.influxdb;version='[1.0.0,1.0.1)',\
-	io.openems.wrapper.fastexcel;version='[0.10.13,0.10.14)',\
+	io.openems.wrapper.fastexcel;version='[0.10.14,0.10.15)',\
 	io.openems.wrapper.influxdb-java;version='[2.17.0,2.17.1)',\
 	io.openems.wrapper.opczip;version='[1.0.2,1.0.3)',\
-	org.apache.commons.fileupload;version='[1.3.3,1.3.4)',\
+	org.apache.commons.commons-fileupload;version='[1.4.0,1.4.1)',\
 	org.apache.commons.io;version='[2.6.0,2.6.1)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-	org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
+	org.apache.felix.configadmin;version='[1.9.16,1.9.17)',\
+	org.apache.felix.http.jetty;version='[4.0.18,4.0.19)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.felix.webconsole;version='[4.3.4,4.3.5)',\
+	org.apache.felix.inventory;version='[1.0.4,1.0.5)',\
+	org.apache.felix.metatype;version='[1.2.2,1.2.3)',\
+	org.apache.felix.scr;version='[2.1.20,2.1.21)',\
+	org.apache.felix.webconsole;version='[4.4.0,4.4.1)',\
+	org.apache.felix.webconsole.plugins.ds;version='[2.1.0,2.1.1)',\
 	org.apache.servicemix.bundles.ws-commons-util;version='[1.0.2,1.0.3)',\
 	org.apache.servicemix.bundles.xmlrpc-client;version='[3.1.3,3.1.4)',\
-	org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[1.11.2,1.11.3)',\
-	org.ops4j.pax.logging.pax-logging-service;version='[1.11.2,1.11.3)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.2,2.0.3)',\
+	org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.2,2.0.3)',\
 	org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\
-	org.osgi.service.metatype;version='[1.4.0,1.4.1)',\
+	org.osgi.util.function;version='[1.1.0,1.1.1)',\
+	org.osgi.util.promise;version='[1.1.1,1.1.2)',\
 	org.postgresql.jdbc42;version='[42.2.12,42.2.13)'
diff --git a/io.openems.common/src/io/openems/common/OpenemsConstants.java b/io.openems.common/src/io/openems/common/OpenemsConstants.java
@@ -20,7 +20,7 @@ public class OpenemsConstants {
 	 * 
 	 * This is usually the number of the sprint within the year
 	 */
-	public final static short VERSION_MINOR = 8;
+	public final static short VERSION_MINOR = 9;
 
 	/**
 	 * The patch version of OpenEMS.

diff --git a/io.openems.common/src/io/openems/common/channel/Level.java b/io.openems.common/src/io/openems/common/channel/Level.java
@@ -52,6 +52,16 @@ public OptionsEnum getUndefined() {
 		return OK;
 	}
 
+	/**
+	 * Is this Level at least as high as the other Level.
+	 * 
+	 * @param level the other level
+	 * @return true if it as at least as high
+	 */
+	public boolean isAtLeast(Level level) {
+		return this.value >= level.value;
+	}
+
 	/**
 	 * Gets the Level from an integer value.
 	 * 

diff --git a/io.openems.common/src/io/openems/common/types/EdgeConfig.java b/io.openems.common/src/io/openems/common/types/EdgeConfig.java
@@ -543,7 +543,9 @@ public static Property from(AttributeDefinition ad, boolean isRequired) {
 
 			private static JsonObject getSchema(AttributeDefinition ad) {
 				JsonObject schema = new JsonObject();
-				if (ad.getOptionLabels() != null && ad.getOptionValues() != null) {
+				if (//
+				(ad.getOptionLabels() != null && ad.getOptionLabels().length > 0) //
+						&& ad.getOptionValues() != null && ad.getOptionValues().length > 0) {
 					// use given options for schema
 					JsonArray options = new JsonArray();
 					for (int i = 0; i < ad.getOptionLabels().length; i++) {

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -10,18 +10,21 @@
 	openems.data.dir=c:/openems/data,\
 	org.ops4j.pax.logging.DefaultServiceLog.level=INFO
 
--runbundles+: \
-    org.ops4j.pax.logging.pax-logging-api;startlevel=10
-
 -runsystempackages:\
 	sun.misc,\
 	com.sun.net.httpserver
 
+-runbundles+: \
+	org.apache.felix.scr;startlevel=10,\
+	org.eclipse.equinox.event;startlevel=11,\
+    org.ops4j.pax.logging.pax-logging-log4j1;startlevel=12
+
 -runrequires: \
 	bnd.identity;id='org.ops4j.pax.logging.pax-logging-api',\
-	bnd.identity;id='org.ops4j.pax.logging.pax-logging-service',\
+	bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j1',\
 	bnd.identity;id='org.apache.felix.http.jetty',\
 	bnd.identity;id='org.apache.felix.webconsole',\
+	bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\
 	bnd.identity;id='io.openems.edge.application',\
 	bnd.identity;id='io.openems.edge.battery.soltaro',\
 	bnd.identity;id='io.openems.edge.bridge.mbus',\
@@ -76,6 +79,7 @@
 	bnd.identity;id='io.openems.edge.ess.kaco.blueplanet.gridsave50',\
 	bnd.identity;id='io.openems.edge.ess.mr.gridcon',\
 	bnd.identity;id='io.openems.edge.ess.refu',\
+	bnd.identity;id='io.openems.edge.ess.refu88k',\
 	bnd.identity;id='io.openems.edge.ess.sinexcel',\
 	bnd.identity;id='io.openems.edge.ess.sma',\
 	bnd.identity;id='io.openems.edge.ess.streetscooter',\
@@ -122,7 +126,7 @@
 	com.fazecast.jSerialComm;version='[2.5.1,2.5.2)',\
 	com.ghgande.j2mod;version='[2.5.5,2.5.6)',\
 	com.google.gson;version='[2.8.5,2.8.6)',\
-	com.google.guava;version='[28.2.0,28.2.1)',\
+	com.google.guava;version='[29.0.0,29.0.1)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.sun.jna;version='[5.5.0,5.5.1)',\
 	io.openems.common;version='[1.0.0,1.0.1)',\
@@ -183,6 +187,7 @@
 	io.openems.edge.ess.kaco.blueplanet.gridsave50;version='[1.0.0,1.0.1)',\
 	io.openems.edge.ess.mr.gridcon;version='[1.0.0,1.0.1)',\
 	io.openems.edge.ess.refu;version='[1.0.0,1.0.1)',\
+	io.openems.edge.ess.refu88k;version='[1.0.0,1.0.1)',\
 	io.openems.edge.ess.sinexcel;version='[1.0.0,1.0.1)',\
 	io.openems.edge.ess.sma;version='[1.0.0,1.0.1)',\
 	io.openems.edge.ess.streetscooter;version='[1.0.0,1.0.1)',\
@@ -231,25 +236,27 @@
 	io.openems.edge.timedata.influxdb;version='[1.0.0,1.0.1)',\
 	io.openems.edge.timedata.rrd4j;version='[1.0.0,1.0.1)',\
 	io.openems.shared.influxdb;version='[1.0.0,1.0.1)',\
-	io.openems.wrapper.fastexcel;version='[0.10.13,0.10.14)',\
+	io.openems.wrapper.fastexcel;version='[0.10.14,0.10.15)',\
 	io.openems.wrapper.influxdb-java;version='[2.17.0,2.17.1)',\
 	io.openems.wrapper.opczip;version='[1.0.2,1.0.3)',\
 	io.openems.wrapper.sdnotify;version='[1.3.0,1.3.1)',\
-	org.apache.commons.fileupload;version='[1.3.3,1.3.4)',\
+	org.apache.commons.commons-fileupload;version='[1.4.0,1.4.1)',\
 	org.apache.commons.io;version='[2.6.0,2.6.1)',\
 	org.apache.commons.math3;version='[3.6.1,3.6.2)',\
-	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
-	org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
+	org.apache.felix.configadmin;version='[1.9.16,1.9.17)',\
+	org.apache.felix.eventadmin;version='[1.5.0,1.5.1)',\
+	org.apache.felix.http.jetty;version='[4.0.18,4.0.19)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.felix.webconsole;version='[4.3.4,4.3.5)',\
-	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.eclipse.equinox.metatype;version='[1.4.500,1.4.501)',\
+	org.apache.felix.inventory;version='[1.0.4,1.0.5)',\
+	org.apache.felix.metatype;version='[1.2.2,1.2.3)',\
+	org.apache.felix.scr;version='[2.1.20,2.1.21)',\
+	org.apache.felix.webconsole;version='[4.4.0,4.4.1)',\
+	org.apache.felix.webconsole.plugins.ds;version='[2.1.0,2.1.1)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
 	org.openmuc.jmbus;version='[3.2.1,3.2.2)',\
 	org.openmuc.jrxtx;version='[1.0.1,1.0.2)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[1.11.2,1.11.3)',\
-	org.ops4j.pax.logging.pax-logging-service;version='[1.11.2,1.11.3)',\
-	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	org.osgi.service.metatype;version='[1.4.0,1.4.1)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.2,2.0.3)',\
+	org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.2,2.0.3)',\
+	org.osgi.util.function;version='[1.1.0,1.1.1)',\
+	org.osgi.util.promise;version='[1.1.1,1.1.2)',\
 	rrd4j;version='[3.6.0,3.6.1)'
diff --git a/io.openems.edge.application/src/io/openems/edge/application/EdgeApp.java b/io.openems.edge.application/src/io/openems/edge/application/EdgeApp.java
@@ -25,8 +25,11 @@ void activate() {
 		this.log.info(line);
 
 		// Announce Operating System that OpenEMS Edge started
-		if (SDNotify.isAvailable()) {
-			SDNotify.sendNotify();
+		String socketName = System.getenv().get("NOTIFY_SOCKET");
+		if (socketName != null && socketName.length() != 0) {
+			if (SDNotify.isAvailable()) {
+				SDNotify.sendNotify();
+			}
 		}
 	}