Skip to content
Snippets Groups Projects
Commit 3b91fd06 authored by Solomon Ayalew's avatar Solomon Ayalew
Browse files

Merge branch 'solxget/Issue_160' into 'master'

Update os-core-common version

See merge request !487
parents caff27d4 76fb9cda
No related branches found
No related tags found
1 merge request!487Update os-core-common version
Pipeline #228242 failed
......@@ -430,6 +430,7 @@ The following software have components provided under the terms of this license:
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/, http://hamcrest.org/JavaHamcrest/, https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core)
- JSch (from http://www.jcraft.com/jsch/)
- Jackson module: Afterburner (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-modules-base)
- Jakarta Activation API (from https://github.com/eclipse-ee4j/jaf, https://github.com/jakartaee/jaf-api, https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api)
- Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
......@@ -799,13 +800,6 @@ The following software have components provided under the terms of this license:
- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
========================================================================
mit-old-style-no-advert
========================================================================
The following software have components provided under the terms of this license:
- Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave)
========================================================================
proprietary-license
========================================================================
......
......@@ -17,7 +17,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-core</artifactId>
<version>0.25.0-SNAPSHOT</version>
<description>Core project for the partition service</description>
<packaging>jar</packaging>
......@@ -29,9 +28,6 @@
</parent>
<properties>
<java.version>17</java.version>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<openapi.version>1.7.0</openapi.version>
<mockito.core.version>3.4.0</mockito.core.version>
<assertj_core_version>3.16.1</assertj_core_version>
......@@ -40,7 +36,6 @@
<maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version>
<maven_failsafe_plugin_version>3.0.0-M4</maven_failsafe_plugin_version>
<spring-webmvc.version>5.3.30</spring-webmvc.version>
<os-core-common.version>0.24.0</os-core-common.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
</properties>
......@@ -73,7 +68,6 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>${os-core-common.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
......
......@@ -26,7 +26,7 @@
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-common.version>0.24.0</os-core-common.version>
<os-core-common.version>0.25.0-rc2</os-core-common.version>
<org.springframework.boot.version>2.4.5</org.springframework.boot.version>
<log4j.version>2.17.1</log4j.version>
<guava.version>32.1.2-jre</guava.version>
......
......@@ -27,12 +27,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-aws</artifactId>
<version>0.25.0-SNAPSHOT</version>
<description>Partition service on AWS</description>
<packaging>jar</packaging>
<properties>
<aws.version>1.11.1018</aws.version>
<aws.version>1.12.261</aws.version>
<deployment.environment>dev</deployment.environment>
<spring-webmvc.version>5.3.24</spring-webmvc.version>
<maven_surefire_plugin_version>3.0.0-M4</maven_surefire_plugin_version>
......@@ -79,6 +78,11 @@
</dependency>
<!-- Third party Apache 2.0 license packages -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.8.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
......@@ -87,18 +91,15 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
<version>2.7.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
<version>2.7.8</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
......@@ -146,7 +147,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.3.30</version>
</dependency>
</dependencies>
......
......@@ -10,7 +10,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-azure</artifactId>
<version>0.25.0-SNAPSHOT</version>
<description>Partition service on Azure</description>
<packaging>jar</packaging>
......@@ -29,6 +28,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.7.17</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Inherit managed dependencies from core-lib-azure -->
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -12,7 +12,6 @@
</parent>
<artifactId>partition-gc</artifactId>
<version>0.25.0-SNAPSHOT</version>
<description>Partition service on Google Cloud</description>
<packaging>jar</packaging>
......@@ -28,7 +27,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.7.10</version>
<version>2.7.17</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......
......@@ -15,7 +15,6 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>partition-ibm</artifactId>
<version>0.25.0-SNAPSHOT</version>
<description>Partition service on IBM</description>
<packaging>jar</packaging>
......
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