Commit 16051f9f authored by Yauheni Lesnikau's avatar Yauheni Lesnikau
Browse files

Merge branch 'logging-optimization' into 'master'

add log ignoring for /actuator/health health check;

See merge request !85
parents aa81d7f0 9d7fdd65
Pipeline #47968 passed with stages
in 22 minutes and 28 seconds
This diff is collapsed.
......@@ -29,10 +29,10 @@
<packaging>jar</packaging>
<version>0.10.0-SNAPSHOT</version>
<properties>
<osdu.register-core.version>0.10.0-SNAPSHOT</osdu.register-core.version>
<osdu.corelibazure.version>0.6.1</osdu.corelibazure.version>
<osdu.corelibazure.version>0.9.0</osdu.corelibazure.version>
<junit-jupiter.version>5.6.0</junit-jupiter.version>
<mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
</properties>
<dependencyManagement>
......@@ -54,16 +54,6 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.simpleframework</groupId>
<artifactId>simple-xml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......@@ -72,13 +62,13 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>register-core</artifactId>
<version>${osdu.register-core.version}</version>
<version>${project.version}</version>
</dependency>
<!-- Azure Dependencies -->
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
<groupId>com.azure.spring</groupId>
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
</dependency>
<!-- Spring Dependencies -->
......@@ -110,6 +100,10 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
......@@ -118,6 +112,11 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>oauth2-oidc-sdk</artifactId>
<version>${oauth2-oidc-sdk.version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
......
......@@ -24,6 +24,7 @@ LOG_PREFIX=${LOG_PREFIX}
logging.transaction.enabled=true
logging.slf4jlogger.enabled=true
logging.mdccontext.enabled=true
logging.ignore.servlet.paths=/actuator/health
ENTITLEMENTS_API=${ENTITLEMENTS_API}
PARTITION_API=${partition_service_endpoint}
......
......@@ -14,7 +14,8 @@ import org.opengroup.osdu.register.provider.azure.util.PartitionHelper;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
......
package org.opengroup.osdu.register.provider.azure.verifier;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.InjectMocks;
import org.mockito.junit.jupiter.MockitoExtension;
import org.opengroup.osdu.core.common.model.http.AppException;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ExtendWith(MockitoExtension.class)
public class GsaTokenVerifierImplTest {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment