diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-data/pom.xml b/dpppt-backend-sdk/dpppt-backend-sdk-data/pom.xml index 9c8dd5eaa..b2ab8b90f 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-data/pom.xml +++ b/dpppt-backend-sdk/dpppt-backend-sdk-data/pom.xml @@ -15,7 +15,7 @@ org.dpppt dpppt-backend-sdk - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT dpppt-backend-sdk-data DP3T Backend SDK Data diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-interops/pom.xml b/dpppt-backend-sdk/dpppt-backend-sdk-interops/pom.xml index 66188f022..bd79ed0c7 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-interops/pom.xml +++ b/dpppt-backend-sdk/dpppt-backend-sdk-interops/pom.xml @@ -11,7 +11,7 @@ org.dpppt dpppt-backend-sdk - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT dpppt-backend-sdk-interops DP3T Backend SDK Interops Service diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/Application.java b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/Application.java index ce0772c5b..50059be48 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/Application.java +++ b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/java/org/dpppt/backend/sdk/interops/Application.java @@ -21,7 +21,12 @@ @Configuration @ConfigurationPropertiesScan("org.dpppt.backend.sdk.interops.model") -@ComponentScan(basePackages = {"org.dpppt.backend.sdk.interops.config"}) +@ComponentScan( + basePackages = { + "org.dpppt.backend.sdk.interops.config", + "ch.admin.bag.covidcertificate.log", + "ch.admin.bag.covidcertificate.rest" + }) @EnableAutoConfiguration( exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) @EnableWebMvc diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/application.properties b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/application.properties index b8dd8b742..2229c42f1 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/application.properties +++ b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/application.properties @@ -7,7 +7,8 @@ # # SPDX-License-Identifier: MPL-2.0 # -spring.profiles.active=prod +spring.profiles.active=prod,local +spring.application.name=dp3t-insterops-sync-service management.endpoints.enabled-by-default=false server.error.whitelabel.enabled=true #------------------------------------------------------------------------------- diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/local-logback.xml b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/local-logback.xml new file mode 100644 index 000000000..21bc06627 --- /dev/null +++ b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/local-logback.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + DEBUG + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + + + + ${LOG_FILE}.log + + ${LOG_FILE}.%d{yyyy-MM-dd}.gz + 7 + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + 512KB + + + + + + + + + diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/logback.xml b/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/logback.xml deleted file mode 100644 index 954d99a75..000000000 --- a/dpppt-backend-sdk/dpppt-backend-sdk-interops/src/main/resources/logback.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - %d %p [%c] - <%m>%n - - - - - dp3t-interops.log - - %d{yyyy-MM-dd} | %d{HH:mm:ss.SSS} | %thread | %5p | %logger{25} | %m%n - - - 3 - dp3t-ws.log.%i - - - 512KB - - - - - - - - - - diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-model/pom.xml b/dpppt-backend-sdk/dpppt-backend-sdk-model/pom.xml index aa82e52e1..eca2d2636 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-model/pom.xml +++ b/dpppt-backend-sdk/dpppt-backend-sdk-model/pom.xml @@ -15,7 +15,7 @@ org.dpppt dpppt-backend-sdk - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT dpppt-backend-sdk-model DP3T Backend SDK Model diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-report/pom.xml b/dpppt-backend-sdk/dpppt-backend-sdk-report/pom.xml index d3723a78b..d5b480834 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-report/pom.xml +++ b/dpppt-backend-sdk/dpppt-backend-sdk-report/pom.xml @@ -15,7 +15,7 @@ org.dpppt dpppt-backend-sdk - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT dpppt-backend-sdk-report DP3T Backend SDK Report @@ -42,7 +42,7 @@ org.dpppt dpppt-backend-sdk-ws - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml b/dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml index 3562cf66d..8944e521c 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/pom.xml @@ -11,7 +11,7 @@ org.dpppt dpppt-backend-sdk - 2.2.0-SNAPSHOT + 2.2.1-SNAPSHOT dpppt-backend-sdk-ws DP3T Backend SDK WS diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/Application.java b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/Application.java index d2dcb6f77..2e1ecf4c9 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/Application.java +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/java/org/dpppt/backend/sdk/ws/Application.java @@ -19,7 +19,12 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; @Configuration -@ComponentScan(basePackages = {"org.dpppt.backend.sdk.ws.config"}) +@ComponentScan( + basePackages = { + "org.dpppt.backend.sdk.ws.config", + "ch.admin.bag.covidcertificate.log", + "ch.admin.bag.covidcertificate.rest" + }) @EnableAutoConfiguration( exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class}) @EnableWebMvc diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties index 8cace86ff..d4ab8631c 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/application.properties @@ -8,7 +8,8 @@ # SPDX-License-Identifier: MPL-2.0 # -spring.profiles.active=prod +spring.profiles.active=prod,local +spring.application.name=dp3t-backend-service management.endpoints.enabled-by-default=false server.error.whitelabel.enabled=true #------------------------------------------------------------------------------- diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/local-logback.xml b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/local-logback.xml new file mode 100644 index 000000000..9572475e1 --- /dev/null +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/local-logback.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + DEBUG + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + + + + ${LOG_FILE}.log + + ${LOG_FILE}.%d{yyyy-MM-dd}.gz + 7 + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + 512KB + + + + + + + + + diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/logback.xml b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/logback.xml deleted file mode 100644 index 4fd20ff97..000000000 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/main/resources/logback.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - %d %p [%c] - <%m>%n - - - - - dp3t-ws.log - - %d %p [%c] - %m%n - - - 3 - dp3t-ws.log.%i - - - 512KB - - - - - - - - - - diff --git a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/TestApplication.java b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/TestApplication.java index 0bd9e9c6f..43bfb590d 100644 --- a/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/TestApplication.java +++ b/dpppt-backend-sdk/dpppt-backend-sdk-ws/src/test/java/org/dpppt/backend/sdk/ws/controller/TestApplication.java @@ -13,6 +13,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -@ComponentScan(basePackages = {"org.dpppt.backend.sdk.ws.config"}) +@ComponentScan( + basePackages = { + "org.dpppt.backend.sdk.ws.config", + "ch.admin.bag.covidcertificate.log", + "ch.admin.bag.covidcertificate.rest" + }) @SpringBootApplication public class TestApplication {} diff --git a/dpppt-backend-sdk/pom.xml b/dpppt-backend-sdk/pom.xml index b472dd9d3..73dae9f76 100644 --- a/dpppt-backend-sdk/pom.xml +++ b/dpppt-backend-sdk/pom.xml @@ -1,4 +1,4 @@ -