Skip to content

Commit 16495ce

Browse files
sfeilmeiersfeilmeier
committed
Merge branch 'release/2025.10.0'
2 parents a1618ce + ecd6bc4 commit 16495ce

File tree

46 files changed

+1590
-724
lines changed

Some content is hidden

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

46 files changed

+1590
-724
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- uses: actions/checkout@v5
5353

5454
- name: Setup Node.js
55-
uses: actions/setup-node@v4
55+
uses: actions/setup-node@v5
5656
with:
5757
node-version: '20'
5858

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- uses: actions/checkout@v5
5353

5454
- name: Setup Node.js
55-
uses: actions/setup-node@v4
55+
uses: actions/setup-node@v5
5656
with:
5757
node-version: '20'
5858

‎.github/workflows/stale.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Mark stale issues and pull requests
2+
3+
on:
4+
schedule:
5+
- cron: "0 1 * * *"
6+
workflow_dispatch:
7+
8+
jobs:
9+
stale:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/stale@v10
13+
with:
14+
repo-token: ${{ secrets.GITHUB_TOKEN }}
15+
days-before-stale: 90
16+
days-before-close: 14
17+
stale-issue-message: "This issue has been automatically marked as stale due to inactivity. It will be closed in 14 days if no further activity occurs."
18+
close-issue-message: "Closing this issue due to inactivity. Please reopen if needed."
19+
stale-pr-message: "This PR has been automatically marked as stale due to inactivity. It will be closed in 14 days if no further activity occurs."
20+
close-pr-message: "Closing this PR due to inactivity."
21+
exempt-issue-labels: "pinned,security,hacktoberfest,good-first-issue"
22+
exempt-pr-labels: "work-in-progress,do-not-close,security"

‎.gradle-wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎cnf/build.bnd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ buildpath: \
4040
org.osgi.service.metatype;version='1.4.1',\
4141
org.osgi.service.metatype.annotations;version='1.4.1',\
4242
org.osgi.util.promise;version='1.2.0',\
43-
com.google.guava;version='33.4.8.jre',\
43+
com.google.guava;version='33.5.0.jre',\
4444
com.google.guava.failureaccess;version='1.0.2',\
45-
com.google.gson;version='2.13.1',\
45+
com.google.gson;version='2.13.2',\
4646

4747
testpath: \
4848
slf4j.simple,\

‎cnf/pom.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
<dependency>
3434
<groupId>com.google.code.gson</groupId>
3535
<artifactId>gson</artifactId>
36-
<version>2.13.1</version>
36+
<version>2.13.2</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>com.google.guava</groupId>
4040
<artifactId>guava</artifactId>
41-
<version>33.4.8-jre</version>
41+
<version>33.5.0-jre</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>com.google.guava</groupId>
@@ -105,7 +105,7 @@
105105
<!-- Changelog: https://github.com/PgBulkInsert/PgBulkInsert/blob/master/CHANGELOG.md-->
106106
<groupId>de.bytefish</groupId>
107107
<artifactId>pgbulkinsert</artifactId>
108-
<version>8.1.5</version>
108+
<version>8.1.6</version>
109109
</dependency>
110110
<!-- eu -->
111111
<dependency>
@@ -177,7 +177,7 @@
177177
<!-- Release notes: https://github.com/jenetics/jenetics/blob/master/RELEASE_NOTES.md -->
178178
<groupId>io.jenetics</groupId>
179179
<artifactId>jenetics</artifactId>
180-
<version>8.2.0</version>
180+
<version>8.3.0</version>
181181
</dependency>
182182
<!-- javax -->
183183
<dependency>
@@ -190,7 +190,7 @@
190190
<!-- Used by SDNotify -->
191191
<groupId>net.java.dev.jna</groupId>
192192
<artifactId>jna</artifactId>
193-
<version>5.17.0</version>
193+
<version>5.18.0</version>
194194
</dependency>
195195
<!-- org -->
196196
<dependency>
@@ -258,14 +258,14 @@
258258
<!-- Changelog: https://github.com/apache/felix-dev/blob/master/scr/changelog.txt -->
259259
<groupId>org.apache.felix</groupId>
260260
<artifactId>org.apache.felix.scr</artifactId>
261-
<version>2.2.12</version>
261+
<version>2.2.14</version>
262262
</dependency>
263263
<dependency>
264264
<!-- Apache Felix Web Management Console -->
265265
<!-- Changelog: https://github.com/apache/felix-dev/blob/master/webconsole/README.md#releases -->
266266
<groupId>org.apache.felix</groupId>
267267
<artifactId>org.apache.felix.webconsole</artifactId>
268-
<version>5.0.12</version>
268+
<version>5.0.18</version>
269269
</dependency>
270270
<dependency>
271271
<!-- Apache Felix Web Console Service Component Runtime/Declarative Services Plugin -->
@@ -284,14 +284,14 @@
284284
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on -->
285285
<groupId>org.bouncycastle</groupId>
286286
<artifactId>bcpkix-jdk18on</artifactId>
287-
<version>1.81</version>
287+
<version>1.82</version>
288288
</dependency>
289289
<dependency>
290290
<!-- Bouncycastle for Eclipse Paho MQTTv5 Client -->
291291
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk18on -->
292292
<groupId>org.bouncycastle</groupId>
293293
<artifactId>bcprov-jdk18on</artifactId>
294-
<version>1.81</version>
294+
<version>1.82</version>
295295
</dependency>
296296
<dependency>
297297
<groupId>org.dhatim</groupId>
@@ -337,7 +337,7 @@
337337
<dependency>
338338
<groupId>org.jetbrains.kotlin</groupId>
339339
<artifactId>kotlin-osgi-bundle</artifactId>
340-
<version>2.2.10</version>
340+
<version>2.2.20</version>
341341
</dependency>
342342
<dependency>
343343
<groupId>org.jetbrains.kotlinx</groupId>
@@ -403,12 +403,12 @@
403403
<dependency>
404404
<groupId>org.ops4j.pax.logging</groupId>
405405
<artifactId>pax-logging-api</artifactId>
406-
<version>2.3.0</version>
406+
<version>2.3.1</version>
407407
</dependency>
408408
<dependency>
409409
<groupId>org.ops4j.pax.logging</groupId>
410410
<artifactId>pax-logging-log4j2</artifactId>
411-
<version>2.3.0</version>
411+
<version>2.3.1</version>
412412
</dependency>
413413
<dependency>
414414
<groupId>org.osgi</groupId>
@@ -435,7 +435,7 @@
435435
<!-- Used by io.openems.backend.metadata.odoo -->
436436
<groupId>org.postgresql</groupId>
437437
<artifactId>postgresql</artifactId>
438-
<version>42.7.7</version>
438+
<version>42.7.8</version>
439439
</dependency>
440440
<dependency>
441441
<!-- Used by com.influxdb: influxdb -->
@@ -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.32.0</version>
471+
<version>4.32.1</version>
472472
</dependency>
473473
</dependencies>
474474
</project>

‎codecov.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ coverage:
1010
project:
1111
default:
1212
target: auto
13-
threshold: 0.3%
13+
threshold: 0.4%
1414
branches:
1515
- "!main"
1616
- "!develop"
@@ -35,7 +35,7 @@ component_management:
3535
statuses:
3636
- type: project
3737
target: auto
38-
threshold: 0.1%
38+
threshold: 0.3%
3939
branches:
4040
- "!main"
4141
- "!develop"
@@ -60,3 +60,7 @@ component_management:
6060
name: "OpenEMS UI"
6161
paths:
6262
- ui/**
63+
statuses:
64+
- type: project
65+
target: auto
66+
threshold: 0.5%

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@
6363
-runbundles: \
6464
Java-WebSocket;version='[1.6.0,1.6.1)',\
6565
com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
66-
com.google.gson;version='[2.13.1,2.13.2)',\
67-
com.google.guava;version='[33.4.8,33.4.9)',\
66+
com.google.gson;version='[2.13.2,2.13.3)',\
67+
com.google.guava;version='[33.5.0,33.5.1)',\
6868
com.google.guava.failureaccess;version='[1.0.3,1.0.4)',\
69-
com.google.protobuf;version='[4.32.0,4.32.1)',\
69+
com.google.protobuf;version='[4.32.1,4.32.2)',\
7070
com.squareup.okhttp3;version='[5.1.0,5.1.1)',\
7171
com.squareup.okhttp3.logging;version='[5.1.0,5.1.1)',\
7272
com.squareup.okio;version='[3.16.0,3.16.1)',\
@@ -131,18 +131,18 @@
131131
org.apache.felix.http.servlet-api;version='[6.1.0,6.1.1)',\
132132
org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
133133
org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
134-
org.apache.felix.scr;version='[2.2.12,2.2.13)',\
135-
org.apache.felix.webconsole;version='[5.0.12,5.0.13)',\
134+
org.apache.felix.scr;version='[2.2.14,2.2.15)',\
135+
org.apache.felix.webconsole;version='[5.0.18,5.0.19)',\
136136
org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
137-
org.jetbrains.kotlin.osgi-bundle;version='[2.2.10,2.2.11)',\
137+
org.jetbrains.kotlin.osgi-bundle;version='[2.2.20,2.2.21)',\
138138
org.jsr-305;version='[3.0.2,3.0.3)',\
139-
org.ops4j.pax.logging.pax-logging-api;version='[2.3.0,2.3.1)',\
140-
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.0,2.3.1)',\
139+
org.ops4j.pax.logging.pax-logging-api;version='[2.3.1,2.3.2)',\
140+
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.3.1,2.3.2)',\
141141
org.osgi.service.component;version='[1.5.1,1.5.2)',\
142142
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
143143
org.osgi.util.function;version='[1.2.0,1.2.1)',\
144144
org.osgi.util.promise;version='[1.3.0,1.3.1)',\
145145
org.owasp.encoder;version='[1.3.1,1.3.2)',\
146-
org.postgresql.jdbc;version='[42.7.7,42.7.8)',\
146+
org.postgresql.jdbc;version='[42.7.8,42.7.9)',\
147147
reactive-streams;version='[1.0.4,1.0.5)',\
148148
stax2-api;version='[4.2.2,4.2.3)'

‎io.openems.backend.b2bwebsocket/test/io/openems/backend/b2bwebsocket/B2bWebsocketTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ public void setGridConnSchedule() throws Exception {
121121
System.out.println(responseFuture.get().toString());
122122
} catch (InterruptedException | ExecutionException e) {
123123
System.out.println(e.getMessage());
124+
} catch (NullPointerException e) {
125+
System.out.println("NullPointerException: " + e.getMessage());
126+
e.printStackTrace();
124127
}
125128
client.stop();
126129
}

‎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 = 9;
25+
public static final short VERSION_MINOR = 10;
2626

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

0 commit comments

Comments
 (0)