Merge branch 'release/2023.9.0'

.github/workflows/build.yml

@@ -66,22 +66,6 @@ jobs:
           name: jacoco_report
           path: jacoco/
 
-      #
-      # Is this a Tag? Prepare release assets
-      #
-      - name: Prepare Edge+Backend assets
-        if: startsWith(github.ref, 'refs/tags/')
-        run: ./gradlew buildEdge buildBackend
-
-      - name: Save build-artifacts
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: |
-            build/openems-edge.jar
-            build/openems-backend.jar
-
   build-ui:
     runs-on: ubuntu-latest
     steps:
@@ -110,44 +94,4 @@ jobs:
           node_modules/.bin/ng build -c "openems,openems-edge-prod,prod"
           node_modules/.bin/ng lint
           export CHROME_BIN=/usr/bin/google-chrome-stable
-          npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
-
-      #
-      # Is this a Tag? Prepare release assets
-      #
-      - name: Prepare UI asset
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          mkdir build
-          cd ui/target
-          zip -r ../../build/openems-ui.zip ./*
-
-      - name: Save build-artifacts
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/upload-artifact@v3
-        with:
-          name: build-artifacts
-          path: build/openems-ui.zip
-
-  #
-  # Is this a Tag? Create a draft release
-  #
-  release:
-    runs-on: ubuntu-latest
-    needs: [build-java, build-ui]
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Load build-artifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: build-artifacts
-          path: build
-
-      - name: Create draft Release
-        uses: softprops/action-gh-release@v1
-        with:
-          draft: true
-          files: |
-            build/openems-edge.jar
-            build/openems-backend.jar
-            build/openems-ui.zip
+          npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI

.github/workflows/release.yml

@@ -0,0 +1,96 @@
+name: Prepare OpenEMS Release
+
+on:
+  push:
+    tags:
+      - "*.*.*"
+
+jobs:
+  build-java:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+
+      - uses: kiancross/checkstyle-annotations-action@v1
+
+      - name: Validate BackendApp.bndrun and EdgeApp.bndrun
+        run: git diff --exit-code io.openems.backend.application/BackendApp.bndrun  io.openems.edge.application/EdgeApp.bndrun
+
+      - name: Clean Edge+Backend assets
+        run: ./gradlew cleanEdge cleanBackend
+
+      - name: Prepare Edge+Backend assets
+        run: ./gradlew buildEdge buildBackend
+
+      - name: Save build-artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: |
+            build/openems-edge.jar
+            build/openems-backend.jar
+
+  build-ui:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Setup Cache for Node.js
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/.npm
+            ~/.ng
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
+
+      - name: Build OpenEMS UI
+        run: |
+          cd ui
+          npm install 
+          npm ci --prefer-offline --cache ~/.npm
+          node_modules/.bin/ng config cli.cache.path "~/.ng"
+          node_modules/.bin/ng build -c "openems,openems-edge-prod,prod"
+
+      - name: Prepare UI asset
+        run: |
+          mkdir build
+          cd ui/target
+          zip -r ../../build/openems-ui.zip ./*
+
+      - name: Save build-artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: build/openems-ui.zip
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [build-java, build-ui]
+    steps:
+      - name: Load build-artifacts
+        uses: actions/download-artifact@v3
+        with:
+          name: build-artifacts
+          path: build
+
+      - name: Create draft Release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: |
+            build/openems-edge.jar
+            build/openems-backend.jar
+            build/openems-ui.zip

.gitignore

@@ -118,6 +118,7 @@ local.properties
 *.zip
 *.tar.gz
 *.rar
+/*.deb
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -228,3 +229,6 @@ gradle-app.setting
 # OpenEMS temp files
 io.openems.edge.controller.api.mqtt/edge0
 io.openems.edge.application/c:/
+
+### Debian ###
+!tools/debian/**

.gradle-wrapper/gradle-wrapper.properties

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

cnf/pom.xml

@@ -60,7 +60,7 @@
 			<!-- Used by com.squareup.okhttp3: okhttp -->
 			<groupId>com.squareup.okio</groupId>
 			<artifactId>okio-jvm</artifactId>
-			<version>3.4.0</version>
+			<version>3.5.0</version>
 		</dependency>
 		<dependency>
 			<!-- Used by com.influxdb: influxdb-client -->
@@ -148,13 +148,13 @@
 		<dependency>
 			<groupId>info.faljse</groupId>
 			<artifactId>SDNotify</artifactId>
-			<version>1.3</version>
+			<version>1.5</version>
 		</dependency>
 		<!-- io -->
 		<dependency>
 			<groupId>io.reactivex.rxjava3</groupId>
 			<artifactId>rxjava</artifactId>
-			<version>3.1.6</version>
+			<version>3.1.7</version>
 		</dependency>
 		<!-- javax -->
 		<dependency>
@@ -208,7 +208,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.0.4</version>
+			<version>5.1.0</version>
 		</dependency>
 		<dependency>
 			<!-- Apache Felix Servlet API -->
@@ -261,7 +261,7 @@
 			<!-- Changelog: https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md -->
 			<groupId>org.checkerframework</groupId>
 			<artifactId>checker-qual</artifactId>
-			<version>3.36.0</version>
+			<version>3.37.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.dhatim</groupId>
@@ -302,7 +302,7 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-osgi-bundle</artifactId>
-			<version>1.9.0</version>
+			<version>1.9.10</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
@@ -406,7 +406,7 @@
 			<!-- Used by io.openems.edge.timedata.rrd4j -->
 			<groupId>org.rrd4j</groupId>
 			<artifactId>rrd4j</artifactId>
-			<version>3.8.2</version>
+			<version>3.9</version>
 		</dependency>
 	</dependencies>
 </project>

doc/build/package.json

@@ -6,4 +6,4 @@
     "@antora/site-generator-default": "^3.1.1"
   },
   "devDependencies": {}
-}
+}

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

@@ -121,7 +121,7 @@ https://github.com/OpenEMS/openems/blob/develop/io.openems.backend.b2bwebsocket/
 
 === SubscribeToChannels
 
-Registers a subscription for regular updates of channel values. Request is acknowledged by an empty success Response and followed by regular JSON-RPC Notifications. Du stop the subscription, an empty 'subscribeEdgesChannels' Request needs to be sent. 
+Registers a subscription for regular updates of channel values. Request is acknowledged by an empty success Response and followed by regular JSON-RPC Notifications. To stop the subscription, an empty 'subscribeEdgesChannels' Request needs to be sent. 
 
 The parameter "count" must be increased with each new Request. Only the Request with the highest "count" value is active.