Skip to content

Commit a1618ce

Browse files
sfeilmeiersfeilmeier
committed
Merge branch 'release/2025.9.0'
2 parents 29684d6 + 8c858f7 commit a1618ce

113 files changed

Lines changed: 1613 additions & 432 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
build-java:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515

1616
- name: Setup Java 21
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
distribution: 'temurin'
2020
java-version: '21'
@@ -49,7 +49,7 @@ jobs:
4949
build-ui:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353

5454
- name: Setup Node.js
5555
uses: actions/setup-node@v4

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@v4
38+
uses: actions/checkout@v5
3939

4040
- name: Set up QEMU
4141
uses: docker/setup-qemu-action@v3

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
build-docs:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212

1313
- name: Setup Java 21
14-
uses: actions/setup-java@v4
14+
uses: actions/setup-java@v5
1515
with:
1616
distribution: 'temurin'
1717
java-version: '21'

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99
build-java:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313

1414
- name: Setup Java 21
15-
uses: actions/setup-java@v4
15+
uses: actions/setup-java@v5
1616
with:
1717
distribution: 'temurin'
1818
java-version: '21'
@@ -49,7 +49,7 @@ jobs:
4949
build-ui:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353

5454
- name: Setup Node.js
5555
uses: actions/setup-node@v4
@@ -90,13 +90,13 @@ jobs:
9090
needs: [build-java, build-ui]
9191
steps:
9292
- name: Load Java build-artifacts
93-
uses: actions/download-artifact@v4
93+
uses: actions/download-artifact@v5
9494
with:
9595
name: java-build-artifacts
9696
path: build
9797

9898
- name: Load UI build-artifacts
99-
uses: actions/download-artifact@v4
99+
uses: actions/download-artifact@v5
100100
with:
101101
name: ui-build-artifacts
102102
path: build

‎cnf/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<!-- Used by com.squareup.okhttp3: okhttp -->
6262
<groupId>com.squareup.okio</groupId>
6363
<artifactId>okio-jvm</artifactId>
64-
<version>3.15.0</version>
64+
<version>3.16.0</version>
6565
</dependency>
6666
<dependency>
6767
<!-- Used by com.influxdb: influxdb-client -->
@@ -97,7 +97,7 @@
9797
<!-- HikariCP A solid, high-performance, JDBC connection pool at last. -->
9898
<groupId>com.zaxxer</groupId>
9999
<artifactId>HikariCP</artifactId>
100-
<version>7.0.0</version>
100+
<version>7.0.2</version>
101101
</dependency>
102102
<!-- de -->
103103
<dependency>
@@ -231,7 +231,7 @@
231231
<!-- Changelog: https://github.com/apache/felix-dev/commits/master/http -->
232232
<groupId>org.apache.felix</groupId>
233233
<artifactId>org.apache.felix.http.jetty12</artifactId>
234-
<version>1.0.36</version>
234+
<version>1.1.0</version>
235235
</dependency>
236236
<dependency>
237237
<!-- Apache Felix Servlet API -->
@@ -337,7 +337,7 @@
337337
<dependency>
338338
<groupId>org.jetbrains.kotlin</groupId>
339339
<artifactId>kotlin-osgi-bundle</artifactId>
340-
<version>2.2.0</version>
340+
<version>2.2.10</version>
341341
</dependency>
342342
<dependency>
343343
<groupId>org.jetbrains.kotlinx</groupId>
@@ -348,7 +348,7 @@
348348
<!-- HTML processing -->
349349
<groupId>org.jsoup</groupId>
350350
<artifactId>jsoup</artifactId>
351-
<version>1.21.1</version>
351+
<version>1.21.2</version>
352352
</dependency>
353353
<dependency>
354354
<groupId>org.osgi</groupId>
@@ -468,7 +468,7 @@
468468
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
469469
<groupId>com.google.protobuf</groupId>
470470
<artifactId>protobuf-java</artifactId>
471-
<version>4.31.1</version>
471+
<version>4.32.0</version>
472472
</dependency>
473473
</dependencies>
474474
</project>

‎doc/modules/ROOT/pages/backend/deploy/docker.adoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ To setup docker follow the instuctions from https://docs.docker.com/engine/insta
3737

3838
=== Create a Docker compose
3939

40-
Paste content into a `docker-compose.yml`
40+
Paste content into a `docker-compose.yml` in a directory of your choice:
4141

4242
[source,yaml]
4343
----
@@ -61,7 +61,7 @@ volumes:
6161

6262
=== Run compose file
6363

64-
To start the previously created `docker-compose.yml` run the command:
64+
To start the previously created `docker-compose.yml` `cd` into the directory of it and run the command:
6565

6666
[source,bash]
6767
----
@@ -211,4 +211,4 @@ NOTE: Note down Token
211211
NOTE: Values not specified can be left at their default values
212212
Timedata.InfluxDB
213213

214-
for further information see OpenEMS docs
214+
for further information see OpenEMS docs

‎io.openems.backend.application/BackendApp.bndrun‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
com.google.gson;version='[2.13.1,2.13.2)',\
6767
com.google.guava;version='[33.4.8,33.4.9)',\
6868
com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\
69-
com.google.protobuf;version='[4.31.1,4.31.2)',\
69+
com.google.protobuf;version='[4.32.0,4.32.1)',\
7070
com.squareup.okhttp3;version='[5.1.0,5.1.1)',\
7171
com.squareup.okhttp3.logging;version='[5.1.0,5.1.1)',\
72-
com.squareup.okio;version='[3.15.0,3.15.1)',\
73-
com.zaxxer.HikariCP;version='[7.0.0,7.0.1)',\
72+
com.squareup.okio;version='[3.16.0,3.16.1)',\
73+
com.zaxxer.HikariCP;version='[7.0.2,7.0.3)',\
7474
io.openems.backend.alerting;version=snapshot,\
7575
io.openems.backend.application;version=snapshot,\
7676
io.openems.backend.b2brest;version=snapshot,\
@@ -122,18 +122,19 @@
122122
org.apache.commons.commons-codec;version='[1.17.1,1.17.2)',\
123123
org.apache.commons.commons-compress;version='[1.27.1,1.27.2)',\
124124
org.apache.commons.commons-csv;version='[1.11.0,1.11.1)',\
125+
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
125126
org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\
126127
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
127128
org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
128129
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
129-
org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\
130+
org.apache.felix.http.jetty12;version='[1.1.0,1.1.1)',\
130131
org.apache.felix.http.servlet-api;version='[6.1.0,6.1.1)',\
131132
org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
132133
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
133134
org.apache.felix.scr;version='[2.2.12,2.2.13)',\
134135
org.apache.felix.webconsole;version='[5.0.12,5.0.13)',\
135136
org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
136-
org.jetbrains.kotlin.osgi-bundle;version='[2.2.0,2.2.1)',\
137+
org.jetbrains.kotlin.osgi-bundle;version='[2.2.10,2.2.11)',\
137138
org.jsr-305;version='[3.0.2,3.0.3)',\
138139
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
139140
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.0,2.3.1)',\

‎io.openems.common/src/io/openems/common/OpenemsConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class OpenemsConstants {
2222
* <p>
2323
* This is the month of the release.
2424
*/
25-
public static final short VERSION_MINOR = 8;
25+
public static final short VERSION_MINOR = 9;
2626

2727
/**
2828
* The patch version of OpenEMS.

‎io.openems.common/src/io/openems/common/websocket/ClientReconnectorWorker.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import static io.openems.common.utils.ReflectionUtils.invokeMethodWithoutArgumentsViaReflection;
44

5-
import java.time.Duration;
6-
import java.time.Instant;
75
import java.util.Random;
86
import java.util.concurrent.TimeUnit;
97
import java.util.function.Function;
@@ -29,13 +27,14 @@ public record Config(int connectTimeoutSeconds, int maxWaitSeconds, int minWaitS
2927
private final AbstractWebsocketClient<?> parent;
3028
private final Config config;
3129
private final long minWaitSecondsBetweenRetries;
32-
private Instant lastTry = Instant.MIN;
30+
private long lastTry;
3331
private String debugLog = null;
3432

3533
public ClientReconnectorWorker(AbstractWebsocketClient<?> parent, Config config) {
3634
this.parent = parent;
3735
this.config = config;
3836
this.minWaitSecondsBetweenRetries = new Random().nextInt(config.maxWaitSeconds()) + config.minWaitSeconds();
37+
this.lastTry = 0;
3938
}
4039

4140
public ClientReconnectorWorker(AbstractWebsocketClient<?> parent) {
@@ -49,8 +48,8 @@ protected void forever() throws Exception {
4948
return;
5049
}
5150

52-
var start = Instant.now();
53-
var waitedSeconds = Duration.between(this.lastTry, start).getSeconds();
51+
var start = System.nanoTime();
52+
var waitedSeconds = TimeUnit.NANOSECONDS.toSeconds(start - this.lastTry);
5453
if (waitedSeconds < this.minWaitSecondsBetweenRetries) {
5554
this.debugLog = "Waiting till next WebSocket reconnect ["
5655
+ (this.minWaitSecondsBetweenRetries - waitedSeconds) + "s]";
@@ -80,10 +79,11 @@ protected void forever() throws Exception {
8079
this.parent.logInfo(this.log, "# Reset WebSocket Client after Exception... done");
8180
}
8281

83-
var end = Instant.now();
82+
var end = System.nanoTime();
8483
if (success) {
8584
this.debugLog = null;
86-
this.parent.logInfo(this.log, "Connected successfully [" + Duration.between(start, end).toSeconds() + "s]");
85+
this.parent.logInfo(this.log,
86+
"Connected successfully [" + TimeUnit.NANOSECONDS.toSeconds(end - start) + "s]");
8787
} else {
8888
this.debugLog = "Connection failed";
8989
this.log.info("Connection failed");

‎io.openems.edge.application/EdgeApp.bndrun‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
bnd.identity;id='io.openems.edge.ess.fenecon.commercial40',\
120120
bnd.identity;id='io.openems.edge.ess.generic',\
121121
bnd.identity;id='io.openems.edge.ess.samsung',\
122-
bnd.identity;id='io.openems.edge.ess.sma',\
123122
bnd.identity;id='io.openems.edge.evcs.alpitronic.hypercharger',\
124123
bnd.identity;id='io.openems.edge.evcs.cluster',\
125124
bnd.identity;id='io.openems.edge.evcs.core',\
@@ -141,6 +140,7 @@
141140
bnd.identity;id='io.openems.edge.fenecon.dess',\
142141
bnd.identity;id='io.openems.edge.fenecon.mini',\
143142
bnd.identity;id='io.openems.edge.fenecon.pro',\
143+
bnd.identity;id='io.openems.edge.fronius',\
144144
bnd.identity;id='io.openems.edge.goodwe',\
145145
bnd.identity;id='io.openems.edge.heat.askoma',\
146146
bnd.identity;id='io.openems.edge.heat.mypv',\
@@ -171,7 +171,6 @@
171171
bnd.identity;id='io.openems.edge.meter.pqplus',\
172172
bnd.identity;id='io.openems.edge.meter.schneider.acti9.smartlink',\
173173
bnd.identity;id='io.openems.edge.meter.siemens',\
174-
bnd.identity;id='io.openems.edge.meter.sma.shm20',\
175174
bnd.identity;id='io.openems.edge.meter.socomec',\
176175
bnd.identity;id='io.openems.edge.meter.virtual',\
177176
bnd.identity;id='io.openems.edge.meter.weidmueller',\
@@ -182,15 +181,14 @@
182181
bnd.identity;id='io.openems.edge.predictor.production.linearmodel',\
183182
bnd.identity;id='io.openems.edge.predictor.similardaymodel',\
184183
bnd.identity;id='io.openems.edge.pvinverter.cluster',\
185-
bnd.identity;id='io.openems.edge.pvinverter.fronius',\
186184
bnd.identity;id='io.openems.edge.pvinverter.kaco.blueplanet',\
187185
bnd.identity;id='io.openems.edge.pvinverter.kostal',\
188-
bnd.identity;id='io.openems.edge.pvinverter.sma',\
189186
bnd.identity;id='io.openems.edge.pvinverter.solarlog',\
190187
bnd.identity;id='io.openems.edge.scheduler.allalphabetically',\
191188
bnd.identity;id='io.openems.edge.scheduler.daily',\
192189
bnd.identity;id='io.openems.edge.scheduler.fixedorder',\
193190
bnd.identity;id='io.openems.edge.simulator',\
191+
bnd.identity;id='io.openems.edge.sma',\
194192
bnd.identity;id='io.openems.edge.solaredge',\
195193
bnd.identity;id='io.openems.edge.tesla.powerwall2',\
196194
bnd.identity;id='io.openems.edge.timedata.influxdb',\
@@ -218,7 +216,7 @@
218216
com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\
219217
com.squareup.okhttp3;version='[5.1.0,5.1.1)',\
220218
com.squareup.okhttp3.logging;version='[5.1.0,5.1.1)',\
221-
com.squareup.okio;version='[3.15.0,3.15.1)',\
219+
com.squareup.okio;version='[3.16.0,3.16.1)',\
222220
com.sun.jna;version='[5.17.0,5.17.1)',\
223221
io.openems.common;version=snapshot,\
224222
io.openems.edge.application;version=snapshot,\
@@ -307,7 +305,6 @@
307305
io.openems.edge.ess.fenecon.commercial40;version=snapshot,\
308306
io.openems.edge.ess.generic;version=snapshot,\
309307
io.openems.edge.ess.samsung;version=snapshot,\
310-
io.openems.edge.ess.sma;version=snapshot,\
311308
io.openems.edge.evcs.alpitronic.hypercharger;version=snapshot,\
312309
io.openems.edge.evcs.api;version=snapshot,\
313310
io.openems.edge.evcs.cluster;version=snapshot,\
@@ -331,6 +328,7 @@
331328
io.openems.edge.fenecon.dess;version=snapshot,\
332329
io.openems.edge.fenecon.mini;version=snapshot,\
333330
io.openems.edge.fenecon.pro;version=snapshot,\
331+
io.openems.edge.fronius;version=snapshot,\
334332
io.openems.edge.goodwe;version=snapshot,\
335333
io.openems.edge.heat.api;version=snapshot,\
336334
io.openems.edge.heat.askoma;version=snapshot,\
@@ -364,7 +362,6 @@
364362
io.openems.edge.meter.pqplus;version=snapshot,\
365363
io.openems.edge.meter.schneider.acti9.smartlink;version=snapshot,\
366364
io.openems.edge.meter.siemens;version=snapshot,\
367-
io.openems.edge.meter.sma.shm20;version=snapshot,\
368365
io.openems.edge.meter.socomec;version=snapshot,\
369366
io.openems.edge.meter.virtual;version=snapshot,\
370367
io.openems.edge.meter.weidmueller;version=snapshot,\
@@ -377,16 +374,15 @@
377374
io.openems.edge.predictor.similardaymodel;version=snapshot,\
378375
io.openems.edge.pvinverter.api;version=snapshot,\
379376
io.openems.edge.pvinverter.cluster;version=snapshot,\
380-
io.openems.edge.pvinverter.fronius;version=snapshot,\
381377
io.openems.edge.pvinverter.kaco.blueplanet;version=snapshot,\
382378
io.openems.edge.pvinverter.kostal;version=snapshot,\
383-
io.openems.edge.pvinverter.sma;version=snapshot,\
384379
io.openems.edge.pvinverter.solarlog;version=snapshot,\
385380
io.openems.edge.scheduler.allalphabetically;version=snapshot,\
386381
io.openems.edge.scheduler.api;version=snapshot,\
387382
io.openems.edge.scheduler.daily;version=snapshot,\
388383
io.openems.edge.scheduler.fixedorder;version=snapshot,\
389384
io.openems.edge.simulator;version=snapshot,\
385+
io.openems.edge.sma;version=snapshot,\
390386
io.openems.edge.solaredge;version=snapshot,\
391387
io.openems.edge.tesla.powerwall2;version=snapshot,\
392388
io.openems.edge.thermometer.api;version=snapshot,\
@@ -431,12 +427,13 @@
431427
org.apache.commons.commons-codec;version='[1.17.1,1.17.2)',\
432428
org.apache.commons.commons-compress;version='[1.27.1,1.27.2)',\
433429
org.apache.commons.commons-csv;version='[1.11.0,1.11.1)',\
430+
org.apache.commons.commons-fileupload;version='[1.6.0,1.6.1)',\
434431
org.apache.commons.commons-io;version='[2.19.0,2.19.1)',\
435432
org.apache.commons.math3;version='[3.6.1,3.6.2)',\
436433
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
437434
org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
438435
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
439-
org.apache.felix.http.jetty12;version='[1.0.36,1.0.37)',\
436+
org.apache.felix.http.jetty12;version='[1.1.0,1.1.1)',\
440437
org.apache.felix.http.servlet-api;version='[6.1.0,6.1.1)',\
441438
org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
442439
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
@@ -448,8 +445,8 @@
448445
org.eclipse.jetty.io;version='[9.4.28,9.4.29)',\
449446
org.eclipse.jetty.util;version='[9.4.28,9.4.29)',\
450447
org.eclipse.paho.mqttv5.client;version='[1.2.5,1.2.6)',\
451-
org.jetbrains.kotlin.osgi-bundle;version='[2.2.0,2.2.1)',\
452-
org.jsoup;version='[1.21.1,1.21.2)',\
448+
org.jetbrains.kotlin.osgi-bundle;version='[2.2.10,2.2.11)',\
449+
org.jsoup;version='[1.21.2,1.21.3)',\
453450
org.jsr-305;version='[3.0.2,3.0.3)',\
454451
org.openmuc.jmbus;version='[3.3.0,3.3.1)',\
455452
org.openmuc.jrxtx;version='[1.0.1,1.0.2)',\

0 commit comments

Comments
 (0)