Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Nov 9, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41c3937
Bump influxdb-client-java from 6.5.0 to 6.7.0 in /cnf
dependabot[bot] Nov 7, 2022
b4251fe
Bump flux-dsl from 6.5.0 to 6.7.0 in /cnf
dependabot[bot] Nov 7, 2022
1bc450f
Merge remote-tracking branch 'origin/develop' into dependabot/maven/c…
sfeilmeier Nov 9, 2022
3352291
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/com…
sfeilmeier Nov 9, 2022
366825a
Update bndrun, update gson, remove gson-fire
sfeilmeier Nov 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cnf/build.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
12 changes: 3 additions & 9 deletions cnf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions io.openems.backend.application/BackendApp.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
3 changes: 1 addition & 2 deletions io.openems.edge.application/EdgeApp.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
2 changes: 1 addition & 1 deletion io.openems.wrapper/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',\
Expand Down
4 changes: 2 additions & 2 deletions io.openems.wrapper/influxdb-client-java.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down
4 changes: 2 additions & 2 deletions io.openems.wrapper/influxdb-flux-dsl.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand Down