diff --git a/pom.xml b/pom.xml index c148fd375a65588a7ce7a39dc0a1ff84c10c5f6c..9b16082e96d75da35321e0863f33d7cc150fe400 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> <spring-cloud.version>Greenwich.SR2</spring-cloud.version> - <os-core-common.version>0.14.0-rc4</os-core-common.version> + <os-core-common.version>0.14.0-rc7</os-core-common.version> <snakeyaml.version>1.26</snakeyaml.version> <hibernate-validator.version>6.1.5.Final</hibernate-validator.version> <jackson.version>2.11.4</jackson.version> @@ -24,7 +24,7 @@ <reactor-netty.version>0.8.20.RELEASE</reactor-netty.version> <woodstox-core.version>6.2.3</woodstox-core.version> <log4j2.version>2.17.1</log4j2.version> - <spring-boot.version>2.1.18.RELEASE</spring-boot.version> +<!-- <spring-boot.version>2.1.18.RELEASE</spring-boot.version>--> <json-smart.version>2.4.7</json-smart.version> <!-- <maven.war.plugin>2.6</maven.war.plugin>--> <!-- <appengine.maven.plugin>1.0.0</appengine.maven.plugin>--> @@ -46,12 +46,19 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-dependencies</artifactId> - <version>${spring-boot.version}</version> + <groupId>org.opengroup.osdu</groupId> + <artifactId>os-core-common</artifactId> + <version>${os-core-common.version}</version> <type>pom</type> <scope>import</scope> </dependency> +<!-- <dependency>--> +<!-- <groupId>org.springframework.boot</groupId>--> +<!-- <artifactId>spring-boot-dependencies</artifactId>--> +<!-- <version>${spring-boot.version}</version>--> +<!-- <type>pom</type>--> +<!-- <scope>import</scope>--> +<!-- </dependency>--> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-to-slf4j</artifactId> @@ -69,11 +76,7 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> - <groupId>org.opengroup.osdu</groupId> - <artifactId>os-core-common</artifactId> - <version>${os-core-common.version}</version> - </dependency> + <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> @@ -138,6 +141,11 @@ </dependencyManagement> <dependencies> + <dependency> + <groupId>org.opengroup.osdu</groupId> + <artifactId>os-core-common</artifactId> + <version>${os-core-common.version}</version> + </dependency> <dependency> <groupId>org.projectlombok</groupId> <artifactId>lombok</artifactId>