Commit Graph

515 Commits

Author SHA1 Message Date
Hilbrand Bouwkamp
1d8b7be59b Added units kvarh and kvar. (#695)
Also simplified gravity unit.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2019-04-07 11:12:06 +02:00
Wouter Born
6900fcbe3e Add commons-net to bom (#694)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-04-03 07:28:04 +02:00
Wouter Born
338c8b7bbc Require successful Travis CI Java 11 build (#688)
* Update enforcer to allow compilation with Java 8, 9, 10 and 11
* Update Travis CI configuration to require the Java 11 build to succeed

Signed-off-by: Wouter Born <github@maindrain.net>
2019-04-01 06:25:43 +02:00
Wouter Born
806d1889b0 Add required bundles to itests for successful Java 11 build (#685)
Adds the following bundles required for building on Java 11 by default to the run requirements:

* org.apache.servicemix.specs.activation-api-1.1
* org.apache.servicemix.specs.annotation-api-1.3
* org.apache.servicemix.specs.jaxb-api-2.2

Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-31 17:53:56 +02:00
Wouter Born
648cfac66d Avoid ByteBuffer incompatibility when compiling with JDK9+ (#686)
Incompatible code can be used/generated when using JDK8 on the command line and JDK11 in Eclipse (or vice versa).

The explanation for this is given in https://github.com/apache/felix/pull/114 :

Java 9 introduces overridden methods with covariant return types for the following methods in java.nio.ByteBuffer:

* position​(int newPosition)
* limit​(int newLimit)
* flip​()
* clear​()
* mark​()
* reset​()
* rewind​()

In Java 9 they all now return ByteBuffer, whereas the methods they override return Buffer,
resulting in exceptions like this when executing on Java 8 and lower:
java.lang.NoSuchMethodError: java.nio.ByteBuffer.limit(I)Ljava/nio/ByteBuffer
This is because the generated byte code includes the static return type of the method, which is not found on Java 8 and lower because the overloaded methods with covariant return types don't exist (the issue appears even with source and target 8 or lower in compilation parameters).
The solution is to cast ByteBuffer instances to Buffer before calling the method.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-31 14:45:29 +02:00
Wouter Born
fc5f5bba91 Increase stability of MDNSDiscoveryServiceOSGiTest by increasing timeouts to 5s (#687)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-31 13:38:49 +02:00
Gaël L'hopital
c6a9085a74 Adding DataAmount (bit and derivatives) and DataTransferRates (bits per second) (#681)
* Adding DataAmount (bit and derivatives) and DataTransferRates (bits per second) to UoM

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
2019-03-30 21:43:15 +01:00
Scott Rushworth
d1a343d8b2 Add DynamicImport-Package for scripted automation (#663)
Fixes #610

Signed-off-by: Scott Rushworth <openhab@5iver.com>
2019-03-30 19:55:01 +01:00
J-N-K
167211d640 bump SAT version to 0.6.1 (#679)
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
2019-03-26 13:05:37 +01:00
Wouter Born
cbb96945f0 Ignore and remove Eclipse project specific settings (#677)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-26 13:04:09 +01:00
Patrick Fink
d82efc5f5b Add unleash plugin to pom.xml (#675)
Signed-off-by: Patrick Fink <mail@pfink.de>
2019-03-23 10:53:26 +01:00
Patrick Fink
05d350d5d6 Handle itests as part of the reactor during release (#673)
(for version bump etc.)

Signed-off-by: Patrick Fink <mail@pfink.de>
2019-03-21 20:55:28 +01:00
Wouter Born
1acb9c8ff2 [core] Increase DateTimeType parsing and formatting precision (#668)
Since Java 9 (JDK-8164428) the maximum resolution from the underlying clock is used.
Instead of just milliseconds the resolution can now even be tenth of microseconds.

According to the Type JavaDocs toFullString() should return the full string representation of the type to be consumed by 'valueOf(String)'.

With the changes in this PR toFullString() may return higher resolution date time strings on newer Java versions and valueOf(value) is able to parse these.

Code depending on a certain resolution returned by toFullString() should use the format(pattern) method instead so the resolution will not change.

Fixes #667

Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-17 13:18:30 +01:00
Wouter Born
7e94df1656 Print message instead of null on console when specified play volume is invalid (#670)
The fix helps users and also ensures the unit test works on both Java 8 and 11.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-17 13:00:35 +01:00
Wouter Born
71b241ae21
Update ohdr.version to 1.0.42 (#666)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-16 00:50:24 +01:00
David Gräff
8dc4902547 Delete crowdin.yml (#662)
ui.dashboard is no longer

Signed-off-by: David Graeff <david.graeff@web.de>
2019-03-15 15:08:52 +01:00
Christoph Weitkamp
cccd446f24 Revert "Added PullApprove config (#649)" (#658)
This reverts commit 55801cfef5.
2019-03-15 10:27:57 +01:00
Wouter Born
2c7ca348ef Upgrade Xtext to 2.17 for full Java 11 support (#650)
* Upgrade Xtext to 2.17 for full Java 11 support

Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-15 09:13:24 +01:00
Markus Rathgeb
fdb23778dc improve nullness of events (#657)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-15 09:10:52 +01:00
Wouter Born
65bdd2a983 Reenable SAT (#626)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-14 19:48:28 +01:00
Markus Rathgeb
32da98c2cd do not deploy integration tests (#654)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-14 19:47:54 +01:00
Markus Rathgeb
2ecc21d7a2 drop slf4j-simple from test index (#652)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-14 10:37:31 +01:00
Markus Rathgeb
99978009f3 bump bnd to 4.2.0 (#651)
* bump bnd to 4.2.0

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-14 09:38:17 +01:00
Markus Rathgeb
f00b005ab9 bump Gson to 2.8.2 (#648)
As long as we depend on the internal Gson packages, we need to use the
Gson bundle provided by Eclipse Orbit instead of the official one.

Related to: https://github.com/openhab/openhab-core/pull/641

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-13 23:23:37 +01:00
Markus Rathgeb
47194895ac specify directories so we do not rely on the current working directory (#640)
* specify directories so we do not rely on the current working directory

The current working directory has been changed between Bnd 4.1.0 and
4.2.0 and we should not rely on a specific choosen one.
We should set the appropriate directories ourself.

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-13 20:14:52 +01:00
Christoph Weitkamp
55801cfef5 Added PullApprove config (#649)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-03-13 12:49:42 +01:00
Wouter Born
56a5c151c0 Upgrade Mockito to 2.25.0 for Java 11 compatibility (#647)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-13 11:23:56 +01:00
Wouter Born
166432985d Update Travis configuration (#643)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-12 13:02:43 +01:00
Michael Riess
797a78e718 fix synchronisation and equals() in Configuration (#642)
Signed-off-by: Michael Riess <michael.riess@telekom.de>
2019-03-11 21:23:32 +01:00
Markus Rathgeb
2913d75e56 remove PDE left overs from core.karaf project (#639)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-08 23:22:00 +01:00
Wouter Born
7b36b62c49 Fix SAT errors (#634)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-07 10:41:24 +01:00
Andre Fuechsel
00edae4539 Do not use Paths to concatenate resource paths as on Windows it will convert "/" to "\\" and this is not a valid resource path for bundle.getResource() (#633)
Signed-off-by: Andre <afuechsel@gmail.com>
2019-03-06 21:32:45 +01:00
Wouter Born
48d873a32b Use openHAB license headers (#632)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-06 16:10:00 +01:00
Wouter Born
b41247289a Add NOTICE file (#631)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-06 16:09:24 +01:00
David Gräff
e508e8e4af ConfigDescriptionParameter: javadoc getContext() (#623)
Improve javadoc by explaining the different defined context values. 
I have added "rule", "channel", "channeltype" and "cronexpression" as those are used within the automation module.
The i18n service uses "location" as context value and expects a map to be rendered.

Signed-off-by: davidgraeff <david.graeff@web.de>
2019-03-05 12:59:08 +01:00
Markus Rathgeb
bf4eac7d78 migrate tests for storage.json (#624)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-05 11:53:02 +01:00
David Gräff
4c9a5aa291 [Automation] GenericCronTrigger (#622)
A cron trigger module is actually not that "Generic" and a useful trigger type for a lot of rules.

Therefore I suggest to remove the visibility "HIDDEN" with this PR.
I have also added a context "cronexpression" to the TEXT configuration value, so that UI's can offer a cron expression
selection widget.
(we currently have: 'time','item','script','channel','dayOfWeek','rule')

Signed-off-by: davidgraeff <david.graeff@web.de>
2019-03-05 06:46:48 +01:00
David Gräff
eacb019e39 [Automation] DayOfWeekCondition (#621)
Remove inconsistent visibility "PUBLIC". This value is not documented (there is only HIDDEN and VISIBLE) and this is the only module type that uses PUBLIC instead of just not setting this value at all.

Signed-off-by: davidgraeff <david.graeff@web.de>
2019-03-04 11:19:47 +01:00
Markus Rathgeb
4be3a0edd1 migrate tests for binding.xml (#619)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-04 09:14:58 +01:00
Kai Kreuzer
2d92336d72 added Guava version constraint
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-03-04 09:08:09 +01:00
Kai Kreuzer
227707c67a made package imports explicit
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-03-04 09:08:09 +01:00
Hilbrand Bouwkamp
caa9b71c21 Added new parent class for units to fix import problems. (#618)
The change with unit classes parent (#617) causes it to report missing imports of tec.uom.se when using static import. Before the change this was not a problem because the parent class was SmartHomeUnits. This change adds a new parent class for all units.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2019-03-02 14:26:01 +01:00
Hilbrand Bouwkamp
4517f3959b Added standard gravity and dBm units.
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2019-03-01 23:50:13 +00:00
Hilbrand Bouwkamp
21bf4d9ef0 Reordered units alphabetical, changed extends on SmartHomeUnits
The classes ImperialUnits and SIUnits both extended SmartHomeUnits. But the classes are used a singletons.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2019-03-01 23:50:13 +00:00
Markus Rathgeb
58d73f9f5c add jackson 1.x to compat1x feature (#616)
Fixes: https://github.com/openhab/openhab-core/issues/614

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-03-01 15:31:17 +01:00
Markus Rathgeb
2a06d15955 add runtime dependency declarations to project (#606)
For the runtime dependencies a template from the EnRoute project has
been used. To allow further customization and usages of different Maven
scopes, we migrate the template to this repo.

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-25 22:39:28 +01:00
Markus Rathgeb
d458d485b3 blacklist API bundle as long as jersey-all is used (#605)
As long as jersey-all is used that bundles a dozen of other artifacts,
we have to blacklist the JAX-RS API. Otherwise it will be added on every
new resolve call.

Related to: https://github.com/openhab/openhab-core/issues/576
Related to: https://github.com/openhab/openhab-core/pull/580

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-25 22:38:45 +01:00
Markus Rathgeb
0456b56e1d bump to OHDR 1.0.40 (#603)
* bump p2 repo for tycho builds from Oxygen to Photon
* bump ohdr to 1.0.40

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-25 09:52:11 +01:00
Markus Rathgeb
ee29031708 bump jUPnP (#602)
The version 2.5.2 contains the provided JUPnPService capability
information.

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-25 09:21:16 +01:00
Markus Rathgeb
45858f2dd2 model.core: respect OSGi lifecycle (#592)
Fixes: https://github.com/openhab/openhab-core/issues/591

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-21 10:13:54 +01:00