Bump commons-io:commons-io from 2.14.0 to 2.15.0 in /cnf (#2417)

* Bump commons-io:commons-io from 2.14.0 to 2.15.0 in /cnf Bumps commons-io:commons-io from 2.14.0 to 2.15.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update bndrun * Fix ENTSO-E App * Add missing translateParams --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier <[email protected]>
OpenEMS · Nov 1, 2023 · 212bde7 · 212bde7
1 parent 1e95d4d
commit 212bde7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -109,7 +109,7 @@
 			<!-- Changelog: https://commons.apache.org/proper/commons-io/changes-report.html -->
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.14.0</version>
+			<version>2.15.0</version>
 		</dependency>
 		<!-- de -->
 		<dependency>

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -101,7 +101,7 @@
 	io.reactivex.rxjava3.rxjava;version='[3.1.8,3.1.9)',\
 	org.apache.commons.commons-csv;version='[1.10.0,1.10.1)',\
 	org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
-	org.apache.commons.commons-io;version='[2.14.0,2.14.1)',\
+	org.apache.commons.commons-io;version='[2.15.0,2.15.1)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
 	org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -373,7 +373,7 @@
 	javax.xml.soap-api;version='[1.4.0,1.4.1)',\
 	org.apache.commons.commons-csv;version='[1.10.0,1.10.1)',\
 	org.apache.commons.commons-fileupload;version='[1.5.0,1.5.1)',\
-	org.apache.commons.commons-io;version='[2.14.0,2.14.1)',\
+	org.apache.commons.commons-io;version='[2.15.0,2.15.1)',\
 	org.apache.commons.math3;version='[3.6.1,3.6.2)',\
 	org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
 	org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\

diff --git a/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java b/io.openems.edge.core/src/io/openems/edge/app/timeofusetariff/EntsoE.java
@@ -120,6 +120,7 @@ protected ThrowingTriFunction<ConfigurationTarget, Map<Property, JsonElement>, L
 					new EdgeConfig.Component(ctrlEssTimeOfUseTariffId, alias, "Controller.Ess.Time-Of-Use-Tariff",
 							JsonUtils.buildJsonObject() //
 									.addProperty("ess.id", "ess0") //
+									.addPropertyIfNotNull("biddingZone", biddingZone) //
 									.build()), //
 					new EdgeConfig.Component(timeOfUseTariffProviderId, this.getName(l), "TimeOfUseTariff.ENTSO-E",
 							JsonUtils.buildJsonObject() //

diff --git a/ui/src/app/index/overview/overview.component.html b/ui/src/app/index/overview/overview.component.html
@@ -17,7 +17,8 @@
                                             [translateParams]="{edgeShortName: environment.edgeShortName}">Index.NO_EDGE_AVAILABLE</ion-label>
                                     </ion-item>
                                     <ion-card-content class="ion-text-center">
-                                        <p translate>INSTALLATION.CLICK_RECOMMENDATION</p>
+                                        <p translate [translateParams]="{edgeShortName: environment.edgeShortName}">
+                                            INSTALLATION.CLICK_RECOMMENDATION</p>
                                     </ion-card-content>
                                 </ng-container>
                                 <ng-template #others>