Commit Graph

101 Commits

Author SHA1 Message Date
Wouter Born
d5e7fe3ab3
Update LastNPE EEAs to 2.2.1 (#1821)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-11-17 16:29:09 +01:00
Wouter Born
0281c10036
[infrastructure] add external null-annotations (#1775)
Add EEAs and fix null analysis errors.

Related to:

* #888
* openhab/openhab-addons#8848

Signed-off-by: Wouter Born <github@maindrain.net>
2020-11-03 21:33:48 +01:00
Wouter Born
abd2630777
Upgrade Xtext/Xtend to 2.23.0 and LSP 0.9.0 (#1685)
Upgrades to:

* Xtext 2.23.0
* Xtend 2.23.0
* LSP 0.9.0

For Xtext release notes see: https://www.eclipse.org/Xtext/releasenotes.html#/releasenotes/2020/09/01/version-2-23-0

The Xtext dependencies are now managed using their BOM which makes it easier to keep them in sync.

Because Xtext depends on a newer ASM version some runtime dependencies were also upgraded:

* ASM 8.0.1
* Pax Web 7.2.15
* XBean 4.17.0

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-04 12:27:58 +02:00
Wouter Born
3bf2f4934d
Upgrade Maven compiler and fix/upgrade some TP dependencies (#1683)
Upgrades the compiler and its dependencies so the compiler results of Maven builds are more similar to those generated in recent Eclipse versions.

To fix compilation issues in Eclipse for add-ons using classes from javax.xml.stream several dependencies were upgraded/excluded.

Signed-off-by: Wouter Born <github@maindrain.net>
2020-10-02 23:36:37 +02:00
Wouter Born
f095b9a017
Update spotless to 2.0.3 (#1609)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-08-24 15:56:45 +02:00
Wouter Born
d3ea6063c0
Migrate to JUnit 5 (#1580)
* Migrates all tests to the JUnit 5 Jupiter API
* Updates bnd to 5.1.2
* Updates maven-surefire-plugin to 3.0.0-M5
* Updates Mockito to 3.4.6
* Updates Hamcrest to 2.2
* Removes org.openhab.core.boot POM dependencies

Signed-off-by: Wouter Born <github@maindrain.net>
2020-08-09 14:36:46 +02:00
Patrick Fink
32a819de92
Use version range for Super POM (#1579)
Signed-off-by: Patrick Fink <mail@pfink.de>
2020-08-06 20:37:21 +02:00
Wouter Born
29dfb967c4
Migrate to OpenAPI 3 annotations (#1576)
* Upgrade to Swagger 2.1.0
* Add missing root and events resources
* Fix wrong and add missing response implementations

Signed-off-by: Wouter Born <github@maindrain.net>
2020-08-02 13:21:57 +02:00
Wouter Born
02b13f5263
Update maven-javadoc-plugin to 3.2.0 (#1494)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-05-23 17:35:13 +02:00
Wouter Born
61e17ce39e
Upgrade SAT and Spotless, apply Spotless and enable check (#1446)
* Update SAT and Spotless dependencies
* Apply Spotless and enable check

Signed-off-by: Wouter Born <github@maindrain.net>
2020-04-26 11:15:24 +02:00
Wouter Born
ed4b5ff94b
Reconfigure and apply Spotless (#1442)
Adds a configuration for feature.xml files which will be necessary for https://github.com/openhab/static-code-analysis/pull/375

Also applies the results of running Spotless

Signed-off-by: Wouter Born <github@maindrain.net>
2020-04-23 17:17:12 +02:00
Kai Kreuzer
76153dcab0
Revert "Enabled spotless:check by default (#1303)" (#1366)
This reverts commit bb9308d8f5.
2020-02-13 21:41:35 +01:00
Mark Hilbush
2cf5931de2
Reenable javadoc generation (#1345)
Signed-off-by: Mark Hilbush <mark@hilbush.com>
2020-02-12 00:13:56 +01:00
Christoph Weitkamp
bb9308d8f5
Enabled spotless:check by default (#1303)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2020-02-12 00:07:18 +01:00
Arne Seime
e63db5f5c5 Added spotless plugin to build/plugins (#1334)
Signed-off-by: Arne Seime <arne.seime@gmail.com>
2020-01-28 16:53:10 +01:00
Christoph Weitkamp
2c8de49231 Applied spotless formatter (#1335)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2020-01-19 14:40:09 +01:00
Kai Kreuzer
9a6a54f113 switched to SAT 0.9.0 (#1331)
* switched to SAT 0.9.0
* added sat extension

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2020-01-18 11:07:18 +01:00
Wouter Born
18d0a52d02 Switch to Java 11 and drop Java 8 support (#1305)
Signed-off-by: Wouter Born <github@maindrain.net>
2020-01-12 22:32:28 +01:00
Wouter Born
3811cb9560 Update copyright headers to 2020 (#1309)
* Update copyright headers to 2020

Signed-off-by: Wouter Born <github@maindrain.net>
2020-01-01 18:06:34 +01:00
Christoph Weitkamp
800956598b Applied spotless formatter (#1302)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-12-30 22:55:19 +01:00
Christoph Weitkamp
59675788e0 Renamed packages
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-12-28 12:18:16 +01:00
jenkins
bc6a380297 [unleash-maven-plugin] Preparation for next development cycle. 2019-12-15 14:55:36 +00:00
Wouter Born
b1e949c50a Upgrade bnd to 4.3.0 (#1198)
For bnd 4.3.0 release notes, see:

https://github.com/bndtools/bnd/wiki/Changes-in-4.3.0

Also note:

    The Bnd Maven plugins are now marked thread safe and can be used with -T.

It seems to work well so far as long as the features are build after the bundles so I've added the bundles BOM as dependency to the features POM.
We still need to make SAT thread safe (openhab/static-code-analysis#200).

When disabling SAT you can build using one thread per processor core by executing:

    mvn clean install -DskipChecks -T 1C

This significantly speeds up Maven builds and puts all your processor cores to good use. :-)

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-11 20:00:38 +01:00
Wouter Born
fd3732eabe Upgrade Karaf tooling and openHAB TP to 4.2.7 (#1197)
For Karaf 4.2.7 release notes, see:

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345539

Also updates the following openHAB TP dependencies:

* Jetty 9.4.20.v20190813
* JNA 5.4.0 (used by most add-ons)

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-10 17:02:40 +01:00
Wouter Born
e943ec8970 Upgrade to Xtext 2.19, LSP4J 0.8.0 and fix LSP server (#1171)
Every connection to the LSP server failed because it always threw a org.eclipse.smarthome.model.ide.SitemapIdeSetup NoClassDefFoundError.
Which is caused by the SitemapIdeSetup residing in a package that is split between both the org.openhab.core.model.item.ide and the org.openhab.core.model.sitemap.ide bundles.
The SitemapIdeSetup class is also using classes from the org.eclipse.smarthome.model package which is also a package split between the org.openhab.core.model.items and org.openhab.core.model.sitemap bundles.
After renaming the packages used for the sitemap classes the NoClassDefFoundError is resolved and LSP works properly again.
Many imports were updated for the sitemap model package changes.

Fixes #1030

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-07 16:26:59 +01:00
Arne Seime
2bb19d587f Add source code formatting as part of build process using spotless maven plugin (#1101)
Signed-off-by: Arne Seime <arne.seime@gmail.com>
2019-11-03 22:40:36 +01:00
Wouter Born
f45aebca50 Update to SAT 0.8.0 (#1184)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-03 22:35:48 +01:00
Christoph Weitkamp
91617d8af8 Fixed POM XML Shema Definition path (#1119)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-12 08:52:16 +02:00
Kai Kreuzer
a44c55e0e0 Switched to latest super-pom (#1104)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-10-08 07:59:15 +02:00
Kai Kreuzer
8df8229f14 Removed repos as they are now inherited from the parent pom (#1011)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-08-30 11:43:17 +02:00
Christoph Weitkamp
b3802d565d [infrastructure] bump SAT to 0.7.0 (#1007)
* Bump SAT version; Fixed high priority findings
* Defined path to feature file to avoid warnings

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-08-29 09:17:35 +02:00
Markus Rathgeb
cf4a01063a bump super POM (#894)
Related to: https://github.com/openhab/infrastructure/issues/9

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-06-23 23:57:28 +02:00
Markus Rathgeb
024cc5d40e don't drop the itests projects from reactor on skipTests (#873)
The bnd-testing-maven-plugin that is used to run the tests already
checks for the skipTests property and do not execute any tests if
defined.
We should keep the integration tests part of the reactor also if the
tests are not executed.

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-06-20 17:23:51 +02:00
Wouter Born
7f5ceefa26 Upgrade Karaf tooling to 4.2.6 (#859)
For Karaf 4.2.5 release notes, see:
  https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345153

For Karaf 4.2.6 release notes, see:
  https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345365

Signed-off-by: Wouter Born <github@maindrain.net>
2019-06-10 19:15:43 +02:00
Wouter Born
7f5b8ca339 Use bnd for including resources to workaround infinite Eclipse builds (#842)
When "Build Automatically" is enabled in Eclipse, the build never ends.
It seems there is a bnd issue with the way resources are defined in the reactor POM.
The workaround seems to be to include all resources using bnd.

See also:

* https://github.com/bndtools/bnd/issues/3220
* https://github.com/openhab/openhab2-addons/issues/5554

Signed-off-by: Wouter Born <github@maindrain.net>
2019-06-01 12:54:24 +02:00
Patrick Fink
7d374a951f Carve out infrastructure stuff into an openHAB Super POM (#555)
* Inherit from openHAB Super POM

Signed-off-by: Patrick Fink <mail@pfink.de>
2019-05-29 08:16:46 +02:00
Markus Rathgeb
7780d0d133 Travis CI: check POM convention (#795)
* Travis CI: check POM convention

We could use Travis CI to execute some checks in front of the normal
build.

This change adds a check if the POM files follow our POM conventions.

If something fails, it show which files violates the convention and the
command that should be executed to fix the situation.

For example if the base POM file breaks the convention:

    At least one POM file breaks the convention, please use sortpom to fix the POM file(s).
    	modified:   pom.xml
    You should run the following command in the root directory of your working copy:
        mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines=true -Dsort.createBackupFile=false -Dsort.predefinedSortOrder=recommended_2008_06

* add sortpom plugin to verify phase
* do not use dependency reduced pom (use scope)

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-05-18 00:07:14 +02:00
Markus Rathgeb
b7b5dfc9fa POM Code Convention (#790)
There is a recommended ordering for all Maven POM files.
See: https://maven.apache.org/developers/conventions/code.html

The POM files has been "fixed" by using the "sortpom-maven-plugin".
The blank lines has been kept to keep the element separation for
readability.
The plugin also fixes indentation etc.
Have a look at: https://github.com/Ekryd/sortpom/wiki

The profile has been set to "recommended_2008_06" that states:
The POM Code Convention that was chosen by Maven developers in 2008

Command that has been executed:

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

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-05-05 17:47:41 +02:00
Markus Rathgeb
c4ae29917b Revert main part of DS requirements removal (#595)
This reverts the DS requirements removal of commit
981a447e99 which has been done on PR #530.

Fixes: https://github.com/openhab/openhab-core/issues/590
Related to: https://github.com/openhab/openhab-distro/pull/882

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-05-04 17:14:36 +02:00
Kai Kreuzer
5ae32f4f00 removed demo app as it moves to openhab-distro (#780)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-05-01 23:01:12 +02:00
Hilbrand Bouwkamp
ff57db8396 Added maven archetype project to generate binding skeletons (#589)
This archetype generates bindings for the new bnd based build system.
It also updates specific bundle files that need information about the new binding.

This doesn't yet include generation of test projects.

Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2019-04-26 13:03:28 +02:00
Markus Rathgeb
32845ef36d differ between min. karaf version (OSGi) und karaf compilation tooling (#740)
Related to: https://github.com/openhab/openhab-core/pull/723#issuecomment-483595667

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-04-16 22:41:27 +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
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
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
Wouter Born
65bdd2a983 Reenable SAT (#626)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-14 19:48:28 +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
Wouter Born
48d873a32b Use openHAB license headers (#632)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-03-06 16:10:00 +01:00
Kai Kreuzer
981a447e99 (Temporarily) removed DS requirements generation to make addon repos compile (#530)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-02-05 08:57:11 +00:00