Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump org.jetbrains.kotlin:kotlin-osgi-bundle from 1.9.21 to 1.9.22 in /cnf #2473

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,7 @@ typings/

### Gradle ###
.gradle
**/build/
# do not ignore '/doc/build' directory
!*doc/build/
/build/

# Ignore Gradle GUI config
gradle-app.setting
Expand Down Expand Up @@ -231,4 +229,4 @@ io.openems.edge.controller.api.mqtt/edge0
io.openems.edge.application/c:/

### Debian ###
!tools/debian/**
!tools/debian/**
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion cnf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-osgi-bundle</artifactId>
<version>1.9.21</version>
<version>1.9.22</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
Expand Down
1 change: 0 additions & 1 deletion doc/.gitignore

This file was deleted.

2 changes: 2 additions & 0 deletions doc/build/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/mode_modules/
/www/
8 changes: 3 additions & 5 deletions doc/build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {}
}
"antora": "^3.1.6"
}
}
4 changes: 2 additions & 2 deletions doc/modules/ROOT/pages/backend/timedata.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

2 changes: 1 addition & 1 deletion doc/modules/ROOT/pages/edge/implement.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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].

Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.application/BackendApp.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
6 changes: 3 additions & 3 deletions io.openems.backend.timedata.aggregatedinflux/readme.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion io.openems.edge.application/EdgeApp.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -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)',\
Expand Down
2 changes: 1 addition & 1 deletion io.openems.wrapper/bnd.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -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',\
Expand Down
2 changes: 1 addition & 1 deletion io.openems.wrapper/io.reactivex.rxjava3.rxjava.bnd
Original file line number Diff line number Diff line change
@@ -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,\
Expand Down