Skip to content
Snippets Groups Projects
Commit 5c8e823e authored by Harsheet Shah's avatar Harsheet Shah
Browse files

PBI-6584: Upgrade spring boot dependencies. Spring boot dependencies are...

PBI-6584: Upgrade spring boot dependencies. Spring boot dependencies are inherited from os-common-core.
parent cfdbcd6a
No related branches found
No related tags found
2 merge requests!346Merge branch 'aws-integration' into 'master',!300PBI-6584: Upgrade spring boot dependencies. Spring boot dependencies are...
Pipeline #100823 failed
......@@ -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>
......
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