lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
931 Commits 1 Branch 0 Tags
4bea2ae1a5dac28704283f90a554df2a13a6f92f
Commit Graph

931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1881880cd9 Added findactions method. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-06-01 09:21:51 +02:00
Kai Zimmermann
13f9791891 Removed JPA dependencies from runtime. Test only now. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-31 20:50:22 +02:00
Kai Zimmermann
e054a171ea Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 12:29:05 +02:00
Kai Zimmermann
91fd94b356 Migrated MySQL schema creation to test package. Small doc improvements 
on testdatafactory.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-31 12:28:24 +02:00
Michael Hirsch
1117bbebbb re-add json dependency for tests 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 11:29:41 +02:00
Michael Hirsch
a8bca3dc12 fix sonar issue unused local variable 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 11:07:02 +02:00
Michael Hirsch
310071dd62 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 11:01:17 +02:00
Michael Hirsch
252f409912 fix generic wildcard 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 11:01:04 +02:00
SirWayne
965e283f42 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 10:56:17 +02:00
SirWayne
f1e3406b97 Move jackson dependendy from repo to rest-core 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-31 10:56:10 +02:00
Michael Hirsch
32e5d36f10 Merge branch 'feature_split_repo_into_api_impl' of https://github.com/bsinno/hawkbit.git into feature_split_repo_into_api_impl 2016-05-31 10:50:20 +02:00
Michael Hirsch
62a2e2cdb4 introduce own interfaces for registering the currentTenantKeyGenerator 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 10:50:10 +02:00
SirWayne
b14d3bbd3c Small fixes 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-31 10:50:09 +02:00
Michael Hirsch
14cb962f42 fix sonar rule don't use generic wildcard 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 10:50:09 +02:00
Michael Hirsch
c2cb42df61 add javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 10:50:08 +02:00
SirWayne
a0ec726fd0 Small fixes 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-31 10:48:56 +02:00
Michael Hirsch
b1a2a583e9 fix mock test by mocking action and target 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 09:21:40 +02:00
Michael Hirsch
002e0d3048 Merge branch 'feature_split_repo_into_api_impl' of 
https://github.com/bsinno/hawkbit.git into
feature_split_repo_into_api_impl

Conflicts:
	hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java


Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 08:54:51 +02:00
Michael Hirsch
b369369c2c add javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 08:52:09 +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
2d90900f37 fix javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-31 08:48:06 +02:00
Kai Zimmermann
a4e0fc2457 Fixed a broken query. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-27 16:04:37 +02:00
Kai Zimmermann
53156cb16f Javadoc, sonar issue, package cycles. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-27 15:25:08 +02:00
Kai Zimmermann
e6ff96dc5a Completed maven module split. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-27 13:30:18 +02:00
Kai Zimmermann
eeee57fbc4 Refactored package names. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-26 14:03:14 +02:00
Kai Zimmermann
f2e13b8d22 Split into separate maven modules. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-25 17:43:57 +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
608ffcecf4 Merge pull request #162 from bsinno/fix_create_filter_has_different_layout_than_rollout_and_the_other_widgets 
Create filter has different layout than rollout and the other widgets
 2016-05-24 18:08:09 +02:00
Kai Zimmermann
1e91643b83 Adapted repo scan 2016-05-24 18:04:09 +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
c06c2e546e Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client 2016-05-24 15:08:33 +02:00
SirWayne
dc74ec8889 Some rework for the pull request 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-24 15:08:07 +02:00
Michael Hirsch
18c8f55f62 Merge branch 'Feature/Add_Rest_Api_with_Java_client' of https://github.com/bsinno/hawkbit.git into Feature/Add_Rest_Api_with_Java_client 2016-05-24 10:48:25 +02:00
Michael Hirsch
ee6566081b adding or fix javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-24 10:48:17 +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
9301de096c Worked on the interfaces and documentation. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-22 08:48:47 +02:00
Kai Zimmermann
f0a78369f2 Continued on the model API extraction. Merged rest api split branch. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-21 21:01:23 +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
Kai Zimmermann
e3041aa9ae Started to split the actual model. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-05-20 17:25:38 +02:00
Michael Hirsch
1fa335dedd fix license header in pom file 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-20 15:35:15 +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
Michael Hirsch
47e254e14e move widgetset to src/main/resources and remove cleaning of widgeset 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-20 13:56:36 +02:00
SirWayne
f9ed3b305d Move annotation 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-05-19 18:28:09 +02:00
Michael Hirsch
088da91fde fix typo in readme.md 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-19 17:21:10 +02:00
Michael Hirsch
355218f7b7 Merge pull request #185 from bsinno/fix_flashing_whitepage_on_login_application 
fix_flashing_whitepage_on_login_application
 2016-05-19 14:02:28 +02:00
Michael Hirsch
08f0a9837f Merge pull request #184 from bsinno/fix_display_DSNameVersion_actionhistory_table 
Fix display ds name version actionhistory table
 2016-05-19 14:02:08 +02:00
Michael Hirsch
32ae3b7233 Merge pull request #183 from bsinno/feature_switch_back_boot_logback 
Switch back Spring Boots default logger implementation logback
 2016-05-19 13:23:56 +02:00
Michael Hirsch
5f8a2bebef add license header to logback.xml 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-05-19 12:57:32 +02:00