Merge branch 'release/2024.9.0'

.github/dependabot.yml

@@ -1,20 +1,50 @@
 version: 2
 updates:
-- package-ecosystem: maven
-  directory: "/cnf"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-  target-branch: develop
-- package-ecosystem: npm
-  directory: "/ui"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-  target-branch: develop
-- package-ecosystem: "github-actions"
-  directory: "/.github/workflows"
-  schedule:
-    interval: "weekly"
-  open-pull-requests-limit: 10
-  target-branch: develop
+  - package-ecosystem: maven
+    directory: "/cnf"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+    target-branch: develop
+    groups:
+      influxdb:
+        patterns:
+          - "com.influxdb:*"
+
+  - package-ecosystem: npm
+    directory: "/ui"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10
+    target-branch: develop
+    groups:
+      angular:
+        patterns:
+          - "@angular/*"
+      capacitor:
+        patterns:
+          - "@capacitor/*"
+      ionic-native:
+        patterns:
+          - "@ionic-native/*"
+      ngx-formly:
+        patterns:
+          - "@ngx-formly/*"
+      karma:
+        patterns:
+          - "karma-*"
+          - "karma"
+      eslint:
+        patterns:
+          - "@angular-eslint/*"
+          - "@stylistic/eslint-plugin"
+          - "@typescript-eslint/*"
+          - "eslint-*"
+          - "eslint"
+
+  - package-ecosystem: "github-actions"
+    directory: "/.github/workflows"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 10
+    target-branch: develop

.gradle-wrapper/gradle-wrapper.properties

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

.woodpecker/ui-build.yml

@@ -0,0 +1,80 @@
+variables:
+  - &sftp-settings
+    server: ${CACHE_SERVER}
+    username: user
+    password: pass
+    ignore_branch: true
+    port: 2222
+    path: /cache
+    mount:
+      - cache
+
+  - &rsync-settings
+    user: fenecon-docs
+    hosts:
+      - ${ARTIFACT_SERVER}
+    port: 22
+    key:
+      from_secret: ssh_key_intranet
+    args: '-v'
+
+  - &main-build
+    - branch: [main, develop]
+    - evaluate: 'CI_COMMIT_MESSAGE contains "[APP]"'
+    - path:
+        include: ['.woodpecker/ui-build.yml']
+        on_empty: false
+
+when:
+  event:
+    - push
+
+matrix:
+  THEME:
+    - fenecon
+    - heckert
+
+clone:
+  git:
+    when: *main-build
+    image: woodpeckerci/plugin-git
+
+steps:
+  restore-cache:
+    when: *main-build
+    image: appleboy/drone-sftp-cache
+    settings:
+      restore: true
+      <<: *sftp-settings
+
+  prepare-environment:
+    when: *main-build
+    image: openems-bash
+    commands:
+      - export CACHE=$CI_WORKSPACE/cache
+      - mkdir -p $CI_WORKSPACE/cache build/target
+      - source tools/common.sh
+      - common_initialize_environment
+      - common_build_snapshot_version
+      - common_save_environment $CI_WORKSPACE/.openems-env
+    depends_on: [restore-cache]
+
+  build-android-app:
+    when: *main-build
+    image: openems-android:20.32
+    environment:
+      - THEME=${THEME}
+    commands:
+      - source $CI_WORKSPACE/.openems-env
+      - source tools/common.sh
+      - common_build_android_app
+    depends_on: [prepare-environment]
+
+  refresh-dev-android:
+    when: *main-build
+    image: woodpeckerci/rsync:latest
+    settings:
+      <<: *rsync-settings
+      source: $CI_WORKSPACE/ui/android/target/
+      target: /var/opt/develop/fems-artifacts/html/${CI_COMMIT_BRANCH}
+    depends_on: [build-android-app]

build.gradle

@@ -344,12 +344,19 @@ task copyBundleReadmes() {
  */
 task buildAntoraDocs(dependsOn: copyBundleReadmes) {
 	group 'Documentation'
-
 	dependsOn ":doc:buildAntoraDocs"
+
+	def source = file("doc/build/www")
+	def output = file("${buildDir}/www")
+
 	doLast {
+		output.deleteDir()
 		copy {
-			from "doc/build/www"
-			into "${buildDir}/www"
+			from source
+			into output
 		}
+		source.deleteDir()
+
+		println("Built ${output}!")
 	}
 }

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.2.1.jre',\
+	com.google.guava;version='33.3.0.jre',\
 	com.google.gson;version='2.11.0',\
 
 testpath: \

cnf/pom.xml

@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.2.1-jre</version>
+			<version>33.3.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -142,7 +142,7 @@
 		<dependency>
 			<groupId>io.reactivex.rxjava3</groupId>
 			<artifactId>rxjava</artifactId>
-			<version>3.1.8</version>
+			<version>3.1.9</version>
 		</dependency>
 		<dependency>
 			<!-- Jenetics - Java Genetic Algorithm Library -->
@@ -276,22 +276,22 @@
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-java</artifactId>
-			<version>7.1.0</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-core</artifactId>
-			<version>7.1.0</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-utils</artifactId>
-			<version>7.1.0</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>flux-dsl</artifactId>
-			<version>7.1.0</version>
+			<version>7.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>
@@ -301,7 +301,7 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-osgi-bundle</artifactId>
-			<version>2.0.0</version>
+			<version>2.0.20</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
@@ -393,13 +393,13 @@
 			<!-- Used by Apache Felix Web Management Console -->
 			<groupId>org.owasp.encoder</groupId>
 			<artifactId>encoder</artifactId>
-			<version>1.2.3</version>
+			<version>1.3.1</version>
 		</dependency>
 		<dependency>
 			<!-- Used by io.openems.backend.metadata.odoo -->
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.7.3</version>
+			<version>42.7.4</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.influxdb: influxdb -->

doc/antora.yml

@@ -3,4 +3,4 @@ title: Open Energy Management System
 version: latest
 start_page: ROOT:introduction.adoc
 nav:
-- modules/ROOT/nav.adoc
+  - modules/ROOT/nav.adoc

doc/build.gradle

@@ -12,11 +12,16 @@ node {
 task buildAntoraDocs(type: NodeTask) {
 	dependsOn npmInstall
 	script = file("build/node_modules/@antora/cli/bin/antora")
-	args = ["site.yml"]
+	args = ["--log-format=pretty", "site.yml"]
+
+	def nojekyll = file("build/.nojekyll")
+	def source = file("build/CNAME")
+	def output = file("build/www")
+
 	doLast {
 		copy {
-			from "build/.nojekyll", "build/CNAME"
-			into "build/www"
+			from nojekyll, source
+			into output
 		}
 	}
 }

doc/build/site.yml

@@ -7,13 +7,13 @@ site:
 content:
   sources:
     - url: ./../../
-      edit_url: https://github.com/OpenEMS/openems/tree/{refname}/{path}
+      edit_url: https://github.com/OpenEMS/openems/tree/develop/{path}
       branches: HEAD
       start_path: doc
 
 ui:
   bundle:
-    url: uibundle_openems.zip
+    url: https://github.com/OpenEMS/openems.io-theme/releases/latest/download/ui-bundle.zip
 
 output:
   dir: www

doc/modules/ROOT/pages/backend/backend-to-backend.adoc

@@ -2,7 +2,6 @@
 :imagesdir: ../assets/images
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/backend/build.adoc

@@ -1,7 +1,6 @@
 = Build OpenEMS Backend
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/backend/deploy.adoc

@@ -1,7 +1,6 @@
 = Deploy OpenEMS Backend
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/backend/metadata.adoc

@@ -1,7 +1,6 @@
 = Metadata
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/backend/service.adoc

@@ -1,7 +1,6 @@
 = Backend Services
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/backend/timedata.adoc

@@ -1,7 +1,6 @@
 = Timedata
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/component-communication/index.adoc

@@ -1,7 +1,6 @@
 = Internal Component Communication
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :source-highlighter: highlight.js

doc/modules/ROOT/pages/contribute/coding-guidelines.adoc

@@ -2,7 +2,6 @@
 :imagesdir: ../assets/images
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/contribute/documentation.adoc

@@ -2,7 +2,6 @@
 :imagesdir: ../assets/images
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/coreconcepts.adoc

@@ -2,7 +2,6 @@
 :imagesdir: ../assets/images
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/edge/architecture.adoc

@@ -1,7 +1,6 @@
 = Edge Architecture
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc

doc/modules/ROOT/pages/edge/bridge.adoc

@@ -1,7 +1,6 @@
 = Bridge
 :sectnums:
 :sectnumlevels: 4
-:toc:
 :toclevels: 4
 :experimental:
 :keywords: AsciiDoc