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

Jump to bottom

Update dependencies: influx, kotlin, gson #2647

Merged
merged 14 commits into from
May 27, 2024
Merged

Update dependencies: influx, kotlin, gson #2647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f61bcc5
Bump org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm in /cnf
dependabot[bot] May 13, 2024
8cd82d5
Bump org.jetbrains.kotlin:kotlin-osgi-bundle in /cnf
dependabot[bot] May 13, 2024
46e0cc0
---
dependabot[bot] May 20, 2024
1911be0
---
dependabot[bot] May 20, 2024
8e5a89b
---
dependabot[bot] May 20, 2024
638a0d8
---
dependabot[bot] May 20, 2024
68734c1
---
dependabot[bot] May 20, 2024
d97d4cd
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/com…
sfeilmeier May 27, 2024
605ad33
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/com…
sfeilmeier May 27, 2024
48afd49
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/com…
sfeilmeier May 27, 2024
7eacc78
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/org…
sfeilmeier May 27, 2024
0aff1c5
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/org…
sfeilmeier May 27, 2024
c296709
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/com…
sfeilmeier May 27, 2024
7fad25f
Update bnd files
sfeilmeier May 27, 2024
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.service.metatype.annotations;version='1.4.1',\
org.osgi.util.promise;version='1.2.0',\
com.google.guava;version='33.2.0.jre',\
com.google.gson;version='2.10.1',\
com.google.gson;version='2.11.0',\

testpath: \
slf4j.simple,\
Expand Down
14 changes: 7 additions & 7 deletions cnf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>2.11.0</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -271,22 +271,22 @@
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-java</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-core</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>influxdb-client-utils</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.influxdb</groupId>
<artifactId>flux-dsl</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>org.java-websocket</groupId>
Expand All @@ -296,12 +296,12 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-osgi-bundle</artifactId>
<version>1.9.23</version>
<version>1.9.24</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core-jvm</artifactId>
<version>1.8.0</version>
<version>1.8.1</version>
</dependency>
<dependency>
<!-- HTML processing -->
Expand Down
4 changes: 2 additions & 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 @@ -60,7 +60,7 @@

-runbundles: \
Java-WebSocket;version='[1.5.4,1.5.5)',\
com.google.gson;version='[2.10.1,2.10.2)',\
com.google.gson;version='[2.11.0,2.11.1)',\
com.google.guava;version='[33.2.0,33.2.1)',\
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
com.squareup.okio;version='[3.9.0,3.9.1)',\
Expand Down Expand Up @@ -111,7 +111,7 @@
org.apache.felix.scr;version='[2.2.10,2.2.11)',\
org.apache.felix.webconsole;version='[5.0.2,5.0.3)',\
org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
org.jetbrains.kotlin.osgi-bundle;version='[1.9.23,1.9.24)',\
org.jetbrains.kotlin.osgi-bundle;version='[1.9.24,1.9.25)',\
org.jsr-305;version='[3.0.2,3.0.3)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.1,2.2.2)',\
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.1,2.2.2)',\
Expand Down
4 changes: 2 additions & 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 @@ -194,7 +194,7 @@
bcutil;version='[1.70.0,1.70.1)',\
com.fazecast.jSerialComm;version='[2.10.4,2.10.5)',\
com.ghgande.j2mod;version='[3.2.1,3.2.2)',\
com.google.gson;version='[2.10.1,2.10.2)',\
com.google.gson;version='[2.11.0,2.11.1)',\
com.google.guava;version='[33.2.0,33.2.1)',\
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
com.squareup.okio;version='[3.9.0,3.9.1)',\
Expand Down Expand Up @@ -404,7 +404,7 @@
org.eclipse.jetty.io;version='[9.4.28,9.4.29)',\
org.eclipse.jetty.util;version='[9.4.28,9.4.29)',\
org.eclipse.paho.mqttv5.client;version='[1.2.5,1.2.6)',\
org.jetbrains.kotlin.osgi-bundle;version='[1.9.23,1.9.24)',\
org.jetbrains.kotlin.osgi-bundle;version='[1.9.24,1.9.25)',\
org.jsoup;version='[1.17.2,1.17.3)',\
org.jsr-305;version='[3.0.2,3.0.3)',\
org.openmuc.jmbus;version='[3.3.0,3.3.1)',\
Expand Down
4 changes: 2 additions & 2 deletions io.openems.wrapper/influxdb-client-core.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-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: 7.0.0
Bundle-Version: 7.1.0

Include-Resource: \
@influxdb-client-core-7.0.0.jar,\
@influxdb-client-core-7.1.0.jar,\

Export-Package: \
com.influxdb,\
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: 7.0.0
Bundle-Version: 7.1.0

Include-Resource: \
@influxdb-client-java-7.0.0.jar,\
@influxdb-client-java-7.1.0.jar,\

Export-Package: \
com.influxdb.client,\
Expand Down
4 changes: 2 additions & 2 deletions io.openems.wrapper/influxdb-client-utils.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-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: 7.0.0
Bundle-Version: 7.1.0

Include-Resource: \
@influxdb-client-utils-7.0.0.jar,\
@influxdb-client-utils-7.1.0.jar,\

Export-Package: \
com.influxdb.utils,\
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: 7.0.0
Bundle-Version: 7.1.0

Include-Resource: \
@flux-dsl-7.0.0.jar,\
@flux-dsl-7.1.0.jar,\

Export-Package: \
com.influxdb.query,\
Expand Down
4 changes: 2 additions & 2 deletions io.openems.wrapper/kotlinx-coroutines-core-jvm.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.0
Bundle-Version: 1.8.1

Include-Resource: \
@kotlinx-coroutines-core-jvm-1.8.0.jar,\
@kotlinx-coroutines-core-jvm-1.8.1.jar,\

Export-Package: \
kotlinx.coroutines,\
Expand Down