Bump flux-dsl from 6.5.0 to 6.7.0 in /cnf (#1974)

* Bump influxdb-client-java from 6.5.0 to 6.7.0 in /cnf * Drop gson-fire as per influxdata/influxdb-client-java#446 * Update gson to 2.10.0 - see https://github.com/google/gson/blob/master/CHANGELOG.md Bumps [influxdb-client-java](https://github.com/influxdata/influxdb-client-java) from 6.5.0 to 6.7.0. - [Release notes](https://github.com/influxdata/influxdb-client-java/releases) - [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md) - [Commits](influxdata/influxdb-client-java@v6.5.0...v6.7.0) --- updated-dependencies: - dependency-name: com.influxdb:influxdb-client-java dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Bump flux-dsl from 6.5.0 to 6.7.0 in /cnf Bumps [flux-dsl](https://github.com/influxdata/influxdb-client-java) from 6.5.0 to 6.7.0. - [Release notes](https://github.com/influxdata/influxdb-client-java/releases) - [Changelog](https://github.com/influxdata/influxdb-client-java/blob/master/CHANGELOG.md) - [Commits](influxdata/influxdb-client-java@v6.5.0...v6.7.0) --- updated-dependencies: - dependency-name: com.influxdb:flux-dsl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Update bndrun, update gson, remove gson-fire 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 9, 2022 · 2ffe61f · 2ffe61f
1 parent 56ced2e
commit 2ffe61f
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/cnf/build.bnd b/cnf/build.bnd
@@ -41,7 +41,7 @@ buildpath: \
 	org.osgi.util.promise;version='1.2.0',\
 	slf4j.api;version='1.7.32',\
 	com.google.guava;version='31.1.0.jre',\
-	com.google.gson;version='2.9.1'
+	com.google.gson;version='2.10.0'
 
 testpath: \
 	slf4j.simple,\

diff --git a/cnf/pom.xml b/cnf/pom.xml
@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.9.1</version>
+			<version>2.10</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
@@ -81,12 +81,6 @@
 			<artifactId>adapter-rxjava3</artifactId>
 			<version>2.9.0</version>
 		</dependency>
-		<dependency>
-			<!-- Used by com.influxdb: influxdb-client -->
-			<groupId>io.gsonfire</groupId>
-			<artifactId>gson-fire</artifactId>
-			<version>1.8.5</version>
-		</dependency>
 		<dependency>
 			<!-- JavaBeans Activation Framework -->
 			<groupId>com.sun.activation</groupId>
@@ -246,7 +240,7 @@
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>influxdb-client-java</artifactId>
-			<version>6.5.0</version>
+			<version>6.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.influxdb</groupId>
@@ -261,7 +255,7 @@
 		<dependency>
 			<groupId>com.influxdb</groupId>
 			<artifactId>flux-dsl</artifactId>
-			<version>6.5.0</version>
+			<version>6.7.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.java-websocket</groupId>

diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun
@@ -47,12 +47,11 @@
 
 -runbundles: \
 	Java-WebSocket;version='[1.5.3,1.5.4)',\
-	com.google.gson;version='[2.9.1,2.9.2)',\
+	com.google.gson;version='[2.10.0,2.10.1)',\
 	com.google.guava;version='[31.1.0,31.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.squareup.okio;version='[3.2.0,3.2.1)',\
 	com.zaxxer.HikariCP;version='[5.0.1,5.0.2)',\
-	io.gsonfire;version='[1.8.5,1.8.6)',\
 	io.openems.backend.alerting;version=snapshot,\
 	io.openems.backend.application;version=snapshot,\
 	io.openems.backend.b2brest;version=snapshot,\

diff --git a/io.openems.edge.application/EdgeApp.bndrun b/io.openems.edge.application/EdgeApp.bndrun
@@ -172,12 +172,11 @@
 	Java-WebSocket;version='[1.5.3,1.5.4)',\
 	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.9.1,2.9.2)',\
+	com.google.gson;version='[2.10.0,2.10.1)',\
 	com.google.guava;version='[31.1.0,31.1.1)',\
 	com.google.guava.failureaccess;version='[1.0.1,1.0.2)',\
 	com.squareup.okio;version='[3.2.0,3.2.1)',\
 	com.sun.jna;version='[5.12.1,5.12.2)',\
-	io.gsonfire;version='[1.8.5,1.8.6)',\
 	io.openems.common;version=snapshot,\
 	io.openems.edge.application;version=snapshot,\
 	io.openems.edge.battery.api;version=snapshot,\

diff --git a/io.openems.wrapper/bnd.bnd b/io.openems.wrapper/bnd.bnd
@@ -21,7 +21,7 @@ Bundle-Description: This wraps external java libraries that do not have OSGi hea
 	eu.chargetime.ocpp:v1_6;version='1.1.0',\
 	info.faljse:SDNotify;version='1.3',\
 	io.reactivex.rxjava3.rxjava;version='3.1.5',\
-	com.google.gson;version='2.8.9',\
+	com.google.gson,\
 	fr.turri:aXMLRPC;version='1.12',\
 	org.dhatim:fastexcel;version='0.12.15',\
 	org.eclipse.paho.mqttv5.client;version='1.2.5',\

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.5.0
+Bundle-Version: 6.7.0
 
 Include-Resource: \
-	@influxdb-client-java-6.5.0.jar,\
+	@influxdb-client-java-6.7.0.jar,\
 
 Export-Package: \
 	com.influxdb.client,\

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.5.0
+Bundle-Version: 6.7.0
 
 Include-Resource: \
-	@flux-dsl-6.5.0.jar,\
+	@flux-dsl-6.7.0.jar,\
 
 Export-Package: \
 	com.influxdb.query,\