Commit Graph

1709 Commits

Author SHA1 Message Date
Marcel Mager (INST-IOT/ESB)
3b47d43dec Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaDeploymentManagement.java
	hawkbit-repository\hawkbit-repository-jpa\src\main\java\org\eclipse\hawkbit\repository\jpa\JpaTargetManagement.java
	hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetBeanQuery.java
	hawkbit-ui\src\main\java\org\eclipse\hawkbit\ui\management\targettable\TargetTable.java


Signed-off-by: Marcel Mager (INST-IOT/ESB) <Marcel.Mager@bosch-si.com>
2016-10-18 12:57:10 +02:00
Kai Zimmermann
c7129e6ed7 Optimisation and bug fixing of UI push events (#310)
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-17 21:59:53 +02:00
Dominik Herbst
39610b3730 Adding missing private constructor
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-14 10:53:17 +02:00
Dominik Herbst
d81619a1a0 Refactored TimestampCalculator to be static and adjusted tests using PowerMock.
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-14 10:32:10 +02:00
Dominic Schabel
36656826f8 Fixed review comment: Don't use "Booleans.countTrue(...)"
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-10-13 17:22:53 +02:00
Dominik Herbst
86cba3c8bf Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties
2016-10-13 10:59:12 +02:00
Dominik Herbst
89687952d3 Improved code readability.
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-13 09:46:53 +02:00
kaizimmerm
43511ed63e Fixed test.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-13 09:17:24 +02:00
Kai Zimmermann
c4faf4b5af Merge pull request #297 from bsinno/feature_multi_known_hashes_for_issuer_hash_based_auth
Feature multi known hashes for issuer hash based auth
2016-10-13 06:09:21 +02:00
Dominik Herbst
05cebdba54 Used HeaderAuthentication for getPreAuthenticatedPrincipal. Improved test
quality.

Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-12 15:43:39 +02:00
Kai Zimmermann
cb65ceae6d Merge pull request #299 from bsinno/feature_auto_assignment
Added auto assign distribution set to target filter query feature
2016-10-12 15:27:03 +02:00
Dominik Herbst
f768c16e94 Set initial capacity for new ArrayList or replaced the usage of ArrayList.
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-12 14:41:41 +02:00
Dominik Herbst
771da69fca Fixed SpecificationsBuilder to support immutable Collections and added a test for it
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-12 14:41:13 +02:00
Kai Zimmermann
a3e53596b7 Add maven central badge
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-12 12:11:29 +02:00
Dominik Herbst
0e6f2e01cf Merge branch 'master' into feature_auto_assignment_squashed 2016-10-07 14:57:11 +02:00
Michael Hirsch
913ffd772e Merge pull request #314 from bsinno/example_module_profile
Example module profile
2016-10-07 08:29:57 +02:00
Michael Hirsch
0f9da64c7e introduce nonExampleApp profile for building examples without boot apps
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-07 08:28:03 +02:00
kaizimmerm
e469b8fad2 reenabled examples on Bosch fork to allo IoT SP release.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-06 16:14:23 +02:00
Michael Hirsch
81bb2fb2aa Merge pull request #313 from bsinno/change_scm_information
change scm information for releasing hawkbit
2016-10-06 11:25:12 +02:00
Michael Hirsch
c427503c19 change scm information for releasing hawkbit
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-06 11:25:04 +02:00
Michael Hirsch
a0fd241243 Merge pull request #312 from bsinno/enable_test_report_via_profile
enable test-report generation via profile
2016-10-06 10:25:22 +02:00
Michael Hirsch
3baacf7915 enable test-report generation via profile
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-06 10:20:10 +02:00
Michael Hirsch
8af0b06127 Merge pull request #311 from bsinno/remove_examples_from_modules
remove examples from maven-modules.
2016-10-06 09:40:45 +02:00
Michael Hirsch
c018fdd039 remove examples from maven-modules.
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-06 09:39:14 +02:00
Michael Hirsch
76bf691242 Merge pull request #309 from bsinno/skip_example_deploy
skip example maven deploy, due the size of the example app
2016-10-06 09:02:56 +02:00
Michael Hirsch
f139c8dafd skip example maven deploy, due the size of the example app
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-06 09:02:45 +02:00
Dominik Herbst
97ab881d6e Code improvements
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-05 12:46:21 +02:00
Dominik Herbst
4785f36b34 Merge branch 'master' into feature_target_filtering_supports_overdue
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
2016-10-05 09:22:04 +02:00
Michael Hirsch
f4a88488e4 Merge pull request #292 from bsinno/feature_rsql_parser_suggestion
Feature rsql parser suggestion
2016-10-05 09:05:25 +02:00
Dominik Herbst
41955b7671 Changed VirtualPropertyResolver to accept TimestampCalculator in the constructor
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-04 16:21:17 +02:00
Dominik Herbst
1063c91724 Creating AutoAssignScheduler and Checker in the Configuration class
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-04 14:27:41 +02:00
Kai Zimmermann
a36249f6dd Fix DMF api break (#306)
Fixed upper to lowever case change that was introduced with the new
property based JSon generator. Could be considered an API break.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-04 12:56:58 +02:00
Dominik Herbst
339f45ca6a Fixed sanitizing of filter query sort parameters. Corrected name of TargetManagement method
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-04 11:57:56 +02:00
Jonathan Philip Knoblauch
8c7af7d28d More refactoring (added early returns)
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-10-04 10:16:08 +02:00
Dominik Herbst
f481e097db Using AutoAssignProperties with EnableConfigurationProperties. Code quality improvements.
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-10-04 08:19:44 +02:00
Dominik Herbst
38bd54fe6e Code quality impovements, additional tests to find target filter queries
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-30 14:26:20 +02:00
Jonathan Philip Knoblauch
fa3cee62bf Refactoring after review
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-09-30 13:04:58 +02:00
Michael Hirsch
eccce5cc5b merge master
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-30 09:28:20 +02:00
Michael Hirsch
a8ad0d7d5e Merge pull request #304 from bsinno/fix_dmf_api
Fix DMF api usage by simulator
2016-09-30 09:14:35 +02:00
kaizimmerm
de6b5cd93d Optimized array allocation
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-30 09:12:39 +02:00
kaizimmerm
e08962cf8f Fixed broken DMF API collection handling
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-30 08:57:18 +02:00
Michael Hirsch
a23b6bcc40 hawkBit pom release preparations
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-28 15:57:52 +02:00
Dominik Herbst
78e9705886 Corrected messages
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-28 14:46:33 +02:00
Michael Hirsch
9644830e97 Merge pull request #303 from bsinno/pom_release_prepartions
hawkBit pom release preparations
2016-09-28 14:40:14 +02:00
Michael Hirsch
fb800d5f33 hawkBit pom release preparations
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-28 14:39:39 +02:00
Dominik Herbst
b1d9930d94 Optimized implementation of VirtualPropertyReplacer.
Added auto configuration for VirtualPropertyResolver.

Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-28 13:54:54 +02:00
Michael Hirsch
849ba45d69 Merge pull request #302 from bsinno/pom_release_prepartions
hawkBit pom release preparations
2016-09-28 11:26:20 +02:00
Dominik Herbst
12b0ffa614 Removed .editorconfig
Signed-off-by: Dominik Herbst <dominik.herbst@bosch-si.com>
2016-09-28 11:04:07 +02:00
Kai Zimmermann
5c53bef164 Configurable download URL generation (#296)
Configurable download URL generation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-09-28 09:18:03 +02:00
Michael Hirsch
9ee9ed16ce hawkBit pom release preparations
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-09-28 08:02:44 +02:00