Merge pull request #12 from virtualidentityag/develop

merge with develop

pom.xml

@@ -41,18 +41,6 @@
     <spring-security-oauth2-test-webmvc-addons.version>3.0.1</spring-security-oauth2-test-webmvc-addons.version>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-dependencies</artifactId>
-        <version>2022.0.5</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <!-- Spring Boot dependencies -->
     <dependency>
@@ -130,11 +118,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.cloud</groupId>
-      <artifactId>spring-cloud-starter-sleuth</artifactId>
-      <version>3.1.11</version>
-    </dependency>
 
 
     <dependency>

src/main/resources/application.properties

@@ -4,6 +4,7 @@
 # Currently active profile
 spring.profiles.active=@activeSpringProfile@
 spring.main.allow-bean-definition-overriding=true
+spring.application.name=message-service
 
 # General app settings
 server.port=8080
@@ -58,7 +59,6 @@ springfox.documentation.swagger.v2.path=${springfox.docuPath}/v2/api-docs
 # UserService API
 user.service.api.url=<containername>:<port>/users
 user.service.api.new.message.notification=${user.service.api.url}/mails/messages/new
-user.service.api.new.feedback.message.notification=${user.service.api.url}/mails/messages/feedback/new
 user.service.api.liveproxy.url=<containername>:<port>
 
 # CSRF token
@@ -100,13 +100,8 @@ feature.multitenancy.with.single.domain.enabled=false
 management.endpoint.health.enabled=true
 management.endpoint.health.show-details=never
 management.endpoints.web.exposure.include=health
-spring.application.name=message-service
 management.health.probes.enabled=true
 
-spring.zipkin.baseUrl: https://localhost:9411/
-logging.pattern.level=%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]
-
-
 spring.security.oauth2.resourceserver.jwt.issuer-uri: https://localhost/auth/realms/onlineberatung
 spring.security.oauth2.resourceserver.jwt.jwk-set-uri: https://localhost/auth/realms/onlineberatung/protocol/openid-connect/certs
 spring.jwt.auth.converter.resource-id: app