Commit Graph

1734 Commits

Author SHA1 Message Date
Jonathan Philip Knoblauch
09bf04ed2c Fix for the Bug
- deleted targets are now considered when calculating threshold for success condition
- added junit test 

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-11-02 15:39:16 +01:00
Michael Hirsch
a0f98529e6 fix determination of current tenant security context (#333)
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-31 23:43:00 +01:00
Michael Hirsch
3b869e215e fix current tenant when not an UserPrincipal
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-31 15:46:52 +01:00
Michael Hirsch
22272ba3c1 Feature hawkbit uaa extension (#317)
* use UserPrincipal to determine tenant at runtime

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* add hawkbit-uaa extension

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* adapt WithSpringAuthorityRule with UserPrincipal for determine tenant

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* fix String principal in DDI download resource

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* merge the email to the UserPrincipal from the master manually

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>

* Fixed some grammar issues and typos

Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-10-31 13:16:03 +01:00
Kai Zimmermann
b7f5bf3d79 Merge pull request #322 from bsinno/fix_optimize_repository
Removed external artifact from repository.
2016-10-27 15:29:58 +02:00
Michael Hirsch
2488995c1a Merge pull request #330 from bsinno/fix_type_tag_colorchange_detail
fix add and update tags and type color change details
2016-10-27 10:00:11 +02:00
Michael Hirsch
3bd1c93189 fix add and update tags and type color change details
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-27 10:00:11 +02:00
Michael Hirsch
39712b90a3 fix NPE on color picking on dist and software types
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-27 08:25:22 +02:00
Michael Hirsch
b2a16613c5 remove unnecessary methods for getting artifact by id
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-27 08:24:57 +02:00
Kai Zimmermann
e97ed04c94 Adapted sandbox setup to current master (#327)
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-27 08:24:26 +02:00
kaizimmerm
1d0028ce9e Fixed paramter name.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-25 19:47:13 +02:00
kaizimmerm
14f07c1f82 Fixed potential orderByDistId null problem
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-22 07:12:19 +02:00
Michael Hirsch
1033587078 Merge pull request #325 from bsinno/deployment_example_apps
add repo.eclipse.org distribution management for example deploy
2016-10-21 09:13:42 +02:00
Michael Hirsch
f73156ca24 add repo.eclipse.org distribution management for example deploy
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-21 09:13:08 +02:00
Kai Zimmermann
3f49567cdc Optimize rollout group start (#318)
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-20 16:27:33 +02:00
Kai Zimmermann
21d8636811 Merge pull request #321 from bsinno/fix_npe_filter_token_suggestion
add npe check for current token
2016-10-20 16:25:28 +02:00
kaizimmerm
5d9436d312 Fix sonar issues
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-20 15:26:06 +02:00
kaizimmerm
e2281ac67b Removed further unnedded repo methods.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-20 14:57:07 +02:00
Kai Zimmermann
84ddb340d7 Download gravatar if email is known. (#320)
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-20 12:49:08 +02:00
kaizimmerm
0332d31146 Removed external artifact from repository.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-10-20 12:03:17 +02:00
Michael Hirsch
37c711c84e add npe check for current token
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-20 08:31:47 +02:00
Michael Hirsch
ec874232d3 Merge pull request #298 from bsinno/feature_target_filtering_supports_overdue
Feature target filtering supports overdue
2016-10-19 15:59:21 +02:00
Marcel Mager (INST-IOT/ESB)
ce26af149a Merge branch 'master' into feature_target_filtering_supports_overdue 2016-10-18 14:14:49 +02:00
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
Michael Hirsch
e1557b257d Merge pull request #316 from bsinno/fix_flyway_migration_order
fix flyway migration order
2016-10-18 07:59:23 +02:00
Michael Hirsch
f22ef57f4f fix flyway migration order
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-10-18 07:58:06 +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