Skip to content
Snippets Groups Projects
Commit 7a8fdd6a authored by Nishant  Vidyasagar's avatar Nishant Vidyasagar
Browse files

initial changes with failures

parent 163e62ff
No related branches found
No related tags found
No related merge requests found
......@@ -26,7 +26,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.3.10.RELEASE</version>
<version>2.7.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......@@ -45,6 +45,13 @@
<artifactId>springfox-boot-starter</artifactId>
<version>${springfox.version}</version>
</dependency>
<!-- <dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.6.9</version>
</dependency> -->
</dependencies>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -23,7 +23,7 @@
<properties>
<azure.version>2.1.7</azure.version>
<osdu.corelibazure.version>0.14.0-rc2</osdu.corelibazure.version>
<osdu.corelibazure.version>0.18.0-rc7</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.13.0</osdu.oscorecommon.version>
<osdu.os-schema-core.version>0.18.0-SNAPSHOT</osdu.os-schema-core.version>
<mockito.version>1.10.19</mockito.version>
......@@ -56,7 +56,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
<version>2.4.5</version>
<version>2.7.5</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
......@@ -88,6 +88,29 @@
<dependencies>
<!-- API documentation. Refer the link http://springfox.github.io/springfox/docs/2.7.0/#introduction -->
<!--<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>2.7.0</version>
</dependency>-->
<!-- https://mvnrepository.com/artifact/org.springdoc/springdoc-openapi-ui -->
<!--<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.6.9</version>
</dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>2021.0.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
......
......@@ -22,7 +22,9 @@ import org.opengroup.osdu.schema.azure.di.PubSubConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
//@EnableWebMvc
@SpringBootApplication(exclude = {
org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class})
@ComponentScan({ "org.opengroup" })
......
......@@ -37,6 +37,7 @@ azure.storage.account-name=${storage_account}
azure.storage.container-name=opendes
azure.storage.enable-https=true
spring.mvc.pathmatch.matching-strategy = ANT_PATH_MATCHER
#Azure App Insights configuration
azure.application-insights.instrumentation-key=${appinsights_key}
......@@ -53,6 +54,7 @@ logging.transaction.enabled=true
logging.slf4jlogger.enabled=true
#TenantFactory Configuration
tenantFactoryImpl.required=true
tenantInfo.container.name=TenantInfo
......
......@@ -21,6 +21,7 @@ import org.opengroup.osdu.schema.exceptions.BadRequestException;
import org.opengroup.osdu.schema.exceptions.NotFoundException;
import org.opengroup.osdu.schema.service.ISchemaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
/**
......@@ -31,7 +32,7 @@ import org.springframework.stereotype.Component;
public class SchemaResolver {
@Autowired
private ISchemaService schemaService;
@Lazy private ISchemaService schemaService;
@Autowired
JaxRsDpsLog log;
......
......@@ -17,6 +17,7 @@ import org.opengroup.osdu.schema.validation.version.model.SchemaBreakingChanges;
import org.opengroup.osdu.schema.validation.version.model.SchemaHandlerVO;
import org.opengroup.osdu.schema.validation.version.model.SchemaPatch;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
......@@ -29,7 +30,7 @@ public class CompositionPropertiesHandler implements SchemaValidationHandler{
private SchemaValidationHandler nextHandler;
@Autowired
SchemaValidationManager validationManager;
@Lazy SchemaValidationManager validationManager;
@Autowired
SchemaUtil schemaUtil;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment