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

Build(deps): Bump org.dhatim:fastexcel from 0.18.0 to 0.18.1 in /cnf #2724

Merged
merged 5 commits into from
Jul 30, 2024
Merged

Build(deps): Bump org.dhatim:fastexcel from 0.18.0 to 0.18.1 in /cnf #2724

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
d2acd76
Build(deps): Bump org.dhatim:fastexcel-reader in /cnf
dependabot[bot] Jul 29, 2024
9d1ff70
Build(deps): Bump org.dhatim:fastexcel from 0.18.0 to 0.18.1 in /cnf
dependabot[bot] Jul 29, 2024
bdfc4d3
Merge remote-tracking branch 'origin/dependabot/maven/cnf/develop/org…
sfeilmeier Jul 30, 2024
b55590f
Merge remote-tracking branch 'origin/develop' into dependabot/maven/c…
sfeilmeier Jul 30, 2024
822ea17
Update bnd
sfeilmeier Jul 30, 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
4 changes: 2 additions & 2 deletions cnf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,12 +260,12 @@
<dependency>
<groupId>org.dhatim</groupId>
<artifactId>fastexcel</artifactId>
<version>0.18.0</version>
<version>0.18.1</version>
</dependency>
<dependency>
<groupId>org.dhatim</groupId>
<artifactId>fastexcel-reader</artifactId>
<version>0.18.0</version>
<version>0.18.1</version>
</dependency>
<dependency>
<!-- Eclipse Paho MQTTv5 Client -->
Expand Down
7 changes: 3 additions & 4 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.fasterxml.aalto-xml;version='[1.3.2,1.3.3)',\
com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
com.google.gson;version='[2.11.0,2.11.1)',\
com.google.guava;version='[33.2.1,33.2.2)',\
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
Expand Down Expand Up @@ -101,9 +101,8 @@
io.openems.wrapper.retrofit-converter-scalars;version=snapshot,\
io.openems.wrapper.retrofit2;version=snapshot,\
io.reactivex.rxjava3.rxjava;version='[3.1.8,3.1.9)',\
org.apache.commons.commons-compress;version='[1.26.1,1.26.2)',\
org.apache.commons.commons-compress;version='[1.26.2,1.26.3)',\
org.apache.commons.commons-csv;version='[1.10.0,1.10.1)',\
org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
org.apache.felix.fileinstall;version='[3.7.4,3.7.5)',\
Expand All @@ -125,4 +124,4 @@
org.owasp.encoder;version='[1.2.3,1.2.4)',\
org.postgresql.jdbc;version='[42.7.3,42.7.4)',\
reactive-streams;version='[1.0.4,1.0.5)',\
stax2-api;version='[4.2.0,4.2.1)'
stax2-api;version='[4.2.2,4.2.3)'
7 changes: 3 additions & 4 deletions io.openems.edge.application/EdgeApp.bndrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
bcpkix;version='[1.70.0,1.70.1)',\
bcprov;version='[1.70.0,1.70.1)',\
bcutil;version='[1.70.0,1.70.1)',\
com.fasterxml.aalto-xml;version='[1.3.2,1.3.3)',\
com.fasterxml.aalto-xml;version='[1.3.3,1.3.4)',\
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.11.0,2.11.1)',\
Expand Down Expand Up @@ -396,9 +396,8 @@
io.reactivex.rxjava3.rxjava;version='[3.1.8,3.1.9)',\
javax.jmdns;version='[3.4.1,3.4.2)',\
javax.xml.soap-api;version='[1.4.0,1.4.1)',\
org.apache.commons.commons-compress;version='[1.26.1,1.26.2)',\
org.apache.commons.commons-compress;version='[1.26.2,1.26.3)',\
org.apache.commons.commons-csv;version='[1.10.0,1.10.1)',\
org.apache.commons.commons-io;version='[2.15.1,2.15.2)',\
org.apache.commons.math3;version='[3.6.1,3.6.2)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.eventadmin;version='[1.6.4,1.6.5)',\
Expand Down Expand Up @@ -428,4 +427,4 @@
org.owasp.encoder;version='[1.2.3,1.2.4)',\
reactive-streams;version='[1.0.4,1.0.5)',\
rrd4j;version='[3.9.0,3.9.1)',\
stax2-api;version='[4.2.0,4.2.1)'
stax2-api;version='[4.2.2,4.2.3)'
4 changes: 2 additions & 2 deletions io.openems.wrapper/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Bundle-Description: This wraps external java libraries that do not have OSGi hea
com.google.gson;version='2.10.1',\
de.bytefish:pgbulkinsert;version='8.1.4',\
fr.turri:aXMLRPC;version='1.13.0',\
org.dhatim:fastexcel;version='0.18.0',\
org.dhatim:fastexcel-reader;version='0.18',\
org.dhatim:fastexcel;version='0.18.1',\
org.dhatim:fastexcel-reader;version='0.18.1',\
org.eclipse.paho.mqttv5.client;version='1.2.5',\
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm;version='1.7.3',\
6 changes: 3 additions & 3 deletions io.openems.wrapper/fastexcel.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Bundle-Name: fastexcel
Bundle-DocURL: https://github.com/dhatim/fastexcel
Bundle-License: https://opensource.org/licenses/Apache-2.0
Bundle-Version: 0.18.0
Bundle-Version: 0.18.1

Include-Resource: \
@fastexcel-0.18.0.jar,\
@fastexcel-reader-0.18.0.jar,\
@fastexcel-0.18.1.jar,\
@fastexcel-reader-0.18.1.jar,\

-dsannotations: *

Expand Down