lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
2,240 Commits 1 Branch 0 Tags
193603282af6afa4e8a368e49e1ffa23f88dfb02
Commit Graph

117 Commits

Author SHA1 Message Date
Bondar Bogdan
c68c5a6f5b Feature event publishing (#884) 
* refactored code to use EventPublisherHolder for publishing application events where possible

Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch-si.com>

* fixed comment

Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch-si.com>
 2019-08-14 09:08:23 +02:00
Bondar Bogdan
379726a697 Feature enable cors (#854) 
* enabled cors in security configuration, added corresponding properties
* added test for cors validation
* formatting
* added mariadb test dependency and refactored test
* added database listeners to the test
* Remove dependency duplicate

Signed-off-by: Bogdan Bondar <Bogdan.Bondar@bosch-si.com>
Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>
 2019-06-24 17:19:38 +02:00
Dominic Schabel
59617e60a6 Minor code improvements 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2019-05-21 11:16:32 +02:00
Stefan Schake
7c04ca1967 Add multi-user support (#829) 
This allows optionally configuring multiple static users with varying
permissions. If used, Spring Security user/password are ignored.
Otherwise, the old behavior is retained.

Signed-off-by: Stefan Schake <stefan.schake@devolo.de>
 2019-05-21 11:09:58 +02:00
Dominic Schabel
44e753a08b Small improvement for nested security config (#821) 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2019-04-17 10:56:04 +02:00
Stefan Behl
df23c4ef83 In-memory user management should not ignore user roles configured via Spring (#794) 
* Fix hawkBit UserDetailsService bean to honor the configured roles

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>

* Fix Sonar issues

Signed-off-by: Stefan Behl <stefan.behl@bosch-si.com>
 2019-02-01 14:18:38 +01:00
Kai Zimmermann
d52a720480 Spring Boot 2.0 (#721) 
* Migration to Boot 2.0.

Signed-off-by: Kai Zimmermann <kai.zimmermann@microsoft.com>
 2019-01-31 07:29:27 +01:00
Dominic Schabel
cba6755eac Revert PR 722 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2018-10-01 13:13:53 +02:00
Dominic Schabel
cab2a6f774 Superfluous exception removed from method signature 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
 2018-09-17 10:43:25 +02:00
Stefan Schake
29ebed9b80 Make HttpControllerPreAuthenticatedSecurityHeaderFilter a bean (#722) 
This makes it possible to overwrite the security header filter in an
extensions, which is desirable since the current default hawkBit
implementation relies on custom HTTP headers.

Signed-off-by: Stefan Schake <stefan.schake@devolo.de>
 2018-09-17 09:33:19 +02:00
Kai Zimmermann
ac931ec8fa Master now on 0.3 2018-06-11 15:57:15 +02:00
Kai Zimmermann
722c5ad2c2 RedirectController into auto config as default and null pointer fix. (#621) 
* Vaadin patch and redirect controller to auto config.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix potential null pointer.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* revert Vaadin update.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Conditional on missing bean.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix on permission checks.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix permission checks.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix nested cascade on delete.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2018-01-19 11:23:41 +01:00
Kai Zimmermann
df41fc0e4e Fix on some minor UI glitches and improvements (#619) 
* Fix small UI glitches.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Improved look and feel logout menue.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Gravatar icon disabled by default.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Non text.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove duplicate code.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Provide collections with more useful interface.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* i18n for menu items.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Code readibility.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix code glitches.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix logout query param.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove unused field.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix after change to optional.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove dead code.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2018-01-12 09:58:25 +01:00
Kai Zimmermann
5d774dc70a Anonymous download activated does not result in general DDI anonymous (#616) 
* Fix unintended anonymous access in DDI API.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix test.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix ant matcher.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-12-19 17:53:17 +01:00
Kai Zimmermann
3d32d1d1c3 TargetPollEvent optional (#580) 
* TargetPollEvent can be disabled.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixed test.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Central filter introduced.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix sonar issue.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add property to standard runtime.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add property to standard runtime.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-09-26 14:29:55 +02:00
Kai Zimmermann
66feae2756 DosFilter can be disabled. (#561) 
* DosFilter can be disabled.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Moved filters our of security core.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Move caffeine dependency.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-07-13 12:52:00 +02:00
Kai Zimmermann
8d17d21259 ArtifactRepository tenant aware. (#539) 
* ArtifactRepository tenant aware.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* No need to have this protected. Updated event to boot > 1.3

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove conditional.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove Debug log.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Cleanup

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Missing validation and readability.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix test after change.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix computation is DosFilter

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix session state on RESTful APIs.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Performance improvement controllermanagement

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Added cross tenant test.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Typos.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-14 19:07:52 +02:00
Melanie Retter
f42d9b6978 Restructuring properties (#528) 
* Moved test property file to one locations

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

* Added missing properties

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

* Move property defaults to respective modules.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Moved test relevant properties in respective modules. Added missing
tests.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* deleted security.filter-order property

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>

* Remove empty line

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Removed build properties

Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2017-06-08 11:07:48 +02:00
Kai Zimmermann
4709f4374c Fix to many request filter usage in DDI (#526) 
* Fix DOS filter usage in DDI

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add optional CSP definition.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix for empty case.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* readability and ensure that manual enforcement is also possible in
timeforced active but no hit yet.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Class order to bean order.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix exception propagation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-07 16:32:52 +02:00
Kai Zimmermann
67a4677ef6 Split repository API for module and DS management. Refactor utility usage (#524) 
* Split DS management and reduce util usage.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Split sw module and type management.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Sonar issues.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Make sonar listen to the exception!

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Register both beans.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Split JPA implementations.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Revert user details change.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix compilation errors.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix bean queries. Fix image path.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Document preferred utility usage.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix exmaples and revert unintended checkin.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Code cleanup.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Typos, readibility.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove unused reference.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Rollouts cache delete aware.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix rolloutgroup delete event.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add new RolloutGroupDeletedEvent event

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-06-01 06:28:59 +02:00
kaizimmerm
28765b168c Fix to many request filter URL configuration, order and added a config 
for the UI.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-05-17 17:46:07 +02:00
Kai Zimmermann
1ee3d0c850 Remove module for legacy download API (never used by hawkBit). (#500) 
* Remove module for legacy download API (never used by hawkBit).

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add stream aware error controller.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixed bean definition.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-05-03 09:21:14 +02:00
Kai Zimmermann
f99da28185 Fix default isolation and auto commit (#484) 
* Switch to spring/DB default isolation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix dependency to uncommited isolation level in rollout management.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Corrected UQ checks

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Remove modifying annotation.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Disable autocommit on connection pool. Cleanups. Flush at commit.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Cleanups.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix Rollout UI performance.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Typo fixed


Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

* Remove empty lines

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-04-18 08:43:38 +02:00
Kai Zimmermann
6d2a108549 Preparations for release 0.2.0 (#461) 
* Promote update server to runtime

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Current status

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* More CQs

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Complete CQs

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Updatesd documentation

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Enable test modules

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Re add examples and extensions

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fixes and roadmap extended

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add release issue link

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Add works with CQ.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Documented CQs for #459

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix shell script

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix CQ table and runtime parent.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Fix repo entries.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

* Cleaned up docs.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-03-30 08:46:31 +02:00
Kai Zimmermann
67d17fe661 Upgrade sonar to new 6.2 installation (#456) 
* Upgrade to new sonar instance. Fix new identified issues.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-03-14 10:06:56 +01:00
Kai Zimmermann
ede46193ca Fix etag and headers for download id (#451) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-03-05 15:36:31 +01:00
Melanie Retter
5628d625e8 Rollouts can be deleted (#436) 
* Management UI

Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>

* Repository

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

* Optimisations and scheduler deleting enabled

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-02-18 07:19:27 +01:00
Dennis Melzer
c82cc06682 Restructure the autoconfigure module (#408) 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2017-01-26 10:21:57 +01:00
Kai Zimmermann
80d11494b6 Added template variables for request driven URL calculation. (#416) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2017-01-18 18:20:26 +01:00
Kai Zimmermann
feb3369858 Custom Tenant configuration. (#395) 
* Tenant configuration configurable.
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-12-23 07:19:46 +01:00
Dennis Melzer
e6f702c882 Feature configure delay time out (#391) 
* Create a new property (hawkbit.server.ui.event.push.delay),that the
event delay forwarding is configurable.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Add javadoc

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

* Change delay to a long

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-12-20 11:18:26 +01:00
Kai Zimmermann
92dd6a1a0e Modular hawkBit (#378) 
* Cleaned up component scan
* More flexibility for hawkBit micro services
* Introduce spring boot starters
* Eclipse Jetty as hawkBit default
* Fixed links as prep for wiki removal

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-12-13 12:29:21 +01:00
kaizimmerm
7a469d8da0 Removed dependency injection where not necessary 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-11-28 15:52:06 +01:00
Kai Zimmermann
ca63106d5c Make entities immutable and create proper update methods that state by signature what can be updated. (#342) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-11-17 20:07:23 +01:00
Michael Hirsch
8be49a1184 Add filesystem artifact repository implementation (#336) 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-11-14 11:23:50 +01:00
Dennis Melzer
866bc72114 Feature horizontal scalability (#305) 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-11-03 15:53:53 +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
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
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
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
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
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
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
kaizimmerm
eb1efb3b5d Convert to lambda 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-09-27 10:41:45 +02:00
Michael Hirsch
0a604d4c40 set default admin admin in hawkBit defaults 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-09-21 10:05:33 +02:00
Michael Hirsch
90a2d1801f use security-props for retrieving spring user configuration 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-09-20 10:33:01 +02:00
kaizimmerm
ff500d3bd7 Started migration for Boot 1.3 and Security 4.1 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
 2016-08-24 09:38:53 +02:00
Dominic Schabel
9c7db25197 Merge branch 'master' into Feature_Improve_Code_Quality 
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>

# Conflicts:
#	hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/WithSpringAuthorityRule.java
 2016-08-08 16:40:00 +02:00
SirWayne
54ce3ad8e0 Fix sonar issues 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-08-05 08:56:38 +02:00