Merge remote-tracking branch 'origin/develop' into dependabot/npm_and…

…_yarn/ui/develop/types/qs-6.9.18
OpenEMS · Jan 21, 2025 · 8299951 · 8299951
2 parents b5efbd8 + 87e9ef7
commit 8299951
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -403,12 +403,12 @@
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-api</artifactId>
-			<version>2.2.7</version>
+			<version>2.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
 			<artifactId>pax-logging-log4j2</artifactId>
-			<version>2.2.7</version>
+			<version>2.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
@@ -435,7 +435,7 @@
 			<!-- Used by io.openems.backend.metadata.odoo -->
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.7.4</version>
+			<version>42.7.5</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.influxdb: influxdb -->

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -118,13 +118,13 @@
 	org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
 	org.jetbrains.kotlin.osgi-bundle;version='[2.1.0,2.1.1)',\
 	org.jsr-305;version='[3.0.2,3.0.3)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
-	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
+	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.8,2.2.9)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\
 	org.owasp.encoder;version='[1.3.1,1.3.2)',\
-	org.postgresql.jdbc;version='[42.7.4,42.7.5)',\
+	org.postgresql.jdbc;version='[42.7.5,42.7.6)',\
 	reactive-streams;version='[1.0.4,1.0.5)',\
 	stax2-api;version='[4.2.2,4.2.3)'
diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -433,8 +433,8 @@
 	org.jsr-305;version='[3.0.2,3.0.3)',\
 	org.openmuc.jmbus;version='[3.3.0,3.3.1)',\
 	org.openmuc.jrxtx;version='[1.0.1,1.0.2)',\
-	org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
-	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
+	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
+	org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.8,2.2.9)',\
 	org.osgi.service.component;version='[1.5.1,1.5.2)',\
 	org.osgi.util.function;version='[1.2.0,1.2.1)',\
 	org.osgi.util.promise;version='[1.3.0,1.3.1)',\

diff --git a/...battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java b/...battery.fenecon.home/src/io/openems/edge/battery/fenecon/home/BatteryFeneconHomeImpl.java
@@ -812,7 +812,7 @@ private synchronized void initializeTowerModulesChannels(int numberOfTowers, int
 						// Create Voltage Channel
 						var channelId = new ChannelIdImpl(//
 								generateSingleCellPrefix(tower, module, cell) + "_VOLTAGE",
-								Doc.of(OpenemsType.INTEGER).unit(Unit.VOLT));
+								Doc.of(OpenemsType.INTEGER).unit(Unit.MILLIVOLT));
 						this.addChannel(channelId);
 
 						// Create Modbus-Mapping for Voltages