Commit 2a4dc08e authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'cherry-pick-dependency-upgrade' into 'release/0.13'

Cherry-pick 'Updating Libraries to Latest Release Version' into 'release/0.13'

See merge request !166
parents 3dc91d48 408c75d8
Pipeline #92253 failed with stages
in 31 minutes and 1 second
This diff is collapsed.
......@@ -43,7 +43,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.13.0-rc7</version>
<version>0.13.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......
......@@ -26,7 +26,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<docker.image.prefix>opendes</docker.image.prefix>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-core-common.version>0.13.0-rc7</os-core-common.version>
<os-core-common.version>0.13.0</os-core-common.version>
<jackson.version>2.11.2</jackson.version>
<netty.version>4.1.51.Final</netty.version>
<snakeyaml.version>1.26</snakeyaml.version>
......
......@@ -42,7 +42,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.13.0-rc7</version>
<version>0.13.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......@@ -65,7 +65,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.13.0-rc4</version>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
......@@ -37,8 +37,8 @@
<java.version>1.8</java.version>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<osdu.corelibazure.version>0.13.0-rc10</osdu.corelibazure.version>
<osdu.oscorecommon-version>0.13.0-rc7</osdu.oscorecommon-version>
<osdu.corelibazure.version>0.13.0-rc6</osdu.corelibazure.version>
<osdu.oscorecommon-version>0.13.0</osdu.oscorecommon-version>
<nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
</properties>
......@@ -52,6 +52,31 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
<version>${log4j2.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -160,4 +185,4 @@
</plugins>
</build>
</project>
\ No newline at end of file
</project>
......@@ -59,12 +59,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>osm</artifactId>
<version>0.13.0-rc1</version>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>obm</artifactId>
<version>0.13.0-rc1</version>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
......
......@@ -16,7 +16,7 @@
<properties>
<version.number>0.13.0-SNAPSHOT</version.number>
<os-core-lib-ibm.version>0.13.0-rc7</os-core-lib-ibm.version>
<os-core-lib-ibm.version>0.13.0</os-core-lib-ibm.version>
<start-class>org.opengroup.osdu.dataset.provider.ibm.IBMDatasetRegistry</start-class>
<log4j2.version>2.17.1</log4j2.version>
<!--<os-core-common.version>0.3.28</os-core-common.version>-->
......
......@@ -40,13 +40,13 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
<version>0.13.0-rc4</version>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.13.0-rc7</version>
<version>0.13.0</version>
</dependency>
<dependency>
......
......@@ -18,7 +18,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.basedir>${project.basedir}</project.main.basedir>
<os-core-common.version>0.13.0-rc7</os-core-common.version>
<os-core-common.version>0.13.0</os-core-common.version>
</properties>
<dependencies>
......@@ -53,7 +53,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>0.13.0-rc10</version>
<version>0.13.0-rc6</version>
<scope>test</scope>
<exclusions>
<exclusion>
......
......@@ -34,7 +34,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.basedir>${project.basedir}</project.main.basedir>
<osdu.oscorecommon.version>0.13.0-rc7</osdu.oscorecommon.version>
<osdu.oscorecommon.version>0.13.0</osdu.oscorecommon.version>
</properties>
<dependencies>
<dependency>
......
......@@ -51,12 +51,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.13.0-rc5</version>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.13.0-rc7</version>
<version>0.13.0</version>
<exclusions>
<exclusion>
<groupId>com.google.http-client</groupId>
......
......@@ -24,8 +24,8 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.main.basedir>${project.basedir}</project.main.basedir>
<os-core-common.version>0.13.0-rc7</os-core-common.version>
<os-core-lib-ibm.version>0.13.0-rc7</os-core-lib-ibm.version>
<os-core-common.version>0.13.0</os-core-common.version>
<os-core-lib-ibm.version>0.13.0</os-core-lib-ibm.version>
</properties>
<dependencies>
......@@ -37,7 +37,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.13.0-rc7</version>
<version>0.13.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
Supports Markdown
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