From abfaee8128ecc8bfb1fe7562631fb0d765b22d8c Mon Sep 17 00:00:00 2001
From: "waqas.ikram" <waqas.ikram@est.tech>
Date: Wed, 16 Jun 2021 16:54:04 +0100
Subject: [PATCH] Changing ONAP logging dependencies to a released

version

Change-Id: Ia93db231c3b8e2403eeec7d6ffe0fe49dd6b8bf1
Issue-ID: SO-3673
Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
---
 bpmn/MSOCommonBPMN/pom.xml                 |  2 +-
 bpmn/so-bpmn-infrastructure-common/pom.xml | 10 ++---
 pom.xml                                    | 62 +++++++++++++++---------------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/bpmn/MSOCommonBPMN/pom.xml b/bpmn/MSOCommonBPMN/pom.xml
index c051aac9b8..817d70c0da 100644
--- a/bpmn/MSOCommonBPMN/pom.xml
+++ b/bpmn/MSOCommonBPMN/pom.xml
@@ -163,7 +163,7 @@
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
-      </dependency>
+    </dependency>
     <dependency>
       <!-- Needed for InMemoryH2Test -->
       <groupId>com.h2database</groupId>
diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index c6a4ffc01d..0c5a0f3132 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -132,11 +132,11 @@
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
     </dependency>
- <dependency>
-    <groupId>org.apache.cxf</groupId>
-    <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
-    <version>3.4.2</version>
-</dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-rt-rs-service-description-openapi-v3</artifactId>
+      <version>3.4.2</version>
+    </dependency>
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
diff --git a/pom.xml b/pom.xml
index a665440d04..2a69268f87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,6 @@
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
     <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-    <!--sonar.jacoco.itReportPath>${project.mso.base.folder}/packages/arquillian-unit-tests/target/mso-automated-tests/jacoco-it.exec</sonar.jacoco.itReportPath -->
     <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>
     <sonar.projectVersion>${project.version}</sonar.projectVersion>
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
@@ -76,6 +75,7 @@
     <bowman.client.version>0.9.0</bowman.client.version>
     <aaf.cadi.version>2.1.15</aaf.cadi.version>
     <so-etsi-sol003-adapter-version>1.8.1-SNAPSHOT</so-etsi-sol003-adapter-version>
+    <onap-logging-version>1.6.9</onap-logging-version>
   </properties>
   <distributionManagement>
     <repository>
@@ -849,17 +849,17 @@
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-slf4j</artifactId>
-        <version>1.6.10-SNAPSHOT</version>
+        <version>${onap-logging-version}</version>
       </dependency>
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-filter-base</artifactId>
-        <version>1.6.10-SNAPSHOT</version>
+        <version>${onap-logging-version}</version>
       </dependency>
       <dependency>
         <groupId>org.onap.logging-analytics</groupId>
         <artifactId>logging-filter-spring</artifactId>
-        <version>1.6.10-SNAPSHOT</version>
+        <version>${onap-logging-version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
@@ -1055,43 +1055,43 @@
         <scope>runtime</scope>
       </dependency>
       <dependency>
-      	<groupId>ch.vorburger.mariaDB4j</groupId>
-      	<artifactId>mariaDB4j</artifactId>
-      	<version>2.3.0</version>
-      	<scope>test</scope>
+        <groupId>ch.vorburger.mariaDB4j</groupId>
+        <artifactId>mariaDB4j</artifactId>
+        <version>2.3.0</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-      	<groupId>org.springframework.cloud</groupId>
-      	<artifactId>spring-cloud-contract-wiremock</artifactId>
-      	<version>1.2.4.RELEASE</version>
-      	<scope>test</scope>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-contract-wiremock</artifactId>
+        <version>1.2.4.RELEASE</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-      	<groupId>org.camunda.bpm.assert</groupId>
-      	<artifactId>camunda-bpm-assert</artifactId>
-      	<version>3.0.0</version>
-      	<scope>test</scope>
+        <groupId>org.camunda.bpm.assert</groupId>
+        <artifactId>camunda-bpm-assert</artifactId>
+        <version>3.0.0</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-      	<groupId>janino</groupId>
-      	<artifactId>janino</artifactId>
-      	<version>2.5.15</version>
+        <groupId>janino</groupId>
+        <artifactId>janino</artifactId>
+        <version>2.5.15</version>
       </dependency>
       <dependency>
-      	<groupId>org.camunda.bpm</groupId>
-      	<artifactId>camunda-external-task-client</artifactId>
-      	<version>1.4.0</version>
+        <groupId>org.camunda.bpm</groupId>
+        <artifactId>camunda-external-task-client</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+      <dependency>
+        <groupId>pl.pragmatists</groupId>
+        <artifactId>JUnitParams</artifactId>
+        <version>1.0.5</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
-      	<groupId>pl.pragmatists</groupId>
-      	<artifactId>JUnitParams</artifactId>
-      	<version>1.0.5</version>
-      	<scope>test</scope>
-   	  </dependency>
-   	  <dependency>
-      	<groupId>io.swagger.core.v3</groupId>
-      	<artifactId>swagger-jaxrs2</artifactId>
-      	<version>2.1.7</version>
+        <groupId>io.swagger.core.v3</groupId>
+        <artifactId>swagger-jaxrs2</artifactId>
+        <version>2.1.7</version>
       </dependency>
       <dependency>
         <groupId>org.camunda.bpm</groupId>
-- 
2.16.6