OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade lastnpe EEA to 2.4.0 (#4416) 

For release notes, see:

https://github.com/lastnpe/eclipse-null-eea-augments/releases/tag/v2.4.0

Signed-off-by: Wouter Born <github@maindrain.net>
pull/4418/head
Wouter Born 2024-10-20 16:03:03 +02:00 committed by GitHub
parent 1325d80343
commit a22349abf4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.core.io.transport.modbus/src/test/java/org/openhab/core/io/transport/modbus/test/SmokeTest.java
View File

@ -995,8 +995,8 @@ public class SmokeTest extends IntegrationTestSupport {
Method socketImplCreateMethod = socketImplClass.getDeclaredMethod("createPlatformSocketImpl",
boolean.class);
socketImplCreateMethod.setAccessible(true);
Object socketImpl = socketImplCreateMethod.invoke(/* null since we deal with static method */ null,
/* server */false);
Object socketImpl = socketImplCreateMethod
.invoke(/* null since we deal with static method */ giveNull(), /* server */false);
Constructor<?> socksSocketImplConstructor = socksSocketImplClass
.getDeclaredConstructor(socketImplClass);

5
bundles/org.openhab.core.transform/src/main/java/org/openhab/core/transform/AbstractFileTransformationService.java
View File

@ -263,8 +263,9 @@ public abstract class AbstractFileTransformationService<T> implements Transforma
*/
protected String getLocalizedProposedFilename(String filename, final WatchService watchService) {
final File file = new File(filename);
if (file.getParent() != null) {
watchSubDirectory(file.getParent(), watchService);
final String parent = file.getParent();
if (parent != null) {
watchSubDirectory(parent, watchService);
}
String sourcePath = getSourcePath();

2
pom.xml
View File

@ -68,7 +68,7 @@
<bnd.version>7.0.0</bnd.version>
<commons.net.version>3.7.2</commons.net.version>
<eea.version>2.3.0</eea.version>
<eea.version>2.4.0</eea.version>
<karaf.compile.version>4.4.6</karaf.compile.version>
<karaf.tooling.version>4.4.6</karaf.tooling.version>
<sat.version>0.16.0</sat.version>