Merge branch 'release/2024.6.0'

.gradle-wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

build.gradle

@@ -55,7 +55,7 @@ subprojects {
 
 		jacocoTestReport {
 			reports {
-				xml.required = false
+				xml.required = true
 				csv.required = true
 				html.required = false
 			}
@@ -97,7 +97,7 @@ task cleanEdge() {
 	description 'Clean all Edge-Bundles'
 
 	subprojects.each { proj ->
-		if( proj.name ==~ /io.openems.(common|edge|shared|wrapper).*/ ) {
+		if( proj.name ==~ /io.openems.(common|edge|oem|shared|wrapper).*/ ) {
 			if (proj.tasks.findAll { it.name == 'clean' }) {
 				dependsOn(proj.clean)
 			}
@@ -134,7 +134,7 @@ task assembleEdge() {
 	description 'Assemble all Edge-Bundles'
 
 	subprojects.each { proj ->
-		if( proj.name ==~ /io.openems.(common|edge|shared|wrapper).*/ ) {
+		if( proj.name ==~ /io.openems.(common|edge|oem|shared|wrapper).*/ ) {
 			if (proj.tasks.findAll { it.name == 'assemble' }) {
 				dependsOn(proj.assemble)
 			}
@@ -191,12 +191,16 @@ task buildEdge() {
 	outputs.upToDateWhen { false }
 
 	doLast {
-		file("${buildDir}/openems-edge.jar").delete()
+		def source = file("io.openems.edge.application/generated/distributions/executable/EdgeApp.jar")
+		def output = file(System.getenv('OEMS_EDGE_OUTPUT') ?: "${buildDir}/openems-edge.jar")
+
+		output.delete()
 		copy {
-			from file("io.openems.edge.application/generated/distributions/executable/EdgeApp.jar")
-			into file("${buildDir}")
-			rename ("EdgeApp.jar", "openems-edge.jar")
+			from source
+			into output.getParentFile()
+			rename (source.getName(), output.getName())
 		}
+		println("Built ${output}!")
 	}
 }
 
@@ -220,12 +224,16 @@ task buildBackend() {
 	outputs.upToDateWhen { false }
 
 	doLast {
-		file("${buildDir}/openems-backend.jar").delete()
+		def source = file("io.openems.backend.application/generated/distributions/executable/BackendApp.jar")
+		def output = file(System.getenv('OEMS_BACKEND_OUTPUT') ?: "${buildDir}/openems-backend.jar")
+
+		output.delete()
 		copy {
-			from file("io.openems.backend.application/generated/distributions/executable/BackendApp.jar")
-			into file("${buildDir}")
-			rename ("BackendApp.jar", "openems-backend.jar")
+			from source
+			into output.getParentFile()
+			rename (source.getName(), output.getName())
 		}
+		println("Built ${output}!")
 	}
 }
 

cnf/build.bnd

@@ -40,8 +40,8 @@ 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.1.0.jre',\
-	com.google.gson;version='2.10.1',\
+	com.google.guava;version='33.2.0.jre',\
+	com.google.gson;version='2.11.0',\
 
 testpath: \
 	slf4j.simple,\

cnf/pom.xml

@@ -33,12 +33,12 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.10.1</version>
+			<version>2.11.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.1.0-jre</version>
+			<version>33.2.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -203,7 +203,7 @@
 			<!-- Changelog: https://github.com/apache/felix-dev/commits/master/http -->
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.http.jetty</artifactId>
-			<version>5.1.10</version>
+			<version>5.1.14</version>
 		</dependency>
 		<dependency>
 			<!-- Apache Felix Servlet API -->
@@ -271,22 +271,22 @@
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-java</artifactId>
-			<version>7.0.0</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-core</artifactId>
-			<version>7.0.0</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-utils</artifactId>
-			<version>7.0.0</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>flux-dsl</artifactId>
-			<version>7.0.0</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>
@@ -296,12 +296,12 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-osgi-bundle</artifactId>
-			<version>1.9.23</version>
+			<version>2.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
 			<artifactId>kotlinx-coroutines-core-jvm</artifactId>
-			<version>1.8.0</version>
+			<version>1.8.1</version>
 		</dependency>
 		<dependency>
 			<!-- HTML processing -->

io.openems.backend.alerting/src/io/openems/backend/alerting/Alerting.java

@@ -107,9 +107,9 @@ protected void deactivate() {
 
 	@Override
 	public void handleEvent(Event event) {
-		var reader = new EventReader(event);
+		final var reader = new EventReader(event);
 		for (var h : this.handler) {
-			var task = h.getEventHandler(reader.getTopic());
+			final var task = h.getEventHandler(reader.getTopic());
 			if (task != null) {
 				this.execute(task, reader);
 			}
@@ -122,7 +122,7 @@ private void execute(Consumer<EventReader> consumer, EventReader reader) {
 
 	@Override
 	public String debugLog() {
-		int queueSize = this.executor.getQueue().size();
+		final int queueSize = this.executor.getQueue().size();
 		if (queueSize >= THREAD_QUEUE_WARNING_THRESHOLD) {
 			return "%d tasks in the EventHandlerQueue!".formatted(queueSize);
 		} else {

io.openems.backend.alerting/src/io/openems/backend/alerting/Handler.java

@@ -11,28 +11,28 @@ public interface Handler<T extends Message> {
 	/**
 	 * Stop the Handler.
 	 */
-	public void stop();
+	void stop();
 
 	/**
 	 * Send the messages.
 	 *
 	 * @param sentAt   TimeStamp at with sending was initiated
 	 * @param messages which to send
 	 */
-	public void send(ZonedDateTime sentAt, List<T> messages);
+	void send(ZonedDateTime sentAt, List<T> messages);
 
 	/**
 	 * Return generic type of handler as Class object.
 	 *
 	 * @return GenericType of handler
 	 */
-	public Class<T> getGeneric();
+	Class<T> getGeneric();
 
 	/**
 	 * Handle given event.
 	 *
 	 * @param eventTopic to handle
 	 * @return {@link Consumer} to be scheduled in executor
 	 */
-	public Consumer<EventReader> getEventHandler(String eventTopic);
+	Consumer<EventReader> getEventHandler(String eventTopic);
 }

io.openems.backend.alerting/src/io/openems/backend/alerting/Message.java

@@ -57,7 +57,7 @@ public boolean equals(Object obj) {
 	@Override
 	public int compareTo(Message o) {
 		if (o == null) {
-			return -1;
+			return 1;
 		}
 		return this.getNotifyStamp().compareTo(o.getNotifyStamp());
 	}