Commit Graph

3321 Commits

Author SHA1 Message Date
Michael Hirsch
271ee88d12 remove unnecessary property declaration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-28 10:38:29 +02:00
Michael Hirsch
1224221e8c sonar pom hygiene
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-28 10:09:51 +02:00
Michael Hirsch
069818fec6 Merge pull request #244 from bsinno/feature_multiunassignment_soft_mod
Feature multiunassignment soft mod
2016-07-28 09:35:37 +02:00
kaizimmerm
b6506380ad Merge branch 'master' into feature_boot_13_sec_41
Conflicts:
	hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java
	hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java
	pom.xml


Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-27 15:29:54 +02:00
kaizimmerm
99adab1a5f Fixed license header and entity scan.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-27 14:51:18 +02:00
GAH6KOR
5bc4b04039 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-26 10:16:44 +02:00
Michael Hirsch
7a32d931b5 improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 17:12:56 +02:00
Michael Hirsch
5ae190c8c3 improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 17:11:04 +02:00
Michael Hirsch
2ad6f6946f improve code quality
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 16:19:14 +02:00
Gaurav
b919dd7146 Fix for the selenium testcase failure 2016-07-25 15:52:27 +02:00
Gaurav
f4566d72ac Merge branch 'feature_multiunassignment_soft_mod' of https://github.com/bsinno/hawkbit/ into feature_multiunassignment_soft_mod 2016-07-25 14:44:44 +02:00
Gaurav
b97f787a8a Formatted the code 2016-07-25 14:39:51 +02:00
Gaurav
e2d435b68c Merge branch 'master' into feature_multiunassignment_soft_mod
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
2016-07-25 14:05:18 +02:00
Michael Hirsch
b7ca552c2f Merge branch 'master' into Feature_Improve_Code_Quality 2016-07-25 13:36:18 +02:00
Michael Hirsch
a04333b393 re-insert the method cleanMessageHeaderProperties
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 13:30:58 +02:00
Michael Hirsch
ebf2c15da9 use private method getEntityFactory()
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 12:07:35 +02:00
Kai Zimmermann
a978662812 Merge pull request #226 from bsinno/feature_ui_metadata
Management UI DS and SM metadata mgmt
2016-07-25 12:03:57 +02:00
Michael Hirsch
2f263faca0 suppress warning for multiple checked exception declaration
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 12:01:28 +02:00
Michael Hirsch
7e94c9f684 write comment in constructor why necessary
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:58:11 +02:00
Michael Hirsch
227267af88 avoid more than 3 nested if/switch/try blocks
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:18:05 +02:00
Michael Hirsch
40a12c0321 remove unnecessary IOException from method signature
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:16:37 +02:00
Michael Hirsch
400c8bafcf move method to the right inner class
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 11:10:59 +02:00
Michael Hirsch
9727af7a99 don't use getBytes using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:54:05 +02:00
Michael Hirsch
928ad1520b remove port 8080 to fix tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:39:55 +02:00
Michael Hirsch
812498d2fe don't use constructor using default encoding
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:22:35 +02:00
Michael Hirsch
82fa485ddc suppress warning squid:S2221
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:13:07 +02:00
Michael Hirsch
f3b472bcd2 Merge branch 'master' into Feature_Improve_Code_Quality
Conflicts:
	hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/eventbus/CacheFieldEntityListener.java
	hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/SystemSecurityContext.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactBeanQuery.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-25 10:08:24 +02:00
Michael Hirsch
3e4f76cca6 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-22 15:16:38 +02:00
Michael Hirsch
2d58cfcc59 Merge branch 'master' into feature_ui_metadata 2016-07-22 15:14:37 +02:00
Kai Zimmermann
0380fdf8ba Merge pull request #255 from bsinno/fix_upgrade_collections
Upgrade Apache Collections to 4.1 due to known vulnerability.
2016-07-21 12:52:35 +02:00
GAH6KOR
02e96fa079 Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-21 12:41:56 +02:00
GAH6KOR
5f1db53def Removed the extra level of abstraction and modified the code
accordingly.
2016-07-21 12:39:54 +02:00
kaizimmerm
1c70527083 Upgrade Apache Collections to 4.1 due to known vulnerability.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-21 11:44:41 +02:00
kaizimmerm
2e416d0027 Using same plugin for weave and metamodel
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-21 10:39:57 +02:00
Kai Zimmermann
8a4e952bdb Merge pull request #252 from bsinno/feature_upgrade_spring_amqp
Upgrade Spring AMQP to 1.6.1
2016-07-21 10:38:54 +02:00
Kai Zimmermann
6eadd6a3eb Merge pull request #251 from bsinno/feature_rsql_last_poll
Added feature to query by last target poll.
2016-07-21 10:38:09 +02:00
Michael Hirsch
adb60156f8 Merge pull request #254 from bsinno/add_hawkbit_logo_to_readme
Add hawkbit logo to readme
2016-07-21 09:39:19 +02:00
Michael Hirsch
af00f3aa1b resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:32:53 +02:00
Michael Hirsch
2fe670b57f resize image
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:27:04 +02:00
Michael Hirsch
d12bd8c2db try out image tag for resize
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-21 08:26:10 +02:00
Michael Hirsch
4bc5bb2dd3 Merge pull request #253 from bsinno/fix_initial_tenant_creation
remove caching from jpa_system_management
2016-07-20 19:35:26 +02:00
Michael Hirsch
b04755eda8 remove caching from jpa_system_management
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 18:05:21 +02:00
Dominic Schabel
fd749a9d69 Minor review comments added.
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-07-20 18:03:28 +02:00
Michael Hirsch
5a6d656b75 add hawkbit logo to readme.md
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-07-20 16:51:01 +02:00
GAH6KOR
7afb2f996f Merge branch 'master' into feature_enable_push_in_deployment_view 2016-07-20 12:31:28 +02:00
Kai Zimmermann
1ae3b4bcbb Upgrade Spring AMQP to 1.6.1
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-07-20 11:45:53 +02:00
GAH6KOR
b92794c5ef Merge branch 'feature_multiunassignment_soft_mod' of https://github.com/bsinno/hawkbit/ into feature_multiunassignment_soft_mod 2016-07-20 11:02:24 +02:00
GAH6KOR
79823b2930 Merge branch 'master' into feature_multiunassignment_soft_mod 2016-07-20 11:01:15 +02:00
Kai Zimmermann
2ad5d8cfb1 Added feature to query by last target poll.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-07-20 10:34:19 +02:00
Michael Hirsch
03fecba57d Merge branch 'master' into feature_ui_metadata 2016-07-19 19:12:31 +02:00