Skip to content

Commit

Permalink
Merge branch 'OpenEMS:develop' into fix-ocpp-server
Browse files Browse the repository at this point in the history
  • Loading branch information
Sn0w3y authored Dec 19, 2024
2 parents 25e7484 + 2a1b88a commit c0a9afa
Show file tree
Hide file tree
Showing 784 changed files with 20,413 additions and 10,470 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ updates:
bouncycastle:
patterns:
- "org.bouncycastle:*"
pax-logging:
patterns:
- "org.ops4j.pax.logging:*"

- package-ecosystem: npm
directory: "/ui"
Expand Down
6 changes: 3 additions & 3 deletions cnf/build.bnd
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ buildpath: \
org.osgi.service.metatype;version='1.4.1',\
org.osgi.service.metatype.annotations;version='1.4.1',\
org.osgi.util.promise;version='1.2.0',\
com.google.guava;version='33.3.1.jre',\
com.google.guava;version='33.4.0.jre',\
com.google.guava.failureaccess;version='1.0.2',\
com.google.gson;version='2.11.0',\

Expand Down Expand Up @@ -75,5 +75,5 @@ testpath: \
Edge_Timedata;member=${filter;${p};io\.openems\.edge\.timedata\..*},\
Edge_TimeOfUseTariff;member=${filter;${p};io\.openems\.edge\.timeofusetariff\..*},\

javac.source: 17
javac.target: 17
javac.source: 21
javac.target: 21
14 changes: 7 additions & 7 deletions cnf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- On update: also update gradle.properties file -->
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.gradle</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>
<!-- com -->
<dependency>
Expand All @@ -38,7 +38,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.1-jre</version>
<version>33.4.0-jre</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down Expand Up @@ -105,7 +105,7 @@
<!-- Changelog: https://github.com/PgBulkInsert/PgBulkInsert/blob/master/CHANGELOG.md-->
<groupId>de.bytefish</groupId>
<artifactId>pgbulkinsert</artifactId>
<version>8.1.4</version>
<version>8.1.5</version>
</dependency>
<!-- eu -->
<dependency>
Expand All @@ -130,7 +130,7 @@
<dependency>
<groupId>fr.turri</groupId>
<artifactId>aXMLRPC</artifactId>
<version>1.14.0</version>
<version>1.15.0</version>
</dependency>
<!-- info -->
<dependency>
Expand Down Expand Up @@ -170,7 +170,7 @@
<dependency>
<groupId>io.reactivex.rxjava3</groupId>
<artifactId>rxjava</artifactId>
<version>3.1.9</version>
<version>3.1.10</version>
</dependency>
<dependency>
<!-- Jenetics - Java Genetic Algorithm Library -->
Expand Down Expand Up @@ -403,12 +403,12 @@
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>2.2.1</version>
<version>2.2.7</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-log4j2</artifactId>
<version>2.2.1</version>
<version>2.2.7</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
8 changes: 8 additions & 0 deletions doc/modules/ROOT/pages/backend/deploy.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ This chapter explains how OpenEMS Backend can be deployed on a Debian Linux serv

NOTE: It is recommended to run every service on a server with limited permissions. This example runs OpenEMS Backend with user "root" which is a bad idea for a production server!

==== Check JAVA version

Ensure that a JRE version 21 or later is installed. We recommend using `temurin-21-jre`

For detailed installation instructions, visit https://adoptium.net/de/installation/linux/[Adoptium Installation Guide].

NOTE: If you are using an *ARM32* device, download https://openems.io/download/temurin-21-jre-armhf_21.0.6+2.deb[temurin-21-jre-armhf_21.0.6+2.deb] directly from OpenEMS.

==== Create an application directory

Create the directory */opt/openems-backend*. This is going to be the place, where we put the JAR file.
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/ROOT/pages/contribute/coding-guidelines.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* Use precise naming for methods/functions
* Use narrow scopes for variables; avoid class variables
* Split code in Interface, Implementation(..Impl) and Config files
* Use modern Java 17 syntax (e.g. 'var' keyword, streams, etc.)
* Use modern Java 21 syntax (e.g. 'var' keyword, streams, etc.)
* Add readme.adoc to a new bundle
* Review data in bnd.bnd file
* Format all files via Eclipse Autoformat, organize Imports, apply Checkstyle suggestions (see below)
Expand Down
8 changes: 8 additions & 0 deletions doc/modules/ROOT/pages/edge/deploy.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ image::deploy-winscp.png[Start WinSCP from KiTTY]

=== Prepare operating system environment

==== Check JAVA version

Ensure that a JRE version 21 or later is installed. We recommend using `temurin-21-jre`

For detailed installation instructions, visit https://adoptium.net/de/installation/linux/[Adoptium Installation Guide].

NOTE: If you are using an *ARM32* device, download https://openems.io/download/temurin-21-jre-armhf_21.0.6+2.deb[temurin-21-jre-armhf_21.0.6+2.deb] directly from OpenEMS.

==== Create an application directory

Create the directory */usr/lib/openems*. This is going to be the place, where we put the JAR file.
Expand Down
8 changes: 4 additions & 4 deletions doc/modules/ROOT/pages/gettingstarted.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ NOTE: OpenEMS uses the **git** version control system via the popular GitHub pla
NOTE: Eclipse IDE is the recommended development environment for newcomers to OpenEMS. If you are more familiar with IntelliJ IDEA, feel free to use it. Follow xref:intellij.adoc[this guide].

. Prepare Eclipse IDE
.. Download Java Development Kit (JDK) 17 and install it. We recommend the https://adoptium.net/de/temurin/releases/?version=17[OpenJDK Temurin builds by the Adoptium project]
.. Download Java Development Kit (JDK) 21 and install it. We recommend the https://adoptium.net/de/temurin/releases/?version=21[OpenJDK Temurin builds by the Adoptium project]
.. Download https://www.eclipse.org/downloads/[Eclipse for Java icon:external-link[]], install and start it
.. On first start you will get asked to create a workspace.
Select your source code directory (`C:\Users\your.user\git\openems` in our example) and press btn:[Launch].
Expand All @@ -53,15 +53,15 @@ image::eclipse-workspace.png[Creating a workspace in Eclipse IDE]
+
Menu: btn:[Help] → btn:[Eclipse Marketplace...] → btn:[Find:] → enter btn:[Bndtools] → press btn:[Install]

.. Configure Eclipse IDE to use JDK 17.
.. Configure Eclipse IDE to use JDK 21.
+
- In the Menu select btn:[Windows] → btn:[Preferences]
- Select btn:[Java] - btn:[Installed JREs] in the navigation tree
- Press the btn:[Add...] button
- Keep btn:[Standard VM] selected and press btn:[Next >]
- Press the btn:[Directory...] button and select the folder of the installed JDK (e.g. `C:\Program Files\Eclipse Adoptium\jdk-17.0.7.7-hotspot`)
- Press the btn:[Directory...] button and select the folder of the installed JDK (e.g. `C:\Program Files\Eclipse Adoptium\jdk-21.0.3.9-hotspot`)
- Press the btn:[Finish] button
- Back in the Preferences window, tick the newly added JDK 17 and press btn:[Apply and Close]
- Back in the Preferences window, tick the newly added JDK 21 and press btn:[Apply and Close]
+
.Creating a workspace in Eclipse IDE
image::eclipse-select-jdk.png[Set the Java Development Kit in Eclipse IDE]
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
java_source=21
java_target=17
java_target=21

bnd_version=7.0.0
bnd_version=7.1.0
bnd_snapshots=https://bndtools.jfrog.io/bndtools/libs-snapshot-local
bnd_releases=https://bndtools.jfrog.io/bndtools/libs-release-local

Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.alerting/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

/**
* Schedules one or more {@link Message} for type {@link T} to a specific time.
*
* <p>
* After the specified time is reached, the scheduler sends the Messages to
* their {@link Handler} and removes them from itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,14 +224,14 @@ public void leap(long amount) {
* Try to advance the Clock to a specific amount of minutes after
* initialization. If the given point is ahead, the time will leap by the
* missing amount. If the given point is behind, nothing will happen.
*
* <p>
* A return value >=0 means, the clock has advanced the given amount in minutes
* with this call.
* </p>
*
* <p>
* A return value <0 means, the clock has already advanced the given amount
* above.
* </p>
*
* @param point to advance to
* @return difference
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.application/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
11 changes: 6 additions & 5 deletions io.openems.backend.application/BackendApp.bndrun
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-runfw: org.apache.felix.framework;version='[7.0.5,7.0.5]'
-runee: JavaSE-17
-runee: JavaSE-21
-runprovidedcapabilities: ${native_capability}

-resolve.effective: active
Expand Down Expand Up @@ -35,6 +35,7 @@
bnd.identity;id='org.ops4j.pax.logging.pax-logging-log4j2',\
bnd.identity;id='org.osgi.service.jdbc',\
bnd.identity;id='org.apache.felix.http.jetty',\
bnd.identity;id='org.apache.felix.http.servlet-api',\
bnd.identity;id='org.apache.felix.webconsole',\
bnd.identity;id='org.apache.felix.webconsole.plugins.ds',\
bnd.identity;id='org.apache.felix.inventory',\
Expand Down Expand Up @@ -62,7 +63,7 @@
Java-WebSocket;version='[1.5.4,1.5.5)',\
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.3.1,33.3.2)',\
com.google.guava;version='[33.4.0,33.4.1)',\
com.google.guava.failureaccess;version='[1.0.2,1.0.3)',\
com.squareup.okio;version='[3.9.1,3.9.2)',\
com.zaxxer.HikariCP;version='[6.2.1,6.2.2)',\
Expand Down Expand Up @@ -100,7 +101,7 @@
io.openems.wrapper.retrofit-converter-gson;version=snapshot,\
io.openems.wrapper.retrofit-converter-scalars;version=snapshot,\
io.openems.wrapper.retrofit2;version=snapshot,\
io.reactivex.rxjava3.rxjava;version='[3.1.9,3.1.10)',\
io.reactivex.rxjava3.rxjava;version='[3.1.10,3.1.11)',\
org.apache.commons.commons-codec;version='[1.17.1,1.17.2)',\
org.apache.commons.commons-compress;version='[1.27.1,1.27.2)',\
org.apache.commons.commons-csv;version='[1.11.0,1.11.1)',\
Expand All @@ -117,8 +118,8 @@
org.apache.felix.webconsole.plugins.ds;version='[2.3.0,2.3.1)',\
org.jetbrains.kotlin.osgi-bundle;version='[2.1.0,2.1.1)',\
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)',\
org.ops4j.pax.logging.pax-logging-api;version='[2.2.7,2.2.8)',\
org.ops4j.pax.logging.pax-logging-log4j2;version='[2.2.7,2.2.8)',\
org.osgi.service.component;version='[1.5.1,1.5.2)',\
org.osgi.service.jdbc;version='[1.1.0,1.1.1)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.b2brest/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.b2bwebsocket/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.common/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.core/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.edgewebsocket/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.metadata.dummy/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.metadata.file/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.metadata.odoo/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.io.OutputStreamWriter;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
Expand Down Expand Up @@ -101,7 +101,9 @@ public static SuccessResponseAndHeaders sendJsonrpcRequest(String url, String co
HttpURLConnection connection = null;
try {
// Open connection to Odoo
connection = (HttpURLConnection) new URL(url).openConnection();
connection = (HttpURLConnection) URI.create(url) //
.toURL() //
.openConnection(); //
connection.setConnectTimeout(5000);// 5 secs
connection.setReadTimeout(timeout);// 5 secs
connection.setRequestProperty("Accept-Charset", "US-ASCII");
Expand Down Expand Up @@ -276,8 +278,9 @@ private static Object executeKw(Credentials creds, String model, String action,
private static Object executeKw(Credentials creds, String model, String action, Object[] arg, Map<String, ?> kw)
throws MalformedURLException, XMLRPCException {
var params = new Object[] { creds.getDatabase(), creds.getUid(), creds.getPassword(), model, action, arg, kw };
var client = new XMLRPCClient(new URL(String.format("%s/xmlrpc/2/object", creds.getUrl())),
XMLRPCClient.FLAGS_NIL);
var uri = URI.create(String.format("%s/xmlrpc/2/object", creds.getUrl()));
var client = new XMLRPCClient(uri.toURL(), XMLRPCClient.FLAGS_NIL);

client.setTimeout(60 /* seconds */);
return client.call("execute_kw", params);
}
Expand Down Expand Up @@ -557,9 +560,9 @@ protected static byte[] getOdooReport(Credentials credentials, String report, in

HttpURLConnection connection = null;
try {
connection = (HttpURLConnection) new URL(
credentials.getUrl() + "/report/pdf/" + report + "/" + id + "?session_id=" + session)
.openConnection();
connection = (HttpURLConnection) URI
.create(credentials.getUrl() + "/report/pdf/" + report + "/" + id + "?session_id=" + session)
.toURL().openConnection();
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
connection.setRequestMethod("GET");
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.timedata.aggregatedinflux/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.timedata.dummy/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
2 changes: 1 addition & 1 deletion io.openems.backend.timedata.influx/.classpath
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
<classpathentry kind="src" output="bin" path="src"/>
<classpathentry kind="src" output="bin_test" path="test">
<attributes>
Expand Down
Loading

0 comments on commit c0a9afa

Please sign in to comment.