Commit Graph

88 Commits

Author SHA1 Message Date
Wouter Born
28c5922149 Fix maven-scr-plugin does not generate XML for DS annotations in test bundles (#395)
The maven-resources-plugin is used to copy back the generated XML to the OSGI-INF directory so it is on the classpath in tests.
The outputDirectory configuration parameter of the maven-scr-plugin is not used because when it is set to ${project.basedir} it empties the OSGI-INF dir and would remove non-generated SCR XML files.

Fixes #318

Signed-off-by: Wouter Born <eclipse@maindrain.net>
2018-09-11 13:15:07 +02:00
Wouter Born
8091914a4b Apply POM Code Convention (#392)
Applies the POM Code Covention as used in OH2/ESH projects.

See also: https://maven.apache.org/developers/conventions/code.html

The executed command is:

mvn \
  com.github.ekryd.sortpom:sortpom-maven-plugin:sort \
  -Dsort.keepBlankLines=true \
  -Dsort.predefinedSortOrder=recommended_2008_06

Signed-off-by: Wouter Born <eclipse@maindrain.net>
2018-09-10 13:45:11 +02:00
Kai Kreuzer
a59d5c4f11 Updated deps version for new Zigbee libs (#388)
Related to https://github.com/openhab/openhab-distro/pull/751

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-09-04 06:26:28 +02:00
Kai Kreuzer
25345a721d
updated repo.version which is used for the openhab-core repo location in the target platform (#384)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-08-20 10:03:41 +02:00
Kai Kreuzer
e8a1b679ad Revert "readded params that existed in the config previously (#379)" (#381)
This reverts commit c9cd17cbf3.
2018-08-10 10:33:39 +02:00
Kai Kreuzer
c9cd17cbf3
readded params that existed in the config previously (#379)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-08-08 19:26:56 +02:00
Kai Kreuzer
7addfb1bee added missing segment in bundle name (#378)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-08-08 12:43:34 +02:00
Kai Kreuzer
ce1ed6451e
added missing smarthome dependencies (#377)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-08-07 20:36:52 +02:00
Kai Kreuzer
fcf9a9ac43 updated deps to 1.0.30 (#376)
* updated deps to 1.0.30

Signed-off-by: Kai Kreuzer <kai@openhab.org>

* added commons-net to compat layer

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-08-01 16:25:37 +02:00
Kai Kreuzer
84e7940a73 Change to dependencies 1.0.29 (#375)
related to https://github.com/openhab/openhab-deps-repo/pull/6

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-07-27 14:57:36 +02:00
Kai Kreuzer
750ee5201f upgraded to official nrjavaserial 3.14.0 release (#366)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-07-15 22:32:06 +02:00
Kai Kreuzer
659898736f updated to new dependencies with JUPnP 2.4 (#365)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-06-27 14:19:46 +02:00
CloudBees DEV@Cloud
7c94229959 [unleash-maven-plugin] Preparation for next development cycle. 2018-05-28 01:54:21 +02:00
CloudBees DEV@Cloud
cabe7c4528 [unleash-maven-plugin] Preparation for next development cycle. 2018-05-28 01:54:21 +02:00
Patrick Fink
c4cf6eeb61 Add openHAB ESH repository (#352)
Signed-off-by: Patrick Fink <mail@pfink.de>
2018-05-28 00:24:07 +02:00
Patrick Fink
d59709fea2 Use newest version of maven-deploy-plugin (#351)
Signed-off-by: Patrick Fink <mail@pfink.de>
2018-05-27 22:54:07 +02:00
Kai Kreuzer
3658071d04 updated dependencies to 1.0.26 (#345)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-05-21 07:49:05 +02:00
Kai Kreuzer
9a4c8d74ae replace ESH p2 update site dependency by plain Maven dependencies (#341)
* replace ESH p2 update site dependency by plain Maven dependencies
* added special dependencies for core bundles
* added dependencies to feature projects as well

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-05-14 14:33:24 +02:00
Patrick Fink
c8a8f87a43 Remove obsolete esh.releaseVersion property (#340)
Signed-off-by: Patrick Fink <mail@pfink.de>
2018-05-13 19:15:56 +02:00
Svilen
0d14e401df Update to latest SAT version (#338)
Signed-off-by: Svilen Valkanov <svilen.valkanov@musala.com>
2018-04-27 14:24:13 +02:00
Patrick Fink
9546e6c85f Update unleash-maven-plugin to version 2.8.0 (#334)
Signed-off-by: Patrick Fink <mail@pfink.de>
2018-04-14 18:42:51 +02:00
Stefan Triller
95fa29ee8a Null annotations: Disable unchecked conversion warning (#330)
Sync maven settings with IDE settings again.

Signed-off-by: Stefan Triller <stefan.triller@telekom.de>
2018-04-10 14:02:16 +02:00
Kai Kreuzer
cfbdb1d026 updated to latest deps version (#329)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-04-10 12:41:32 +02:00
Kai Kreuzer
6258d3c981 updated to 1.0.24 dependencies with zigbee libs (#327)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-04-03 21:48:09 +02:00
Kai Kreuzer
80c3597970 moved release repo in profile (#321)
* moved release repo in profile

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-03-28 21:18:16 +02:00
Kai Kreuzer
bd654a60e6
removed reference to release repo (#317)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-03-16 12:17:08 +01:00
Kai Kreuzer
dee3ceea14
upgrade to Karaf 4.1.5 (#316)
* upgrade to Karaf 4.1.5

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-03-15 21:02:34 +01:00
Kai Kreuzer
74621dbcc8 updated to latest version of 3rd party dependencies (#313)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-03-13 06:51:00 +01:00
Tanya Georgieva
c85bf20486 Add new license header style for the XML files (#309)
Signed-off-by: Tanya D. Georgieva <tanya.dancheva.georgieva@gmail.com>
2018-03-12 15:46:19 +01:00
Kai Kreuzer
711e19509c
fixed indentation (#296)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-02-14 17:32:25 +01:00
Kai Kreuzer
4aeae6b0a2
fixed warnings in build and added equinox.jetty dependency for feed tests (#294)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-02-14 17:04:18 +01:00
Kai Kreuzer
5f4e037cd4
updated to latest dependencies that are compatible with the latest smarthome.test bundle which required Mockito 2.0 (#293)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-02-13 22:00:25 +01:00
Svilen
156b8021d3 Changed SAT artifact ID to correct one. (#284)
Signed-off-by: Svilen Valkanov <svilen.valkanov@musala.com>
2018-01-26 16:00:49 +01:00
Svilen
16ac7f16ca Update sat configuration and version (#262)
* Add config file to the build
* Change to new artifact ID and version of SAT
* Bump to new version

Signed-off-by: Svilen Valkanov <svilen.valkanov@musala.com>
2018-01-26 09:47:44 +01:00
Kai Kreuzer
660fa9fbd6
reduce the esh release version to 0.9.0 to make sure that snapshots are taken (#283)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2018-01-23 16:17:59 +01:00
Martin van Wingerden
5a21ca6b02 Updated copyrights to 2018 (#271)
Signed-off-by: Martin van Wingerden <martinvw@mtin.nl>
2018-01-03 09:26:13 +01:00
Kai Kreuzer
ba829ffbe0
added required dependency to scr-plugin (#268)
* added required dependency to scr-plugin

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-12-21 08:48:34 +01:00
CloudBees DEV@Cloud
1d0c749514 [unleash-maven-plugin] Preparation for next development cycle. 2017-12-17 23:40:22 +01:00
CloudBees DEV@Cloud
5c6bfba450 [unleash-maven-plugin] Preparation for next development cycle. 2017-12-17 23:40:22 +01:00
Patrick Fink
fa11c3a758 Add explicit version to tycho pom.xml (#267)
to prevent formatting issues on automated release

Signed-off-by: Patrick Fink <mail@pfink.de>
2017-12-17 20:19:06 +01:00
Patrick Fink
3e464e7e4f Explicitly define scm tag to prevent formatting issues on automated release (#265)
Signed-off-by: Patrick Fink <mail@pfink.de>
2017-12-16 18:31:28 +01:00
Kai Kreuzer
946135041d
introduced eshRelease version (#264)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-12-16 14:50:54 +01:00
Kai Kreuzer
371d743bff
Preparations towards a reproducible release build (#259)
- using an ESH release build (0.10.0.b1)
- added ESH release p2 repos for release builds
- removed targetplatform, which afaics isn't used at all anymore

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-12-14 23:48:55 +01:00
Simon Kaufmann
bfa6c9ad06 Disable maven null analysis errors until tycho > 1.0 releasei (#258)
see eclipse/smarthome#4604
Signed-off-by: Simon Kaufmann <simon.kfm@googlemail.com>
2017-12-12 15:15:34 +01:00
Patrick Fink
7dbd3bd8eb Upgrade maven unleash plugin to version 2.7.3 (fixes shillner/unleash-maven-plugin#91) (#253)
Signed-off-by: Patrick Fink <mail@pfink.de>
2017-12-10 14:15:48 +01:00
VelinYordanov
0cbb237e7b Changed the poms hierarchy (#225)
Signed-off-by: VelinYordanov <velin.iordanov@gmail.com>
2017-12-10 01:04:42 +01:00
Kai Kreuzer
aeefbc63fd
switching to ESH 0.10.0-SNAPSHOT (#252)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-12-08 15:02:07 +01:00
Kai Kreuzer
0c7e762c03
fixed groupId for DS annotations (#237)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-11-24 12:12:47 +01:00
Kai Kreuzer
0e9e06f184
updated targetplatform to deps 1.0.19 (#236)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-11-23 13:47:47 +01:00
Kai Kreuzer
0939c15de0
updated target platform information (#235)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-11-21 09:49:42 +01:00