From ba6218eac05830a2f0407e8a8019df9f9602b768 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 23:15:27 +0000 Subject: [PATCH 1/3] Bump org.jetbrains.kotlin:kotlin-osgi-bundle in /cnf Bumps org.jetbrains.kotlin:kotlin-osgi-bundle from 1.9.21 to 1.9.22. --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-osgi-bundle dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- cnf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cnf/pom.xml b/cnf/pom.xml index ac264e0f4c2..5a1d1b4fbdb 100644 --- a/cnf/pom.xml +++ b/cnf/pom.xml @@ -302,7 +302,7 @@ org.jetbrains.kotlin kotlin-osgi-bundle - 1.9.21 + 1.9.22 org.jetbrains.kotlinx From dd27a63ca8ff4a7e68c3d8c9cfd58f97f4b0639a Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Fri, 29 Dec 2023 23:58:23 +0100 Subject: [PATCH 2/3] Update bnd files --- io.openems.backend.application/BackendApp.bndrun | 2 +- io.openems.edge.application/EdgeApp.bndrun | 2 +- io.openems.wrapper/bnd.bnd | 2 +- io.openems.wrapper/io.reactivex.rxjava3.rxjava.bnd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun index 03cc243aecd..f74d81de89f 100644 --- a/io.openems.backend.application/BackendApp.bndrun +++ b/io.openems.backend.application/BackendApp.bndrun @@ -113,7 +113,7 @@ org.apache.felix.scr;version='[2.2.6,2.2.7)',\ org.apache.felix.webconsole;version='[4.9.6,4.9.7)',\ org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\ - org.jetbrains.kotlin.osgi-bundle;version='[1.9.21,1.9.22)',\ + org.jetbrains.kotlin.osgi-bundle;version='[1.9.22,1.9.23)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.ops4j.pax.logging.pax-logging-api;version='[2.2.1,2.2.2)',\ org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.1,2.2.2)',\ diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun index 94253d1bb08..842abcc8a65 100644 --- a/io.openems.edge.application/EdgeApp.bndrun +++ b/io.openems.edge.application/EdgeApp.bndrun @@ -392,7 +392,7 @@ org.eclipse.jetty.io;version='[9.4.28,9.4.29)',\ org.eclipse.jetty.util;version='[9.4.28,9.4.29)',\ org.eclipse.paho.mqttv5.client;version='[1.2.5,1.2.6)',\ - org.jetbrains.kotlin.osgi-bundle;version='[1.9.21,1.9.22)',\ + org.jetbrains.kotlin.osgi-bundle;version='[1.9.22,1.9.23)',\ org.jsoup;version='[1.17.1,1.17.2)',\ org.jsr-305;version='[3.0.2,3.0.3)',\ org.openmuc.jmbus;version='[3.3.0,3.3.1)',\ diff --git a/io.openems.wrapper/bnd.bnd b/io.openems.wrapper/bnd.bnd index 1e1d6b0e1b2..caacb74b3d2 100644 --- a/io.openems.wrapper/bnd.bnd +++ b/io.openems.wrapper/bnd.bnd @@ -20,7 +20,7 @@ Bundle-Description: This wraps external java libraries that do not have OSGi hea eu.chargetime.ocpp:v1_6;version='1.1.0',\ io.jenetics:jenetics;version='7.2.0',\ info.faljse:SDNotify;version='1.5.0',\ - io.reactivex.rxjava3.rxjava;version='3.1.6',\ + io.reactivex.rxjava3.rxjava;version='3.1.8',\ com.google.gson;version='2.10.1',\ de.bytefish:pgbulkinsert;version='8.1.2',\ fr.turri:aXMLRPC;version='1.13.0',\ diff --git a/io.openems.wrapper/io.reactivex.rxjava3.rxjava.bnd b/io.openems.wrapper/io.reactivex.rxjava3.rxjava.bnd index 54215582075..6300801c295 100644 --- a/io.openems.wrapper/io.reactivex.rxjava3.rxjava.bnd +++ b/io.openems.wrapper/io.reactivex.rxjava3.rxjava.bnd @@ -1,7 +1,7 @@ # This OSGi fragment for gson exports the `io.reactivex.rxjava3.internal.*` # packages which is required by `io.openems.wrapper.influxdb-client` -Fragment-Host: io.reactivex.rxjava3.rxjava;bundle-version="3.1.6" +Fragment-Host: io.reactivex.rxjava3.rxjava;bundle-version="3.1.8" Export-Package: \ io.reactivex.rxjava3.internal.functions,\ From d8298c34b66b67327bf5b4fa6185dd564f7d317a Mon Sep 17 00:00:00 2001 From: Stefan Feilmeier Date: Sat, 30 Dec 2023 11:19:05 +0100 Subject: [PATCH 3/3] Fix docs build (only on 'develop' branch') --- .gitignore | 6 ++---- build.gradle | 3 ++- doc/.gitignore | 1 - doc/build/.gitignore | 2 ++ doc/build/package.json | 8 +++----- doc/modules/ROOT/pages/backend/timedata.adoc | 4 ++-- doc/modules/ROOT/pages/edge/implement.adoc | 2 +- io.openems.backend.timedata.aggregatedinflux/readme.adoc | 6 +++--- 8 files changed, 15 insertions(+), 17 deletions(-) delete mode 100644 doc/.gitignore create mode 100644 doc/build/.gitignore diff --git a/.gitignore b/.gitignore index 18551ca6ac6..c0bb0bee6f5 100644 --- a/.gitignore +++ b/.gitignore @@ -198,9 +198,7 @@ typings/ ### Gradle ### .gradle -**/build/ -# do not ignore '/doc/build' directory -!*doc/build/ +/build/ # Ignore Gradle GUI config gradle-app.setting @@ -231,4 +229,4 @@ io.openems.edge.controller.api.mqtt/edge0 io.openems.edge.application/c:/ ### Debian ### -!tools/debian/** \ No newline at end of file +!tools/debian/** diff --git a/build.gradle b/build.gradle index 6ee4cd5cf71..34c7a8c97df 100644 --- a/build.gradle +++ b/build.gradle @@ -289,7 +289,8 @@ task copyBundleReadmes() { return // ignore } - } else if(bundle.startsWith("io.openems.wrapper")) { + } else if(bundle.startsWith("io.openems.wrapper") + || bundle.startsWith("io.openems.oem.")) { // ignore return } diff --git a/doc/.gitignore b/doc/.gitignore deleted file mode 100644 index 84c048a73cc..00000000000 --- a/doc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build/ diff --git a/doc/build/.gitignore b/doc/build/.gitignore new file mode 100644 index 00000000000..c712b273a34 --- /dev/null +++ b/doc/build/.gitignore @@ -0,0 +1,2 @@ +/mode_modules/ +/www/ \ No newline at end of file diff --git a/doc/build/package.json b/doc/build/package.json index 72792e2cf0b..b83512c5802 100644 --- a/doc/build/package.json +++ b/doc/build/package.json @@ -2,8 +2,6 @@ "name": "openems-doc", "version": "1.0.0", "dependencies": { - "@antora/cli": "^3.1.1", - "@antora/site-generator-default": "^3.1.1" - }, - "devDependencies": {} -} \ No newline at end of file + "antora": "^3.1.6" + } +} diff --git a/doc/modules/ROOT/pages/backend/timedata.adoc b/doc/modules/ROOT/pages/backend/timedata.adoc index 0bc95001cf0..a14d93d499c 100644 --- a/doc/modules/ROOT/pages/backend/timedata.adoc +++ b/doc/modules/ROOT/pages/backend/timedata.adoc @@ -10,7 +10,7 @@ :imagesdir: ../../assets/images Live and historical data of an OpenEMS Edge are handled by a https://github.com/OpenEMS/openems/blob/develop/io.openems.backend.common/src/io/openems/backend/common/timedata/Timedata.java[Timedata] service. -It describes basically methods to write and read Edge data to/from a database. There are different kind of timedata providers within OpenEMS (see xref:service.adoc[Service] for concrete implementations). +It describes basically methods to write and read Edge data to/from a database. There are different kind of timedata providers within OpenEMS (see xref:backend/service.adoc[Service] for concrete implementations). Within OpenEMS Backend the only component which uses the different timedata services directly is the https://github.com/OpenEMS/openems/blob/develop/io.openems.backend.core/src/io/openems/backend/core/timedatamanager/TimedataManagerImpl.java[TimedataManager]. It passes Edge relevant data to **all** Timedata service and it reads the data from the **first** Timedata providers which can deliver it. @@ -41,5 +41,5 @@ Also due to performance reasons the computation of `AggregatedDataNotification` This helps keeping CPU load on the database server low. To get a better understanding of the new Edge data concept, have a look at the -xref:service.adoc.d/io.openems.backend.timedata.aggregatedinflux.adoc[Aggregated Influx] bundle. +xref:backend/service.adoc.d/io.openems.backend.timedata.aggregatedinflux.adoc[Aggregated Influx] bundle. diff --git a/doc/modules/ROOT/pages/edge/implement.adoc b/doc/modules/ROOT/pages/edge/implement.adoc index 2e4a75182ba..ef4e6ae19aa 100644 --- a/doc/modules/ROOT/pages/edge/implement.adoc +++ b/doc/modules/ROOT/pages/edge/implement.adoc @@ -570,7 +570,7 @@ If you experience any errors you can always run OpenEMS Edge using the btn:[Debu === Alternative Device Development Flow -Instead of adding the device to the btn:[EdgeApp.bndrun] file (as described in xref:implement.adoc#_enable_the_component[Enable the Component]), the device can be loaded dynamically by using [Apache Felix File Install]. Copying the device's built jar file into a `load` folder, relative to the project's root directory. Apache Felix File Install watches this folder and handles the device automatically. +Instead of adding the device to the btn:[EdgeApp.bndrun] file (as described in xref:#_enable_the_component[Enable the Component]), the device can be loaded dynamically by using [Apache Felix File Install]. Copying the device's built jar file into a `load` folder, relative to the project's root directory. Apache Felix File Install watches this folder and handles the device automatically. The folder is configurable by supplying the `felix.fileinstall.dir` option when starting the edge app. More configuration options can be found in the https://felix.apache.org/documentation/subprojects/apache-felix-file-install.html[Apache Felix File Install documentation]. diff --git a/io.openems.backend.timedata.aggregatedinflux/readme.adoc b/io.openems.backend.timedata.aggregatedinflux/readme.adoc index 7deb0382b58..077f29c83f5 100644 --- a/io.openems.backend.timedata.aggregatedinflux/readme.adoc +++ b/io.openems.backend.timedata.aggregatedinflux/readme.adoc @@ -10,9 +10,9 @@ thousands of connected edges only. If you do not need that functionality you can A large number of OpenEMS edges connected to a single backend leads to a performance bottleneck. The bottleneck is mainly due to the access to the database. This `Aggregated InfluxDB` bundle in -combination with the xref:../io.openems.backend.timedata.influx.adoc[Timedata Influx] -bundle can mitigate this bottleneck. This happens by writing all data as usual via xref:../io.openems.backend.timedata.influx.adoc[Timedata Influx] into -an Influx database (`DB 1`). Furthermore, all "aggregated data" (see xref:timedata.adoc[edge datatypes]) are written via the `Aggregated InfluxDB` bundle to +combination with the xref:backend/service.adoc.d/io.openems.backend.timedata.influx.adoc[Timedata Influx] +bundle can mitigate this bottleneck. This happens by writing all data as usual via xref:backend/service.adoc.d/io.openems.backend.timedata.influx.adoc[Timedata Influx] into +an Influx database (`DB 1`). Furthermore, all "aggregated data" (see xref:backend/timedata.adoc[edge datatypes]) are written via the `Aggregated InfluxDB` bundle to another database (`DB 2`) located on another server. Thus `DB 1` holds all data in high resolution, while `DB 2` only holds very few data (5-minute averages for power values or only daily values for energy). Furthermore, a retention policy of e.g. 90 days is applied to `DB 2`.