replace CI images

.woodpecker.star

@@ -15,16 +15,16 @@ OPEN_SEARCH = "opensearchproject/opensearch:2"
 INBUCKET_INBUCKET = "inbucket/inbucket"
 MINIO_MC = "minio/mc:RELEASE.2021-10-07T04-19-58Z"
 OC_CI_ALPINE = "owncloudci/alpine:latest"
-OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier:latest"
+OC_CI_BAZEL_BUILDIFIER = "scharfvi/bazel-buildifier:latest"
 OC_CI_CLAMAVD = "owncloudci/clamavd"
 OC_CI_DRONE_ANSIBLE = "owncloudci/drone-ansible:latest"
-OC_CI_GOLANG = "registry.heinlein.group/opencloud/golang-ci:1.25"
-OC_CI_NODEJS = "owncloudci/nodejs:%s"
-OC_CI_PHP = "owncloudci/php:%s"
-OC_CI_WAIT_FOR = "owncloudci/wait-for:latest"
+OC_CI_GOLANG = "quay.io/opencloudeu/golang-ci:1.25"
+OC_CI_NODEJS = "scharfvi/nodeci:24"
+OC_CI_NODEJS_ALPINE = "scharfvi/nodeci-alpine:24"
+OC_CI_PHP = "scharfvi/php-ci:%s"
+OC_CI_WAIT_FOR = "scharfvi/wait-for:latest"
 OC_CS3_API_VALIDATOR = "opencloudeu/cs3api-validator:latest"
 OC_LITMUS = "owncloudci/litmus:latest"
-OC_UBUNTU = "owncloud/ubuntu:20.04"
 ONLYOFFICE_DOCUMENT_SERVER = "onlyoffice/documentserver:7.5.1"
 PLUGINS_DOCKER_BUILDX = "woodpeckerci/plugin-docker-buildx:latest"
 PLUGINS_NOTATION = "registry.heinlein.group/opencloud/notation-wp-plugin:latest"
@@ -37,8 +37,7 @@ REDIS = "redis:6-alpine"
 READY_RELEASE_GO = "woodpeckerci/plugin-ready-release-go:latest"
 OPENLDAP = "bitnamilegacy/openldap:2.6"
 
-DEFAULT_PHP_VERSION = "8.2"
-DEFAULT_NODEJS_VERSION = "20"
+DEFAULT_PHP_VERSION = "8.4"
 
 CACHE_S3_SERVER = "https://s3.ci.opencloud.eu"
 
@@ -671,7 +670,7 @@ def cacheGoBin():
         },
         {
             "name": "archive-go-bin",
-            "image": OC_UBUNTU,
+            "image": OC_CI_NODEJS,
             "commands": [
                 ". ./.env",
                 "if $BIN_CACHE_FOUND; then exit 0; fi",
@@ -709,7 +708,7 @@ def restoreGoBinCache():
         },
         {
             "name": "extract-go-bin-cache",
-            "image": OC_UBUNTU,
+            "image": OC_CI_NODEJS,
             "commands": [
                 "tar -xvmf %s -C /" % dirs["gobinTarPath"],
             ],
@@ -903,7 +902,7 @@ def checkGherkinLint(ctx):
         "steps": [
             {
                 "name": "lint-feature-files",
-                "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+                "image": OC_CI_NODEJS_ALPINE,
                 "commands": [
                     "npm install -g @gherlint/gherlint@1.1.0",
                     "make test-gherkin-lint",
@@ -1408,7 +1407,7 @@ def e2eTestPipeline(ctx, watch_fs_enabled = False):
 
         step_e2e = {
             "name": "e2e-tests",
-            "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+            "image": OC_CI_NODEJS,
             "environment": {
                 "OC_BASE_URL": OC_DOMAIN,
                 "HEADLESS": True,
@@ -1567,7 +1566,7 @@ def multiServiceE2ePipeline(ctx, watch_fs_enabled = False):
             storage_users_services + \
             [{
                 "name": "e2e-tests",
-                "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+                "image": OC_CI_NODEJS,
                 "environment": {
                     "OC_BASE_URL": OC_DOMAIN,
                     "HEADLESS": True,
@@ -1894,14 +1893,14 @@ def licenseCheck(ctx):
         "steps": restoreGoBinCache() + [
             {
                 "name": "node-check-licenses",
-                "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+                "image": OC_CI_NODEJS_ALPINE,
                 "commands": [
                     "make ci-node-check-licenses",
                 ],
             },
             {
                 "name": "node-save-licenses",
-                "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+                "image": OC_CI_NODEJS_ALPINE,
                 "commands": [
                     "make ci-node-save-licenses",
                 ],
@@ -2021,7 +2020,7 @@ def makeNodeGenerate(module):
     return [
         {
             "name": "generate nodejs",
-            "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+            "image": OC_CI_NODEJS,
             "environment": {
                 "CHROMEDRIVER_SKIP_DOWNLOAD": True,  # install fails on arm and chromedriver is a test only dependency
             },
@@ -2694,7 +2693,7 @@ def litmus(ctx, storage):
 def setupForLitmus():
     return [{
         "name": "setup-for-litmus",
-        "image": OC_UBUNTU,
+        "image": OC_CI_NODEJS,
         "environment": {
             "TEST_SERVER_URL": OC_URL,
         },
@@ -2709,7 +2708,7 @@ def getWoodpeckerEnvAndCheckScript(ctx):
     path_to_check_script = "%s/tests/config/woodpecker/check_web_cache.sh" % dirs["base"]
     return {
         "name": "get-woodpecker-env-and-check-script",
-        "image": OC_UBUNTU,
+        "image": OC_CI_NODEJS,
         "commands": [
             "cp %s check_web_cache.sh" % path_to_check_script,
         ],
@@ -2728,7 +2727,7 @@ def checkForWebCache(name):
 def cloneWeb():
     return {
         "name": "clone-web",
-        "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+        "image": OC_CI_NODEJS_ALPINE,
         "commands": [
             ". ./.woodpecker.env",
             "if $WEB_CACHE_FOUND; then exit 0; fi",
@@ -2745,7 +2744,7 @@ def generateWebPnpmCache(ctx):
         cloneWeb(),
         {
             "name": "install-pnpm",
-            "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+            "image": OC_CI_NODEJS,
             "commands": [
                 ". ./.woodpecker.env",
                 "if $WEB_CACHE_FOUND; then exit 0; fi",
@@ -2757,7 +2756,7 @@ def generateWebPnpmCache(ctx):
         },
         {
             "name": "zip-pnpm",
-            "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+            "image": OC_CI_NODEJS,
             "commands": [
                 ". ./.woodpecker.env",
                 "if $WEB_CACHE_FOUND; then exit 0; fi",
@@ -2819,7 +2818,7 @@ def cacheBrowsers(ctx):
     browser_cache_steps = [
         {
             "name": "install-browsers",
-            "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+            "image": OC_CI_NODEJS,
             "environment": {
                 "PLAYWRIGHT_BROWSERS_PATH": ".playwright",
             },
@@ -2827,7 +2826,7 @@ def cacheBrowsers(ctx):
                 "cd %s" % dirs["web"],
                 ". ./.woodpecker.env",
                 "if $BROWSER_CACHE_FOUND; then exit 0; fi",
-                "pnpm exec playwright install --with-deps",
+                "pnpm exec playwright install",
                 "pnpm exec playwright install --list",
                 "tar -czf %s .playwright" % dirs["playwrightBrowsersArchive"],
             ],
@@ -2862,7 +2861,7 @@ def generateWebCache(ctx):
         cloneWeb(),
         {
             "name": "zip-web",
-            "image": OC_UBUNTU,
+            "image": OC_CI_NODEJS,
             "commands": [
                 ". ./.woodpecker.env",
                 "if $WEB_CACHE_FOUND; then exit 0; fi",
@@ -2898,7 +2897,7 @@ def restoreWebCache():
         ],
     }, {
         "name": "unzip-web-cache",
-        "image": OC_UBUNTU,
+        "image": OC_CI_NODEJS,
         "commands": [
             "tar -xf %s -C ." % dirs["webZip"],
         ],
@@ -2917,7 +2916,7 @@ def restoreWebPnpmCache(extra_commands = []):
     }, {
         # we need to install again because the node_modules are not cached
         "name": "unzip-and-install-pnpm",
-        "image": OC_CI_NODEJS % DEFAULT_NODEJS_VERSION,
+        "image": OC_CI_NODEJS,
         "commands": extra_commands + [
             "cd %s" % dirs["web"],
             "rm -rf .pnpm-store",
@@ -2943,7 +2942,7 @@ def restoreBrowsersCache():
         },
         {
             "name": "unzip-browsers-cache",
-            "image": OC_UBUNTU,
+            "image": OC_CI_NODEJS,
             "commands": [
                 "tar -xf /woodpecker/src/github.com/%s/webTestRunner/playwright-browsers.tar.gz -C ." % repo_slug,
             ],
@@ -2961,7 +2960,7 @@ def waitForEmailService():
         "name": "wait-for-email",
         "image": OC_CI_WAIT_FOR,
         "commands": [
-            "wait-for -it email:9000 -t 600",
+            "wait-for -host email -port 9000 -timeout 600",
         ],
     }]
 
@@ -2976,7 +2975,7 @@ def waitForClamavService():
         "name": "wait-for-clamav",
         "image": OC_CI_WAIT_FOR,
         "commands": [
-            "wait-for -it clamav:3310 -t 600",
+            "wait-for -host clamav -port 3310 -timeout 600",
         ],
     }]
 
@@ -3019,7 +3018,7 @@ def waitForLdapService():
         "name": "wait-for-ldap",
         "image": OC_CI_WAIT_FOR,
         "commands": [
-            "wait-for -it ldap-server:1636 -t 600",
+            "wait-for -host ldap-server -port 1636 -timeout 600",
         ],
     }]
 
@@ -3082,7 +3081,7 @@ def tikaService():
         "name": "wait-for-tika-service",
         "image": OC_CI_WAIT_FOR,
         "commands": [
-            "wait-for -it tika:9998 -t 300",
+            "wait-for -host tika -port 9998 -timeout 300",
         ],
     }]
 
@@ -3192,13 +3191,18 @@ def k6LoadTests(ctx):
     }]
 
 def waitForServices(name, services = []):
-    services = ",".join(services)
+    commands = []
+
+    for service in services:
+        host, port = service.split(":", 1)
+        commands.append(
+            "wait-for -host %s -port %s -timeout 300" % (host, port),
+        )
+
     return [{
         "name": "wait-for-%s" % name,
         "image": OC_CI_WAIT_FOR,
-        "commands": [
-            "wait-for -it %s -t 300" % services,
-        ],
+        "commands": commands,
     }]
 
 def openCloudHealthCheck(name, services = []):

opencloud/pkg/command/services.go

@@ -61,7 +61,7 @@ var serviceCommands = []register.Command{
 	},
 	func(cfg *config.Config) *cobra.Command {
 		return ServiceCommand(cfg, cfg.Antivirus.Service.Name, antivirus.GetCommands(cfg.Antivirus), func(c *config.Config) {
-			cfg.Antivirus.Commons = cfg.Commons
+			// cfg.Antivirus.Commons = cfg.Commons // antivirus needs no commons atm
 		})
 	},
 	func(cfg *config.Config) *cobra.Command {

services/activitylog/cmd/activitylog/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/antivirus/cmd/antivirus/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/antivirus/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/app-provider/cmd/app-provider/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/app-provider/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/app-registry/cmd/app-registry/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/app-registry/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/audit/cmd/audit/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/audit/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/auth-app/cmd/auth-app/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/auth-app/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/auth-basic/cmd/auth-basic/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/auth-bearer/cmd/auth-bearer/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/auth-machine/cmd/auth-machine/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/auth-service/cmd/auth-service/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/auth-service/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/clientlog/cmd/clientlog/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/clientlog/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/collaboration/cmd/collaboration/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/eventhistory/cmd/eventhistory/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/frontend/cmd/frontend/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/frontend/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/gateway/cmd/gateway/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/gateway/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/graph/cmd/graph/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/graph/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/groups/cmd/groups/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/groups/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/idm/cmd/idm/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/idm/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/idp/cmd/idp/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/idp/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/invitations/cmd/invitations/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/invitations/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/nats/cmd/nats/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/nats/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/notifications/cmd/notifications/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/notifications/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/ocdav/cmd/ocdav/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/ocdav/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/ocm/cmd/ocm/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/ocm/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/ocs/cmd/ocs/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/ocs/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/policies/cmd/policies/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/policies/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/postprocessing/cmd/postprocessing/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/proxy/cmd/proxy/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/proxy/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/search/cmd/search/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/search/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/settings/cmd/settings/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/settings/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/settings/pkg/service/v0/l10n/locale/ja/LC_MESSAGES/settings.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2025-12-25 00:05+0000\n"
+"POT-Creation-Date: 2025-12-18 00:04+0000\n"
 "PO-Revision-Date: 2025-01-27 10:17+0000\n"
 "Last-Translator: ii kaka, 2025\n"
 "Language-Team: Japanese (https://app.transifex.com/opencloud-eu/teams/204053/ja/)\n"
@@ -44,7 +44,7 @@ msgstr "ファイルの拒否"
 #. translation for the 'instant' email interval option
 #: pkg/store/defaults/templates.go:48
 msgid "Instant"
-msgstr "即時"
+msgstr "即時 "
 
 #. translation for the 'never' email interval option
 #: pkg/store/defaults/templates.go:54
@@ -111,7 +111,7 @@ msgstr "選択された値:"
 #. name of the notification option 'Share Expired'
 #: pkg/store/defaults/templates.go:16
 msgid "Share Expired"
-msgstr "共有期限切れ"
+msgstr " 共有期限切れ"
 
 #. name of the notification option 'Share Received'
 #: pkg/store/defaults/templates.go:8

services/sharing/cmd/sharing/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/sharing/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/sse/cmd/sse/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/sse/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/storage-publiclink/cmd/storage-publiclink/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/storage-shares/cmd/storage-shares/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/storage-system/cmd/storage-system/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/storage-system/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/storage-users/cmd/storage-users/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/storage-users/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/thumbnails/cmd/thumbnails/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/thumbnails/pkg/preprocessor/preprocessor.go

@@ -20,7 +20,6 @@ import (
 	"golang.org/x/image/math/fixed"
 
 	"github.com/dhowden/tag"
-
 	thumbnailerErrors "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/errors"
 )
 
@@ -157,18 +156,15 @@ Scan: // Label for the scanner loop, so we can break it easily
 				if canvas.Dot.Y > maxY {
 					break Scan
 				}
-
-				drawWord(canvas, textResult.Text[initialByte:sRangeSpace], minX, maxX, height, maxY)
+				drawWord(canvas, textResult.Text[initialByte:sRangeSpace], minX, maxX, height, maxY, true)
 				initialByte = sRangeSpace
 			}
-
 			if initialByte <= sRange.High {
 				// some bytes left to be written
 				if canvas.Dot.Y > maxY {
 					break Scan
 				}
-
-				drawWord(canvas, textResult.Text[initialByte:sRange.High+1], minX, maxX, height, maxY)
+				drawWord(canvas, textResult.Text[initialByte:sRange.High+1], minX, maxX, height, maxY, len(sRange.Spaces) > 0)
 			}
 		}
 
@@ -239,58 +235,43 @@ func extractBase64ImageFromGGP(ggp *GGPStruct) (string, error) {
 // need to draw the word in a new line
 //
 // Note that the word will likely start with a white space char
-func drawWord(canvas *font.Drawer, word string, minX, maxX, incY, maxY fixed.Int26_6) {
-	// calculate the actual measurement of the string at a given X position
-	measure := func(s string, dotX fixed.Int26_6) (min, max fixed.Int26_6) {
-		bbox, _ := canvas.BoundString(s)
-		return dotX + bbox.Min.X, dotX + bbox.Max.X
-	}
-
-	// first try to draw the whole word
-	absMin, absMax := measure(word, canvas.Dot.X)
-	if absMin >= minX && absMax <= maxX {
+func drawWord(canvas *font.Drawer, word string, minX, maxX, incY, maxY fixed.Int26_6, goToNewLine bool) {
+	bbox, _ := canvas.BoundString(word)
+	if bbox.Max.X <= maxX {
+		// word fits in the current line
 		canvas.DrawString(word)
-		return
-	}
+	} else {
+		// word doesn't fit -> retry in a new line
+		trimmedWord := strings.TrimSpace(word)
+		oldDot := canvas.Dot
 
-	// try to draw the trimmed word in a new line
-	trimmed := strings.TrimSpace(word)
-	oldDot := canvas.Dot
-	canvas.Dot.X = minX
-	canvas.Dot.Y += incY
-
-	if canvas.Dot.Y <= maxY {
-		tMin, tMax := measure(trimmed, canvas.Dot.X)
-		if tMin >= minX && tMax <= maxX {
-			canvas.DrawString(trimmed)
-			return
+		canvas.Dot.X = minX
+		canvas.Dot.Y += incY
+		bbox2, _ := canvas.BoundString(trimmedWord)
+		if goToNewLine && bbox2.Max.X <= maxX {
+			if canvas.Dot.Y > maxY {
+				// Don't draw if we're over the Y limit
+				return
+			}
+			canvas.DrawString(trimmedWord)
+		} else {
+			// word doesn't fit in a new line -> draw as many chars as possible
+			canvas.Dot = oldDot
+			for _, char := range trimmedWord {
+				charBytes := []byte(string(char))
+				bbox3, _ := canvas.BoundBytes(charBytes)
+				if bbox3.Max.X > maxX {
+					canvas.Dot.X = minX
+					canvas.Dot.Y += incY
+					if canvas.Dot.Y > maxY {
+						// Don't draw if we're over the Y limit
+						return
+					}
+				}
+				canvas.DrawBytes(charBytes)
+			}
 		}
 	}
-
-	// if the trimmed word is still too big, draw it char by char
-	canvas.Dot = oldDot
-	for _, char := range trimmed {
-		s := string(char)
-		_, cMax := measure(s, canvas.Dot.X)
-
-		if cMax > maxX {
-			canvas.Dot.X = minX
-			canvas.Dot.Y += incY
-		}
-
-		// stop drawing if we exceed maxY
-		if canvas.Dot.Y > maxY {
-			return
-		}
-
-		// ensure that we don't start drawing before minX
-		cMin, _ := measure(s, canvas.Dot.X)
-		if cMin < minX {
-			canvas.Dot.X += minX - cMin
-		}
-
-		canvas.DrawString(s)
-	}
 }
 
 // ForType returns the converter for the specified mimeType

services/userlog/cmd/userlog/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/userlog/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/userlog/pkg/service/l10n/locale/ja/LC_MESSAGES/userlog.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: EMAIL\n"
-"POT-Creation-Date: 2025-12-25 00:05+0000\n"
+"POT-Creation-Date: 2025-12-19 00:05+0000\n"
 "PO-Revision-Date: 2025-01-27 10:17+0000\n"
 "Last-Translator: ii kaka, 2025\n"
 "Language-Team: Japanese (https://app.transifex.com/opencloud-eu/teams/204053/ja/)\n"
@@ -52,7 +52,7 @@ msgstr "メンバーシップの期限が切れました"
 
 #: pkg/service/templates.go:13
 msgid "Policies enforced"
-msgstr "ポリシーが適用されました"
+msgstr " ポリシーが適用されました"
 
 #: pkg/service/templates.go:23
 msgid "Removed from Space"
@@ -84,7 +84,7 @@ msgstr "スペースが共有されました"
 
 #: pkg/service/templates.go:8
 msgid "Virus found"
-msgstr "ウイルスが検出されました"
+msgstr " ウイルスが検出されました"
 
 #: pkg/service/templates.go:9
 msgid "Virus found in {resource}. Upload not possible. Virus: {virus}"

services/users/cmd/users/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/users/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/web/cmd/web/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/web/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/web/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/webdav/cmd/webdav/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/webdav/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

services/webfinger/cmd/webfinger/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+
+	"github.com/opencloud-eu/opencloud/services/webfinger/pkg/command"
+	"github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults"
+)
+
+func main() {
+	cfg := defaults.DefaultConfig()
+	cfg.Context, _ = signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
+	if err := command.Execute(cfg); err != nil {
+		os.Exit(1)
+	}
+}

tests/acceptance/bootstrap/NotificationContext.php

@@ -377,7 +377,7 @@ class NotificationContext implements Context {
 	}
 
 	/**
-	 * @Then /^user "([^"]*)" should get a notification with subject "([^"]*)" and message:$/
+	 * @Then /^user "([^"]*)" should (?:get|have) a notification with subject "([^"]*)" and message:$/
 	 *
 	 * @param string $user
 	 * @param string $subject
@@ -411,7 +411,7 @@ class NotificationContext implements Context {
 			throw new \Exception("Notification was not found even after retrying for 5 seconds.");
 		}
 		$expectedMessage = $table->getColumnsHash()[0]['message'];
-		Assert::assertStringStartsWith(
+		Assert::assertSame(
 			$expectedMessage,
 			$actualMessage,
 			__METHOD__ . "expected message to be '$expectedMessage' but found'$actualMessage'"

tests/acceptance/features/apiAntivirus/antivirus.feature

@@ -36,13 +36,13 @@ Feature: antivirus
       | <message> |
     And as "Alice" file "<new-file-name>" should not exist
     Examples:
-      | dav-path-version | file-name     | new-file-name  | message                                                    |
-      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | dav-path-version | file-name     | new-file-name  | message                                                                         |
+      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
 
   Scenario Outline: upload a file with virus and a file without virus
@@ -64,13 +64,13 @@ Feature: antivirus
       Cheers.
       """
     Examples:
-      | dav-path-version | file-name     | new-file-name  | message                                                    |
-      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | dav-path-version | file-name     | new-file-name  | message                                                                         |
+      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
 
   Scenario Outline: upload a file with virus in chunks
@@ -83,8 +83,8 @@ Feature: antivirus
     # antivirus service can scan files during post-processing. on demand scanning is currently not available
     Then the HTTP status code should be "201"
     And user "Alice" should get a notification with subject "Virus found" and message:
-      | message                                                       |
-      | Virus found in myChunkedFile.txt. Upload not possible. Virus: |
+      | message                                                                            |
+      | Virus found in myChunkedFile.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And as "Alice" file "/myChunkedFile.txt" should not exist
     Examples:
       | dav-path-version |
@@ -110,13 +110,13 @@ Feature: antivirus
       | <message> |
     And as "Alice" file "/uploadFolder/<new-file-name>" should not exist
     Examples:
-      | dav-path-version | file-name     | new-file-name  | message                                                    |
-      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | dav-path-version | file-name     | new-file-name  | message                                                                         |
+      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
   @issue-10331
   Scenario Outline: public uploads a file with the virus to a password-protected public share
@@ -136,13 +136,13 @@ Feature: antivirus
       | <message> |
     And as "Alice" file "/uploadFolder/<new-file-name>" should not exist
     Examples:
-      | dav-path-version | file-name     | new-file-name  | message                                                    |
-      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | dav-path-version | file-name     | new-file-name  | message                                                                         |
+      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
 
   Scenario Outline: upload a file with virus to a user share
@@ -164,13 +164,13 @@ Feature: antivirus
     And as "Brian" file "/Shares/uploadFolder/<new-file-name>" should not exist
     And as "Alice" file "/uploadFolder/<new-file-name>" should not exist
     Examples:
-      | dav-path-version | file-name     | new-file-name  | message                                                    |
-      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | dav-path-version | file-name     | new-file-name  | message                                                                         |
+      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
 
   Scenario Outline: upload a file with virus to a group share
@@ -195,13 +195,13 @@ Feature: antivirus
     And as "Brian" file "/Shares/uploadFolder/<new-file-name>" should not exist
     And as "Alice" file "/uploadFolder/<new-file-name>" should not exist
     Examples:
-      | dav-path-version | file-name     | new-file-name  | message                                                    |
-      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
-      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | dav-path-version | file-name     | new-file-name  | message                                                                         |
+      | old              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | old              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | new              | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | spaces           | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
 
   Scenario Outline: upload a file with virus to a project space
@@ -224,9 +224,9 @@ Feature: antivirus
     And for user "Alice" the space "new-space" should not contain these entries:
       | /<new-file-name> |
     Examples:
-      | file-name     | new-file-name  | message                                                    |
-      | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | file-name     | new-file-name  | message                                                                         |
+      | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
 
   Scenario Outline: upload a file with virus to a shared project space
@@ -249,9 +249,9 @@ Feature: antivirus
     And for user "Alice" the space "new-space" should not contain these entries:
       | /<new-file-name> |
     Examples:
-      | file-name     | new-file-name  | message                                                    |
-      | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: |
-      | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: |
+      | file-name     | new-file-name  | message                                                                         |
+      | eicar.com     | virusFile1.txt | Virus found in virusFile1.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
+      | eicar_com.zip | virusFile2.zip | Virus found in virusFile2.zip. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
 
   @env-config  @issue-6494
   Scenario Outline: upload a file with virus by setting antivirus infected file handling config to continue
@@ -273,8 +273,8 @@ Feature: antivirus
     When user "Alice" uploads file "filesForUpload/filesWithVirus/eicar.com" to "/aFileWithVirus.txt" using the WebDAV API
     Then the HTTP status code should be "201"
     And user "Alice" should get a notification with subject "Virus found" and message:
-      | message                                                        |
-      | Virus found in aFileWithVirus.txt. Upload not possible. Virus: |
+      | message                                                                             |
+      | Virus found in aFileWithVirus.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And as "Alice" file "/aFileWithVirus.txt" should not exist
     Examples:
       | dav-path-version |
@@ -307,12 +307,12 @@ Feature: antivirus
     And as "Alice" file "/aFileWithVirus.txt" should not exist
     Examples:
       | dav-path-version | language | subject          | message                                                                                                                        |
-      | old              | es       | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus:                              |
-      | new              | es       | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus:                              |
-      | spaces           | es       | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus:                              |
-      | old              | de       | Virus gefunden   | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: |
-      | new              | de       | Virus gefunden   | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: |
-      | spaces           | de       | Virus gefunden   | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: |
+      | old              | es       | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Win.Test.EICAR_HDB-1                              |
+      | new              | es       | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Win.Test.EICAR_HDB-1                              |
+      | spaces           | es       | Virus encontrado | Virus encontrado en aFileWithVirus.txt. La subida no ha sido posible. Virus: Win.Test.EICAR_HDB-1                              |
+      | old              | de       | Virus gefunden   | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Win.Test.EICAR_HDB-1 |
+      | new              | de       | Virus gefunden   | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Win.Test.EICAR_HDB-1 |
+      | spaces           | de       | Virus gefunden   | In aFileWithVirus.txt wurde potenziell schädlicher Code gefunden. Das Hochladen wurde abgebrochen. Grund: Win.Test.EICAR_HDB-1 |
 
   @issue-enterprise-5709
   Scenario Outline: try to create a version of file by uploading virus content
@@ -322,8 +322,8 @@ Feature: antivirus
     When user "Alice" uploads file with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" to "test.txt" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Alice" should get a notification with subject "Virus found" and message:
-      | message                                              |
-      | Virus found in test.txt. Upload not possible. Virus: |
+      | message                                                                   |
+      | Virus found in test.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And as "Alice" file "/test.txt" should exist
     And the version folder of file "/test.txt" for user "Alice" should contain "1" element
     And the content of file "/test.txt" for user "Alice" should be "hello nepal"
@@ -349,8 +349,8 @@ Feature: antivirus
     When the public overwrites file "test.txt" with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" using the public WebDAV API
     Then the HTTP status code should be "204"
     And user "Alice" should get a notification with subject "Virus found" and message:
-      | message                                              |
-      | Virus found in test.txt. Upload not possible. Virus: |
+      | message                                                                   |
+      | Virus found in test.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And the content of file "/test.txt" for user "Alice" should be "hello"
     Examples:
       | dav-path-version |
@@ -376,8 +376,8 @@ Feature: antivirus
     When user "Brian" uploads file with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" to "Shares/test.txt" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Brian" should get a notification with subject "Virus found" and message:
-      | message                                              |
-      | Virus found in test.txt. Upload not possible. Virus: |
+      | message                                                                   |
+      | Virus found in test.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And the content of file "/test.txt" for user "Alice" should be "hello"
     And the content of file "Shares/test.txt" for user "Brian" should be "hello"
     Examples:
@@ -410,15 +410,15 @@ Feature: antivirus
     When user "Brian" uploads file with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" to "Shares/uploadFolder/test.txt" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Brian" should get a notification for resource "test.txt" with subject "Virus found" and message:
-      | message                                              |
-      | Virus found in test.txt. Upload not possible. Virus: |
+      | message                                                                   |
+      | Virus found in test.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And the content of file "Shares/uploadFolder/test.txt" for user "Brian" should be "this is a test file."
     And the content of file "uploadFolder/test.txt" for user "Alice" should be "this is a test file."
     When user "Brian" uploads file with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" to "Shares/test.txt" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Brian" should get a notification for resource "test.txt" with subject "Virus found" and message:
-      | message                                              |
-      | Virus found in test.txt. Upload not possible. Virus: |
+      | message                                                                   |
+      | Virus found in test.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And the content of file "Shares/test.txt" for user "Brian" should be "this is a test file."
     And the content of file "/test.txt" for user "Alice" should be "this is a test file."
     Examples:
@@ -437,8 +437,8 @@ Feature: antivirus
     When user "Alice" uploads a file inside space "new-space" with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" to ".space/readme.md" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Alice" should get a notification with subject "Virus found" and message:
-      | message                                               |
-      | Virus found in readme.md. Upload not possible. Virus: |
+      | message                                                                    |
+      | Virus found in readme.md. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And for user "Alice" the content of the file ".space/readme.md" of the space "new-space" should be "Here you can add a description for this Space."
 
 
@@ -458,8 +458,8 @@ Feature: antivirus
     When user "Brian" uploads a file inside space "new-space" with content "X5O!P%@AP[4\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H*" to ".space/readme.md" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Brian" should get a notification with subject "Virus found" and message:
-      | message                                               |
-      | Virus found in readme.md. Upload not possible. Virus: |
+      | message                                                                    |
+      | Virus found in readme.md. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And for user "Brian" the content of the file ".space/readme.md" of the space "new-space" should be "Here you can add a description for this Space."
     And for user "Alice" the content of the file ".space/readme.md" of the space "new-space" should be "Here you can add a description for this Space."
 
@@ -478,7 +478,7 @@ Feature: antivirus
     When user "Brian" uploads a file "filesForUpload/filesWithVirus/eicar.com" to "text.txt" in space "new-space" using the WebDAV API
     Then the HTTP status code should be "204"
     And user "Brian" should get a notification with subject "Virus found" and message:
-      | message                                              |
-      | Virus found in text.txt. Upload not possible. Virus: |
+      | message                                                                   |
+      | Virus found in text.txt. Upload not possible. Virus: Win.Test.EICAR_HDB-1 |
     And for user "Brian" the content of the file "/text.txt" of the space "new-space" should be "hello world"
     And for user "Alice" the content of the file "/text.txt" of the space "new-space" should be "hello world"

tests/acceptance/features/apiNotification/deleteNotification.feature

@@ -27,10 +27,10 @@ Feature: Delete notification
   Scenario: delete a notification
     When user "Brian" deletes a notification related to resource "my_data" with subject "Resource shared"
     Then the HTTP status code should be "200"
-    And user "Brian" should get a notification with subject "Resource shared" and message:
+    And user "Brian" should have a notification with subject "Resource shared" and message:
       | message                                    |
       | Alice Hansen shared textfile1.txt with you |
-    But user "Brian" should not get a notification related to resource "my_data" with subject "Resource shared"
+    But user "Brian" should not have a notification related to resource "my_data" with subject "Resource shared"
 
 
   Scenario: delete all notifications

tests/acceptance/features/coreApiCapabilities/capabilities.feature

@@ -202,7 +202,7 @@ Feature: capabilities
                     "properties": {
                       "edition": {
                         "type": "string",
-                        "enum": ["%edition%"]
+                        "enum": ["dev"]
                       },
                       "product": {
                         "type": "string",
@@ -240,7 +240,7 @@ Feature: capabilities
               },
               "edition": {
                 "type": "string",
-                "enum": ["%edition%"]
+                "enum": ["dev"]
               },
               "product": {
                 "type": "string",

tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature

@@ -58,7 +58,7 @@ Feature: default capabilities for normal user
                         "const": "%versionstring%"
                       },
                       "edition": {
-                        "const": "%edition%"
+                        "const": "dev"
                       },
                       "productname": {
                         "const": "%productname%"