Skip to content

Commit c0ac9ac

Browse files
committed
updatete ro OpenHAB 4.2.0
1 parent f5b4f6b commit c0ac9ac

File tree

8 files changed

+11
-15
lines changed

8 files changed

+11
-15
lines changed

de.ibapl.openhab.binding.fhz4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>de.ibapl.openhab</groupId>
88
<artifactId>ibapl-oh</artifactId>
9-
<version>4.1.0.3-SNAPSHOT</version>
9+
<version>4.2.0-0-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212
<groupId>de.ibapl.openhab</groupId>

de.ibapl.openhab.binding.fhz4j/src/main/java/de/ibapl/openhab/fhz4j/handler/SpswBridgeHandler.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -510,13 +510,11 @@ public void dispose() {
510510
cp.close();
511511
} catch (Exception e) {
512512
LOGGER.log(Level.SEVERE, "Could not shutdown fhzAdapter", e);
513-
//TODO How to suppress warning?? @SuppressWarnings("Unused Assignment")
514513
//Set cp to null, so the gc can collect it.
514+
//TODO How to suppress warning?? @SuppressWarnings("Unused Assignment")
515515
cp = null;
516516
//Trigger gc to get rid of current cp ...
517517
System.gc();
518-
Runtime.getRuntime().runFinalization();
519-
System.gc();
520518
}
521519
}
522520
}

de.ibapl.openhab.binding.onewire4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>de.ibapl.openhab</groupId>
88
<artifactId>ibapl-oh</artifactId>
9-
<version>4.1.0.3-SNAPSHOT</version>
9+
<version>4.2.0-0-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212
<groupId>de.ibapl.openhab</groupId>

de.ibapl.openhab.binding.openv4j/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>de.ibapl.openhab</groupId>
88
<artifactId>ibapl-oh</artifactId>
9-
<version>4.1.0.3-SNAPSHOT</version>
9+
<version>4.2.0-0-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212
<groupId>de.ibapl.openhab</groupId>

de.ibapl.openhab.binding.openv4j/src/main/java/de/ibapl/openhab/openv4j/handler/SpswBridgeHandler.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,11 @@ public void dispose() {
143143
cp.close();
144144
} catch (Exception e) {
145145
LOGGER.log(Level.SEVERE, "Could not shutdown OpenV4JAdapter", e);
146-
//TODO How to suppress warning?? @SuppressWarnings("Unused Assignment")
147146
//Set cp to null, so the gc can collect it.
147+
//TODO How to suppress warning?? @SuppressWarnings("Unused Assignment")
148148
cp = null;
149149
//Trigger gc to get rid of current cp ...
150150
System.gc();
151-
Runtime.getRuntime().runFinalization();
152-
System.gc();
153151
}
154152
}
155153
}

oh-ibapl-kar/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>de.ibapl.openhab</groupId>
88
<artifactId>ibapl-oh</artifactId>
9-
<version>4.1.0.3-SNAPSHOT</version>
9+
<version>4.2.0-0-SNAPSHOT</version>
1010
<relativePath>..</relativePath>
1111
</parent>
1212

oh-ibapl-kar/src/main/feature/feature.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@
4343
<bundle>mvn:de.ibapl.openhab/de.ibapl.openhab.binding.onewire4j/${openhab.onewire4j.version}</bundle>
4444
</feature>
4545

46-
<feature name="openhab-binding-openv4j" version="${openhab.openv4j.version}" description="OpenV4J OH Binding">
46+
<!-- Yet to come
47+
<feature name="openhab-binding-openv4j" version="${openhab.openv4j.version}" description="OpenV4J OH Binding">
4748
<feature>openhab-runtime-base</feature>
4849
<bundle>mvn:de.ibapl.spsw/de.ibapl.spsw.api/${spsw.version}</bundle>
4950
<bundle>mvn:de.ibapl.openv4j/de.ibapl.openv4j.core/${openv4j.version}</bundle>
5051
<bundle>mvn:de.ibapl.openhab/de.ibapl.openhab.binding.openv4j/${openhab.openv4j.version}</bundle>
5152
</feature>
52-
53+
-->
5354
</features>

pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>de.ibapl.openhab</groupId>
77
<artifactId>ibapl-oh</artifactId>
8-
<version>4.1.0.3-SNAPSHOT</version>
8+
<version>4.2.0-0-SNAPSHOT</version>
99

1010
<name>OH IbAPl</name>
1111
<packaging>pom</packaging>
@@ -53,15 +53,14 @@
5353
<openhab.onewire4j.version>${project.version}</openhab.onewire4j.version>
5454
<openv4j.version>0.2.0-SNAPSHOT</openv4j.version>
5555
<openhab.openv4j.version>${project.version}</openhab.openv4j.version>
56-
<ohc.version>4.1.0</ohc.version>
56+
<ohc.version>4.2.0</ohc.version>
5757
<osgi.version.range>6.0.0</osgi.version.range>
5858
<oh.repo.baseUrl>https://openhab.jfrog.io/openhab</oh.repo.baseUrl>
5959
</properties>
6060

6161
<modules>
6262
<module>de.ibapl.openhab.binding.fhz4j</module>
6363
<module>de.ibapl.openhab.binding.onewire4j</module>
64-
<module>de.ibapl.openhab.binding.openv4j</module>
6564
<module>oh-ibapl-kar</module>
6665
</modules>
6766

0 commit comments

Comments
 (0)