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

…nf/develop/de.bytefish-pgbulkinsert-8.1.1
OpenEMS · Aug 1, 2023 · be22b0f · be22b0f
2 parents def7dfe + 82f3007
commit be22b0f
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -40,12 +40,12 @@ 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='32.1.1.jre',\
+	com.google.guava;version='32.1.2.jre',\
 	com.google.gson;version='2.10.1',\
 
 testpath: \
 	slf4j.simple,\
-    \${junit}
+	\${junit}
 
 # OpenEMS Eclipse IDE Workingsets
 -workingset =  \

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -37,7 +37,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>32.1.1-jre</version>
+			<version>32.1.2-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -277,22 +277,22 @@
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-java</artifactId>
-			<version>6.9.0</version>
+			<version>6.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-core</artifactId>
-			<version>6.9.0</version>
+			<version>6.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-utils</artifactId>
-			<version>6.9.0</version>
+			<version>6.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>flux-dsl</artifactId>
-			<version>6.9.0</version>
+			<version>6.10.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>
@@ -307,7 +307,7 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlinx</groupId>
 			<artifactId>kotlinx-coroutines-core-jvm</artifactId>
-			<version>1.7.2</version>
+			<version>1.7.3</version>
 		</dependency>
 		<dependency>
 			<!-- HTML processing -->

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -60,7 +60,7 @@
 	Java-WebSocket;version='[1.5.4,1.5.5)',\
 	checker-qual;version='[3.36.0,3.36.1)',\
 	com.google.gson;version='[2.10.1,2.10.2)',\
-	com.google.guava;version='[32.1.1,32.1.2)',\
+	com.google.guava;version='[32.1.2,32.1.3)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.squareup.okio;version='[3.4.0,3.4.1)',\
 	com.zaxxer.HikariCP;version='[5.0.1,5.0.2)',\

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -184,7 +184,7 @@
 	com.fazecast.jSerialComm;version='[2.5.1,2.5.2)',\
 	com.ghgande.j2mod;version='[2.5.5,2.5.6)',\
 	com.google.gson;version='[2.10.1,2.10.2)',\
-	com.google.guava;version='[32.1.1,32.1.2)',\
+	com.google.guava;version='[32.1.2,32.1.3)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.squareup.okio;version='[3.4.0,3.4.1)',\
 	com.sun.jna;version='[5.13.0,5.13.1)',\

diff --git a/io.openems.wrapper/influxdb-client-core.bnd b/io.openems.wrapper/influxdb-client-core.bnd
@@ -2,10 +2,10 @@ Bundle-Name: influxdb-client-core
 Bundle-Description: The Java InfluxDB 2.0 Client Core
 Bundle-DocURL: https://github.com/influxdata/influxdb-client-java
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 6.9.0
+Bundle-Version: 6.10.0
 
 Include-Resource: \
-	@influxdb-client-core-6.9.0.jar,\
+	@influxdb-client-core-6.10.0.jar,\
 
 Export-Package: \
 	com.influxdb,\

diff --git a/io.openems.wrapper/influxdb-client-java.bnd b/io.openems.wrapper/influxdb-client-java.bnd
@@ -2,10 +2,10 @@ Bundle-Name: influxdb-client-java
 Bundle-Description: The Java InfluxDB 2.0 Client Java
 Bundle-DocURL: https://github.com/influxdata/influxdb-client-java
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 6.9.0
+Bundle-Version: 6.10.0
 
 Include-Resource: \
-	@influxdb-client-java-6.9.0.jar,\
+	@influxdb-client-java-6.10.0.jar,\
 
 Export-Package: \
 	com.influxdb.client,\

diff --git a/io.openems.wrapper/influxdb-client-utils.bnd b/io.openems.wrapper/influxdb-client-utils.bnd
@@ -2,10 +2,10 @@ Bundle-Name: influxdb-client-utils
 Bundle-Description: The Java InfluxDB 2.0 Client Utils
 Bundle-DocURL: https://github.com/influxdata/influxdb-client-java
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 6.9.0
+Bundle-Version: 6.10.0
 
 Include-Resource: \
-	@influxdb-client-utils-6.9.0.jar,\
+	@influxdb-client-utils-6.10.0.jar,\
 
 Export-Package: \
 	com.influxdb.utils,\

diff --git a/io.openems.wrapper/influxdb-flux-dsl.bnd b/io.openems.wrapper/influxdb-flux-dsl.bnd
@@ -2,10 +2,10 @@ Bundle-Name: influxdb-flux-dsl
 Bundle-Description: The Java InfluxDB 2.0 Flux DSL
 Bundle-DocURL: https://github.com/influxdata/influxdb-client-java
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 6.9.0
+Bundle-Version: 6.10.0
 
 Include-Resource: \
-	@flux-dsl-6.9.0.jar,\
+	@flux-dsl-6.10.0.jar,\
 
 Export-Package: \
 	com.influxdb.query,\

diff --git a/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd b/io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd
@@ -2,10 +2,10 @@ Bundle-Name: kotlinx-coroutines-core-jvm
 Bundle-Description: The Java InfluxDB 2.0 Client Core
 Bundle-DocURL: https://github.com/influxdata/influxdb-client-client
 Bundle-License: https://opensource.org/licenses/MIT
-Bundle-Version: 1.7.2
+Bundle-Version: 1.7.3
 
 Include-Resource: \
-	@kotlinx-coroutines-core-jvm-1.7.2.jar,\
+	@kotlinx-coroutines-core-jvm-1.7.3.jar,\
 
 Export-Package: \
 	kotlinx.coroutines,\