Commit Graph

65 Commits

Author SHA1 Message Date
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
Markus Rathgeb
68efabe63c enable nullness checks on Maven build again (#529)
Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-05 09:33:15 +01:00
Markus Rathgeb
e4c8f0b863 check java version range (#523)
The version 1.8.0_25 is know to be incompatible with our code base.
Java > 1.8 should not work with our currently used Xtext version.

Related to: https://github.com/openhab/openhab-core/issues/522

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-04 14:18:50 +01:00
Markus Rathgeb
c59dd21044 WAR: ignore Eclipse IDE integration of bnd indexer temporary (#511)
Related to: https://github.com/openhab/openhab-core/pull/467#issuecomment-456362798

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-01 16:08:44 +01:00
Markus Rathgeb
4c856476a0 attach source artifact of "bundles" (#500)
Fixes: https://github.com/openhab/openhab-core/issues/496

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-02-01 09:04:17 +01:00
Markus Rathgeb
60d51f92c2 add property to enable bnd resolver on Maven run (#494)
The property `withResolver` binds the `resolve` goal of the
`bnd-resolver-maven-plugin` to the `package` phase.

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-01-31 11:28:31 +01:00
Kai Kreuzer
dec4ad997d Export all org.openhab packages (except internal ones) (#492)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-01-31 05:12:04 +00:00
Markus Rathgeb
76dd62623f make a first step to split between pure JUnit and integration tests (#488)
* make a first step to split between pure JUnit and integration tests

Related to: https://github.com/openhab/openhab-core/issues/482

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-01-30 08:57:06 +01:00
Wouter Born
c4f1fc3cfa Remove duplicate import (#487)
Signed-off-by: Wouter Born <eclipse@maindrain.net>
2019-01-29 15:42:16 +00:00
Markus Rathgeb
a37cceab67 mavenize openHAB and integrate mavenized ESH repository (#467)
* mavenize openHAB and integrate mavenized ESH repository

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
2019-01-28 13:07:31 +01:00
Hilbrand Bouwkamp
f9394266f2 Updated license url in pom.xml to epl-2.0 (#468)
Signed-off-by: Hilbrand Bouwkamp <hilbrand@h72.nl>
2019-01-18 23:18:48 +01:00
Kai Kreuzer
10acf5cf46 Changed license from EPL v1 to EPL v2 (#466)
* updated license headers
* added NOTICE files
* moved about.html to NOTICE files
* changed main project license
* updated build.properties
* added files to check to prevent error about missing about.html
* removed license info on p2 feature

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2019-01-16 22:59:49 +01:00
openhab-bot
61e21d4866 [unleash-maven-plugin] Preparation for next development cycle. 2018-12-16 21:49:16 +00: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
CloudBees DEV@Cloud
cabe7c4528 [unleash-maven-plugin] Preparation for next development cycle. 2018-05-28 01:54:21 +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
Wouter Born
0734e74fb7 Fix duplicate directory-maven-plugin declaration (#308)
Signed-off-by: Wouter Born <eclipse@maindrain.net>
2018-03-12 11:47:32 +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
CloudBees DEV@Cloud
5c6bfba450 [unleash-maven-plugin] Preparation for next development cycle. 2017-12-17 23:40:22 +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
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
VelinYordanov
0cbb237e7b Changed the poms hierarchy (#225)
Signed-off-by: VelinYordanov <velin.iordanov@gmail.com>
2017-12-10 01:04:42 +01:00
Patrick Fink
9855e439a5 Final changes for initial release automation process (#223)
* Update versions plugin to version 2.5 (makes property mapping obsolete)

Signed-off-by: Patrick Fink <mail@pfink.de>

* Update maven unleash plugin to newest version

Signed-off-by: Patrick Fink <mail@pfink.de>
2017-10-16 09:46:39 +02:00
Patrick Fink
a1e10ccea7 Add maven-unleash-plugin for automated release process + add some properties to be able to do shadow releases (#204)
Signed-off-by: Patrick Fink <mail@pfink.de>
2017-09-21 08:18:23 +02:00
Martin van Wingerden
6fcb85b311 Version bump to version 2.2.0-SNAPSHOT (#160)
Signed-off-by: Martin van Wingerden <martinvw@mtin.nl>
2017-06-29 08:45:25 +02:00
Kai Kreuzer
c8486db1a0 restructured poms (#131)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-04-07 03:42:23 -07:00
Kai Kreuzer
8a3a4470e5
switched to Artifactory instance for snapshots
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-04-03 10:59:56 +02:00
Kai Kreuzer
47461cf54d Updated to Tycho 1.0.0
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-03-03 18:51:06 +01:00
Kai Kreuzer
222f0d3125 added jetty-proxy (#120)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-02-18 07:47:46 +01:00
Kai Kreuzer
ceef9a9fe0
moved on to 2.1.0-SNAPSHOT
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-01-20 10:48:55 +01:00
Kai Kreuzer
c2b732d198
added prepare-release profile
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2017-01-15 22:47:37 +01:00
Kai Kreuzer
99b64815c9 replaced io.transport.serial bundle by nrjavaserial bundle in the target platform (#104)
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-12-28 13:10:41 +01:00
Kai Kreuzer
138d73533e Feature installation improvements (#99)
- switched to Karaf 4.0.8
- used bulk feature installation
- synchronised methods to avoid concurrent operations
- fixed issue where dashboard bundle might bind the addons configuration

Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-12-22 00:05:12 +01:00
Christian Häussler
1faec62615 Correct openhab-core URLs
Signed-off-by: Christian Häussler <c-n-i@web.de> (github: @cniweb)
2016-12-11 23:51:24 +01:00
Kai Kreuzer
6a773ba0de moved over to ESH 0.9.0-SNAPSHOT (#49) 2016-06-17 11:21:43 +02:00
Kai Kreuzer
c55513a8c0 switched to snapshot
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-05-21 14:00:58 +02:00
Kai Kreuzer
8bd77e32c5 Releasing 2.0.0.b3
Signed-off-by: Kai Kreuzer <kai@openhab.org>
2016-05-21 13:51:10 +02:00