Merge branch 'release/2020.10.0'

cnf/build.bnd

@@ -20,13 +20,6 @@
 		revision=org.osgi.enroute:test-bundles:7.0.0; \
 		readOnly=true; \
 		name="Testing Bundles"
--plugin.5.Debug: \
-	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:debug-bundles:7.0.0; \
-		readOnly=true; \
-		name="Debug Bundles"
 -plugin.6.Central: \
 	aQute.bnd.repository.maven.pom.provider.BndPomRepository; \
 		releaseUrls=https://repo.maven.apache.org/maven2/; \

cnf/pom.xml

@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>com.github.rzymek</groupId>
 			<artifactId>opczip</artifactId>
-			<version>1.0.2</version>
+			<version>1.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -51,13 +51,13 @@
 			<!-- Used by org.influxdb: influxdb-java -->
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>logging-interceptor</artifactId>
-			<version>3.14.7</version>
+			<version>3.14.8</version>
 		</dependency>
 		<dependency>
 			<!-- Used by org.influxdb: influxdb-java -->
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.14.6</version>
+			<version>3.14.8</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.squareup.okhttp3: okhttp -->
@@ -81,7 +81,7 @@
 			<!-- HikariCP A solid, high-performance, JDBC connection pool at last. -->
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>3.4.2</version>
+			<version>3.4.3</version>
 		</dependency>
 		<!-- commons -->
 		<dependency>
@@ -124,6 +124,13 @@
 			<artifactId>org.apache.felix.eventadmin</artifactId>
 			<version>1.5.0</version>
 		</dependency>
+		<dependency>
+			<!-- Apache Felix Inventory -->
+			<!-- Changelog: https://github.com/apache/felix-dev/blob/master/inventory/changelog.txt -->
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.inventory</artifactId>
+			<version>1.0.6</version>
+		</dependency>
 		<dependency>
 			<!-- Apache Felix HTTP Service -->
 			<!-- Changelog: https://github.com/apache/felix-dev/commits/master/http -->
@@ -144,9 +151,11 @@
 			<version>2.1.20</version>
 		</dependency>
 		<dependency>
+			<!-- Apache Felix Web Management Console -->
+			<!-- Changelog: https://github.com/apache/felix-dev/blob/master/webconsole/changelog.txt -->
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.webconsole</artifactId>
-			<version>4.4.0</version>
+			<version>4.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -166,7 +175,7 @@
 		<dependency>
 			<groupId>org.dhatim</groupId>
 			<artifactId>fastexcel</artifactId>
-			<version>0.10.14</version>
+			<version>0.10.15</version>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.platform</groupId>
@@ -181,7 +190,7 @@
 		<dependency>
 			<groupId>org.java-websocket</groupId>
 			<artifactId>Java-WebSocket</artifactId>
-			<version>1.4.1</version>
+			<version>1.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.msgpack</groupId>
@@ -201,7 +210,7 @@
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-log4j1</artifactId>
-			<version>2.0.2</version>
+			<version>2.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>

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.9.0
+Version 2020.10.0
 :sectnums:
 :sectnumlevels: 4
 :toc:

io.openems.backend.application/BackendApp.bndrun

@@ -18,6 +18,7 @@
 	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='org.apache.felix.inventory',\
 	bnd.identity;id='io.openems.backend.application',\
 	bnd.identity;id='io.openems.backend.b2brest',\
 	bnd.identity;id='io.openems.backend.b2bwebsocket',\
@@ -32,11 +33,11 @@
 	bnd.identity;id='io.openems.backend.uiwebsocket.impl',\
 
 -runbundles: \
-	Java-WebSocket;version='[1.4.1,1.4.2)',\
+	Java-WebSocket;version='[1.5.0,1.5.1)',\
 	com.google.gson;version='[2.8.5,2.8.6)',\
 	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='[3.4.2,3.4.3)',\
+	com.zaxxer.HikariCP;version='[3.4.3,3.4.4)',\
 	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,24 +56,24 @@
 	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.14,0.10.15)',\
+	io.openems.wrapper.fastexcel;version='[0.10.15,0.10.16)',\
 	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.opczip;version='[1.2.0,1.2.1)',\
 	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.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.inventory;version='[1.0.4,1.0.5)',\
+	org.apache.felix.inventory;version='[1.0.6,1.0.7)',\
 	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;version='[4.5.0,4.5.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.jsr-305;version='[3.0.2,3.0.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.ops4j.pax.logging.pax-logging-api;version='[2.0.3,2.0.4)',\
+	org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.3,2.0.4)',\
 	org.osgi.service.jdbc;version='[1.0.0,1.0.1)',\
 	org.osgi.util.function;version='[1.1.0,1.1.1)',\
 	org.osgi.util.promise;version='[1.1.1,1.1.2)',\

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 = 9;
+	public final static short VERSION_MINOR = 10;
 
 	/**
 	 * The patch version of OpenEMS.

io.openems.edge.application/EdgeApp.bndrun

@@ -25,7 +25,9 @@
 	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='org.apache.felix.inventory',\
 	bnd.identity;id='io.openems.edge.application',\
+	bnd.identity;id='io.openems.edge.battery.bydcommercial',\
 	bnd.identity;id='io.openems.edge.battery.soltaro',\
 	bnd.identity;id='io.openems.edge.bridge.mbus',\
 	bnd.identity;id='io.openems.edge.bridge.modbus',\
@@ -98,7 +100,7 @@
 	bnd.identity;id='io.openems.edge.meter.bcontrol.em300',\
 	bnd.identity;id='io.openems.edge.meter.carlo.gavazzi.em300',\
 	bnd.identity;id='io.openems.edge.meter.discovergy',\
-	bnd.identity;id='io.openems.edge.meter.janitza.umg96rme',\
+	bnd.identity;id='io.openems.edge.meter.janitza',\
 	bnd.identity;id='io.openems.edge.meter.microcare.sdm630',\
 	bnd.identity;id='io.openems.edge.meter.pqplus.umd97',\
 	bnd.identity;id='io.openems.edge.meter.schneider.acti9.smartlink',\
@@ -120,9 +122,9 @@
 	bnd.identity;id='io.openems.edge.tesla.powerwall2',\
 	bnd.identity;id='io.openems.edge.timedata.influxdb',\
 	bnd.identity;id='io.openems.edge.timedata.rrd4j',\
-
+	
 -runbundles: \
-	Java-WebSocket;version='[1.4.1,1.4.2)',\
+	Java-WebSocket;version='[1.5.0,1.5.1)',\
 	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)',\
@@ -132,6 +134,7 @@
 	io.openems.common;version='[1.0.0,1.0.1)',\
 	io.openems.edge.application;version='[1.0.0,1.0.1)',\
 	io.openems.edge.battery.api;version='[1.0.0,1.0.1)',\
+	io.openems.edge.battery.bydcommercial;version='[1.0.0,1.0.1)',\
 	io.openems.edge.battery.soltaro;version='[1.0.0,1.0.1)',\
 	io.openems.edge.bridge.mbus;version='[1.0.0,1.0.1)',\
 	io.openems.edge.bridge.modbus;version='[1.0.0,1.0.1)',\
@@ -208,7 +211,7 @@
 	io.openems.edge.meter.bcontrol.em300;version='[1.0.0,1.0.1)',\
 	io.openems.edge.meter.carlo.gavazzi.em300;version='[1.0.0,1.0.1)',\
 	io.openems.edge.meter.discovergy;version='[1.0.0,1.0.1)',\
-	io.openems.edge.meter.janitza.umg96rme;version='[1.0.0,1.0.1)',\
+	io.openems.edge.meter.janitza;version='[1.0.0,1.0.1)',\
 	io.openems.edge.meter.microcare.sdm630;version='[1.0.0,1.0.1)',\
 	io.openems.edge.meter.pqplus.umd97;version='[1.0.0,1.0.1)',\
 	io.openems.edge.meter.schneider.acti9.smartlink;version='[1.0.0,1.0.1)',\
@@ -236,9 +239,9 @@
 	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.14,0.10.15)',\
+	io.openems.wrapper.fastexcel;version='[0.10.15,0.10.16)',\
 	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.opczip;version='[1.2.0,1.2.1)',\
 	io.openems.wrapper.sdnotify;version='[1.3.0,1.3.1)',\
 	org.apache.commons.commons-fileupload;version='[1.4.0,1.4.1)',\
 	org.apache.commons.io;version='[2.6.0,2.6.1)',\
@@ -247,16 +250,16 @@
 	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.inventory;version='[1.0.4,1.0.5)',\
+	org.apache.felix.inventory;version='[1.0.6,1.0.7)',\
 	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;version='[4.5.0,4.5.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='[2.0.2,2.0.3)',\
-	org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.2,2.0.3)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.0.3,2.0.4)',\
+	org.ops4j.pax.logging.pax-logging-log4j1;version='[2.0.3,2.0.4)',\
 	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)'

io.openems.edge.meter.janitza.umg96rme/.gitignore → io.openems.edge.battery.bydcommercial/.gitignore

@@ -1,3 +1,2 @@
-/bin/
 /bin_test/
 /generated/

io.openems.edge.meter.janitza.umg96rme/.project → io.openems.edge.battery.bydcommercial/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>io.openems.edge.meter.janitza.umg96rme</name>
+	<name>io.openems.edge.battery.bydcommercial</name>
 	<comment></comment>
 	<projects>
 	</projects>

io.openems.edge.meter.janitza.umg96rme/bnd.bnd → io.openems.edge.battery.bydcommercial/bnd.bnd

@@ -1,14 +1,15 @@
-Bundle-Name: OpenEMS Edge Meter Janitza UMG96RME
+Bundle-Name: OpenEMS Edge BYD Battery-Box Commercial
 Bundle-Vendor: FENECON GmbH
 Bundle-License: https://opensource.org/licenses/EPL-2.0
 Bundle-Version: 1.0.0.${tstamp}
 
 -buildpath: \
 	${buildpath},\
 	io.openems.common,\
+	io.openems.edge.battery.api,\
 	io.openems.edge.bridge.modbus,\
 	io.openems.edge.common,\
-	io.openems.edge.meter.api
+	io.openems.edge.ess.api
 
 -testpath: \
 	${testpath}

io.openems.edge.battery.bydcommercial/readme.adoc

@@ -0,0 +1,6 @@
+= BYD Battery-Box Commercial
+
+Implemented Natures::
+- Battery
+
+https://github.com/OpenEMS/openems/tree/develop/io.openems.edge.battery.bydcommercial[Source Code icon:github[]]