From 2ffe61f19135989583229816d334980ca88037f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 11:44:37 +0100 Subject: [PATCH] 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 https://github.com/influxdata/influxdb-client-java/pull/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](https://github.com/influxdata/influxdb-client-java/compare/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] * 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](https://github.com/influxdata/influxdb-client-java/compare/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] * Update bndrun, update gson, remove gson-fire Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Feilmeier --- cnf/build.bnd | 2 +- cnf/pom.xml | 12 +++--------- io.openems.backend.application/BackendApp.bndrun | 3 +-- io.openems.edge.application/EdgeApp.bndrun | 3 +-- io.openems.wrapper/bnd.bnd | 2 +- io.openems.wrapper/influxdb-client-java.bnd | 4 ++-- io.openems.wrapper/influxdb-flux-dsl.bnd | 4 ++-- 7 files changed, 11 insertions(+), 19 deletions(-) diff --git a/cnf/build.bnd b/cnf/build.bnd index 50b8d44d4ee..0210fa6bdbd 100644 --- 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 index f50a83966b5..f129bed0f4e 100644 --- a/cnf/pom.xml +++ b/cnf/pom.xml @@ -27,7 +27,7 @@ com.google.code.gson gson - 2.9.1 + 2.10 com.google.guava @@ -81,12 +81,6 @@ adapter-rxjava3 2.9.0 - - - io.gsonfire - gson-fire - 1.8.5 - com.sun.activation @@ -246,7 +240,7 @@ com.influxdb influxdb-client-java - 6.5.0 + 6.7.0 com.influxdb @@ -261,7 +255,7 @@ com.influxdb flux-dsl - 6.5.0 + 6.7.0 org.java-websocket diff --git a/io.openems.backend.application/BackendApp.bndrun b/io.openems.backend.application/BackendApp.bndrun index 1ea42de07c7..4b30d74dbf8 100644 --- 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 index c4a1e280e1d..e8a73b9e934 100644 --- 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 index 2fe8c33b30e..8c1f7472d8a 100644 --- 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 index abf0d6ae7d5..0bb104bd057 100644 --- 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 index b310423cc24..ca3fc827500 100644 --- 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,\