Revert "Update so common deps in cnf-adapter to 1.15.6"

This reverts commit dec4b87cd893d1249fd7c1ed42dc90d3772d6290.

Reason for revert: gating is not passing

Issue-ID: SO-4214
Change-Id: I01f14cb47cad0ff9bfed5aa650fe8732a01ce357
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/pom.xml b/pom.xml
index 10d6232..15817f2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.so</groupId>
         <artifactId>so</artifactId>
-        <version>1.15.6-SNAPSHOT</version>
+        <version>1.15.0-SNAPSHOT</version>
     </parent>
     <groupId>org.onap.so.adapters.so-cnf-adapter</groupId>
     <artifactId>so-cnf-adapter</artifactId>
@@ -20,7 +20,7 @@
         <gson-version>2.8.9</gson-version>
         <swagger-core-v3-version>2.1.13</swagger-core-v3-version>
         <version-swagger-codegen-v3>3.0.33</version-swagger-codegen-v3>
-        <so-core-version>1.15.6-SNAPSHOT</so-core-version>
+        <so-core-version>1.12.1-SNAPSHOT</so-core-version>
         <equalsverifier-version>3.4.1</equalsverifier-version>
         <snakeyaml-version>0.11</snakeyaml-version>
         <kubernetes-client-version>16.0.0</kubernetes-client-version>

diff --git a/so-cnf-adapter-application/pom.xml b/so-cnf-adapter-application/pom.xml
index 55d8c42..d0daeb0 100755 (executable)
--- a/so-cnf-adapter-application/pom.xml
+++ b/so-cnf-adapter-application/pom.xml
@@ -117,7 +117,7 @@
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>
-        <version>2020.0.6</version>
+        <version>Hoxton.SR12</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java
index 2d54c83..fbdfe5d 100644 (file)
--- a/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java
+++ b/so-cnf-adapter-application/src/test/java/org/onap/so/adapters/cnf/rest/TracingTest.java
@@ -24,8 +24,8 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.sleuth.autoconfig.instrument.web.TraceWebAutoConfiguration;
-import org.springframework.cloud.sleuth.autoconfig.zipkin2.ZipkinAutoConfiguration;
+import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration;
+import org.springframework.cloud.sleuth.zipkin2.ZipkinAutoConfiguration;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
@@ -43,7 +43,7 @@ import lombok.SneakyThrows;
 
 @Ignore
 @EnableAutoConfiguration
-@ImportAutoConfiguration(classes = { TraceWebAutoConfiguration.class, ZipkinAutoConfiguration.class })
+@ImportAutoConfiguration(classes = { TraceAutoConfiguration.class, ZipkinAutoConfiguration.class })
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {
     "spring.sleuth.enabled=true",
     "spring.sleuth.sampler.probability=1.0"

diff --git a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/MockedHelmClient.java b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/MockedHelmClient.java
index 8b37744..1729b5d 100644 (file)
--- a/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/MockedHelmClient.java
+++ b/so-cnfm/so-cnfm-lcm/so-cnfm-lcm-bpmn-flows/src/test/java/org/onap/so/cnfm/lcm/bpmn/flows/tasks/MockedHelmClient.java
@@ -26,12 +26,14 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import org.onap.so.cnfm.lcm.bpmn.flows.exceptions.HelmClientExecuteException;
 import org.onap.so.cnfm.lcm.bpmn.flows.extclients.helm.HelmClient;
+import org.springframework.stereotype.Service;
 
 /**
  *
  * @author Waqas Ikram (waqas.ikram@est.tech)
  *
  */
+@Service
 public class MockedHelmClient implements HelmClient {
 
     private final Map<String, Integer> counter = new ConcurrentHashMap<>();

diff --git a/version.properties b/version.properties
index 8fcf1b7..362b4c7 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 
 major=1
 minor=13
-patch=1
+patch=0
 
 base_version=${major}.${minor}.${patch}