Merge branch 'develop' into feature/LstmModel

OpenEMS · Sep 30, 2024 · 3f6bc7b · 3f6bc7b
2 parents 86e2578 + a479107
commit 3f6bc7b
Show file tree

Hide file tree

Showing 12 changed files with 1,071 additions and 1,483 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -25,6 +25,8 @@ updates:
       angular:
         patterns:
           - "@angular/*"
+          - "@angular-devkit/*"
+          - "@angular-eslint/*"
       capacitor:
         patterns:
           - "@capacitor/*"
@@ -40,7 +42,6 @@ updates:
           - "karma"
       eslint:
         patterns:
-          - "@angular-eslint/*"
           - "@stylistic/eslint-plugin"
           - "@typescript-eslint/*"
           - "eslint-*"

diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -40,7 +40,7 @@ buildpath: \
 	org.osgi.service.metatype;version='1.4.1',\
 	org.osgi.service.metatype.annotations;version='1.4.1',\
 	org.osgi.util.promise;version='1.2.0',\
-	com.google.guava;version='33.3.0.jre',\
+	com.google.guava;version='33.3.1.jre',\
 	com.google.gson;version='2.11.0',\
 
 testpath: \

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.3.0-jre</version>
+			<version>33.3.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -97,7 +97,7 @@
 			<!-- HikariCP A solid, high-performance, JDBC connection pool at last. -->
 			<groupId>com.zaxxer</groupId>
 			<artifactId>HikariCP</artifactId>
-			<version>5.1.0</version>
+			<version>6.0.0</version>
 		</dependency>
 		<!-- de -->
 		<dependency>
@@ -237,7 +237,7 @@
 			<!-- Changelog: https://github.com/apache/felix-dev/blob/master/webconsole/README.md#releases -->
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.webconsole</artifactId>
-			<version>5.0.6</version>
+			<version>5.0.8</version>
 		</dependency>
 		<dependency>
 			<!-- Apache Felix Web Console Service Component Runtime/Declarative Services Plugin -->
@@ -260,12 +260,12 @@
 		<dependency>
 			<groupId>org.dhatim</groupId>
 			<artifactId>fastexcel</artifactId>
-			<version>0.18.2</version>
+			<version>0.18.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dhatim</groupId>
 			<artifactId>fastexcel-reader</artifactId>
-			<version>0.18.2</version>
+			<version>0.18.4</version>
 		</dependency>
 		<dependency>
 			<!-- Eclipse Paho MQTTv5 Client -->

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -62,10 +62,10 @@
 	Java-WebSocket;version='[1.5.4,1.5.5)',\
 	com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.google.guava;version='[33.3.0,33.3.1)',\
+	com.google.guava;version='[33.3.1,33.3.2)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.squareup.okio;version='[3.9.1,3.9.2)',\
-	com.zaxxer.HikariCP;version='[5.1.0,5.1.1)',\
+	com.zaxxer.HikariCP;version='[6.0.0,6.0.1)',\
 	io.openems.backend.alerting;version=snapshot,\
 	io.openems.backend.application;version=snapshot,\
 	io.openems.backend.b2brest;version=snapshot,\
@@ -113,7 +113,7 @@
 	org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
 	org.apache.felix.scr;version='[2.2.12,2.2.13)',\
-	org.apache.felix.webconsole;version='[5.0.6,5.0.7)',\
+	org.apache.felix.webconsole;version='[5.0.8,5.0.9)',\
 	org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
 	org.jetbrains.kotlin.osgi-bundle;version='[2.0.20,2.0.21)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -201,7 +201,7 @@
 	com.fazecast.jSerialComm;version='[2.10.4,2.10.5)',\
 	com.ghgande.j2mod;version='[3.2.1,3.2.2)',\
 	com.google.gson;version='[2.11.0,2.11.1)',\
-	com.google.guava;version='[33.3.0,33.3.1)',\
+	com.google.guava;version='[33.3.1,33.3.2)',\
 	com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
 	com.squareup.okio;version='[3.9.1,3.9.2)',\
 	com.sun.jna;version='[5.15.0,5.15.1)',\
@@ -411,7 +411,7 @@
 	org.apache.felix.inventory;version='[2.0.0,2.0.1)',\
 	org.apache.felix.metatype;version='[1.2.4,1.2.5)',\
 	org.apache.felix.scr;version='[2.2.12,2.2.13)',\
-	org.apache.felix.webconsole;version='[5.0.6,5.0.7)',\
+	org.apache.felix.webconsole;version='[5.0.8,5.0.9)',\
 	org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
 	org.eclipse.jetty.client;version='[9.4.28,9.4.29)',\
 	org.eclipse.jetty.http;version='[9.4.28,9.4.29)',\

diff --git a/io.openems.wrapper/bnd.bnd b/io.openems.wrapper/bnd.bnd
@@ -24,7 +24,7 @@ Bundle-Description: This wraps external java libraries that do not have OSGi hea
 	com.google.gson;version='2.10.1',\
 	de.bytefish:pgbulkinsert;version='8.1.4',\
 	fr.turri:aXMLRPC;version='1.13.0',\
-	org.dhatim:fastexcel;version='0.18.2',\
-	org.dhatim:fastexcel-reader;version='0.18.2',\
+	org.dhatim:fastexcel;version='0.18.4',\
+	org.dhatim:fastexcel-reader;version='0.18.4',\
 	org.eclipse.paho.mqttv5.client;version='1.2.5',\
 	org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;version='1.9.0',\
diff --git a/io.openems.wrapper/fastexcel.bnd b/io.openems.wrapper/fastexcel.bnd
@@ -1,11 +1,11 @@
 Bundle-Name: fastexcel
 Bundle-DocURL: https://github.com/dhatim/fastexcel
 Bundle-License: https://opensource.org/licenses/Apache-2.0
-Bundle-Version: 0.18.2
+Bundle-Version: 0.18.4
 
 Include-Resource: \
-	@fastexcel-0.18.2.jar,\
-	@fastexcel-reader-0.18.2.jar,\
+	@fastexcel-0.18.4.jar,\
+	@fastexcel-reader-0.18.4.jar,\
 
 -dsannotations: *
 

diff --git a/ui/.eslintrc.json b/ui/.eslintrc.json
@@ -89,8 +89,8 @@
           }
         ],
         "@typescript-eslint/member-ordering": "error",
-        "no-multiple-empty-lines": "error",
-        "quotes": [
+        "@stylistic/no-multiple-empty-lines": "error",
+        "@stylistic/quotes": [
           "error",
           "double"
         ],