Commit Graph

73 Commits

Author SHA1 Message Date
Kai Zimmermann
8ce8d8e571 Fixed DMF sending out wrong message if action on CANCELING
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-09-05 09:17:15 +02:00
SirWayne
a1a7a6dc45 Adapt test to new json path
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-08-29 17:11:33 +02:00
Kai Zimmermann
16f4654ce0 Removed Jackson version override
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-29 10:31:28 +02:00
kaizimmerm
9eee1985e2 Upgrade jackson.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-08-25 14:55:13 +02:00
Kai Zimmermann
7f68aedd78 Merge branch 'master' into feature_boot_13_sec_41
Conflicts:
	hawkbit-artifact-repository-mongo/src/test/java/org/eclipse/hawkbit/artifact/FreePortFileWriter.java
	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/FreePortFileWriter.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-19 08:35:58 +02:00
Kai Zimmermann
4b58d83e01 Upgarde boot and sec to newest patch version.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-08-18 14:54:32 +02:00
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
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
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
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
kaizimmerm
e285495c88 Fixed tests.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-11 12:24:33 +02:00
kaizimmerm
04dad8d6de Started migration for Boot 1.3 and Security 4.1
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
2016-07-07 12:39:40 +02:00
SirWayne
7e32cbd21c Add table items comparison to enable save button
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-28 17:38:21 +02:00
Kai Zimmermann
7857107b46 Merge pull request #217 from bsinno/feature_configurable_mgmt_sim_scenario
Feature configurable mgmt sim scenario
2016-06-23 10:08:21 +02:00
Kai Zimmermann
717a23671e Propr rabbit client version handling in parent POM.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-22 12:31:35 +02:00
Michael Hirsch
dfa547d382 update jacoco version
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-21 11:14:22 +02:00
SirWayne
1b4d73bd13 Merge branch 'master' into feature_rollouts_credentials
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 09:53:06 +02:00
Dominic Schabel
4523032e97 Property for maven scm plugin introduced
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-06-13 16:45:40 +02:00
Kai Zimmermann
f532a0907c Merge branch 'eclipsemaster' into feature_asynchronous_health
Conflicts:
	pom.xml


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-13 12:51:26 +02:00
Dominic Schabel
a81ecb418e Fixed some maven warnings and introduced compiler output within a maven build
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-06-10 17:22:58 +02:00
Kai Zimmermann
cc7cb20b3e Upgrade hateoas that removes transitive dependency that failed IP check.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-09 17:50:45 +02:00
Kai Zimmermann
d9046bb9cc Upgraded Spring AMQP. Added task scheduler. Improved executor shutdown.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-07 18:38:39 +02:00
Kai Zimmermann
aab25030cf Merge branch 'master' into feature_create_repo_api 2016-06-03 12:40:04 +02:00
Michael Hirsch
92e1d78df3 exclude .sonar directory from license check
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-03 07:47:22 +02:00
Kai Zimmermann
4bea2ae1a5 Merge remote-tracking branch 'eclipse/master' into feature_split_repo_into_api_impl 2016-06-01 09:23:43 +02:00
Kai Zimmermann
7a98c58407 refactored test data generation. Refactored entity factor methods.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-31 08:51:49 +02:00
Michael Hirsch
7b20122f09 Merge pull request #189 from bsinno/fix_widgetset_clean_recompilation
move widgetset to src/main/resources and remove cleaning of widgeset
2016-05-25 12:22:46 +02:00
Kai Zimmermann
cf450dabfa Merge remote-tracking branch 'eclipse/master' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
#	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/Target.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-24 21:51:59 +02:00
Kai Zimmermann
d59ebaebd8 Merge pull request #181 from bsinno/Feature/Add_Rest_Api_with_Java_client
Feature/add rest api with java client
2016-05-24 16:11:25 +02:00
SirWayne
57153b1244 Remove commons.lang 2.3
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-24 10:45:07 +02:00
Kai Zimmermann
8b7b24125f Merge remote-tracking branch
'origin/Feature/Add_Rest_Api_with_Java_client' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-20 17:42:55 +02:00
Michael Hirsch
fe1e2f74e7 exclude compiled vaadin widgetset from license check
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-20 14:25:03 +02:00
Kai Zimmermann
3c0d5396b0 Removed default implementations as JaCoCo has problems with those. Split
software management.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 16:16:30 +02:00
SirWayne
5bb24c78ad Remove and Rename modules
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-18 13:48:04 +02:00
Kai Zimmermann
9d6527a3e2 Switched back to Boots default logger: logback
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-18 09:03:58 +02:00
SirWayne
eb3f9f6f2d Fix header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:24:14 +02:00
SirWayne
806a0531f2 Merge branch 'Feature/Add_Rest_Api_with_Java_client' of
https://github.com/bsinno/hawkbit.git into
Feature/Add_Rest_Api_with_Java_client

Conflicts:
	README.md


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 16:13:42 +02:00
SirWayne
354ed91fa7 Merge branch 'master' into Feature/Add_Rest_Api_with_Java_client
Conflicts:
	examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/Start.java
	examples/hawkbit-mgmt-api-client/pom.xml
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleTypeBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TagBuilder.java
	examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TargetBuilder.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/ArtifactStoreController.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/DataConversionHelper.java
	hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEventProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/BaseSwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleAddUpdateWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/CreateUpdateSoftwareTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadHandler.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/table/AbstractTableHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ProxyTarget.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ManageDistBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterTable.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CustomTargetBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterQueryValidation.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/event/CustomFilterUIEvent.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/LoginView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/CreateUpdateDistributionTagLayoutWindow.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/CreateUpdateTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.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
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/CreateUpdateTargetTagLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/AddUpdateRolloutWindowLayout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/DistributionBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/ProxyRollout.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/ProxyRolloutGroup.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupsListHeader.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsBeanQuery.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss
	hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss
	hawkbit-ui/src/main/resources/messages.properties
	hawkbit-ui/src/main/resources/messages_de.properties
	hawkbit-ui/src/main/resources/messages_en.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-17 11:16:18 +02:00
SirWayne
f33c8c05e2 Add download server api
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-05-03 12:52:53 +02:00
SirWayne
3c46c8902f Add examples to pom
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-28 12:58:27 +02:00
Jonathan Philip Knoblauch
a958576e2e Moved dependencies to parent pom and added missing dependency
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-28 07:39:36 +02:00
Kai Zimmermann
5c86d2ad68 Upgrade Vaadin and MariaDB to newest stable version.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-04-26 17:36:19 +02:00
SirWayne
c2649b4b54 Add example feign core project
add system client api


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-26 16:19:37 +02:00
SirWayne
c3c405c986 Rename and split rest resources ddi, mgmt and system
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-04-20 17:33:03 +02:00
Jonathan Philip Knoblauch
3145709824 Move DDI resources and annotation to module hawkbit-ddi-resource
- created module and moved resources

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-18 12:39:28 +02:00
Jonathan Philip Knoblauch
22f4d9ffcf Created hawkbit-ddi-api maven module and resource interfaces for the module
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
2016-04-15 12:37:40 +02:00
Kai Zimmermann
2b4b715472 Created another hawkBit app example that demonstrates theme
custimization.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-03-30 14:31:03 +02:00
Kai Zimmermann
2739fee158 Upgraded Vaadin to 7.6.4 2016-03-22 14:56:41 +01:00
asharani-murugesh
578bd66b28 merged master
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
2016-03-06 09:26:53 +01:00