Uplift Spring dependenciesHEADmaster

Issue-ID: POLICY-5074
Change-Id: Ib88e02ffc6867a007abfd0322319caf672c00e45
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

4 files changed, 28 insertions, 118 deletions

diff --git a/runtime-acm/src/test/resources/application-prometheus-noauth.yaml b/runtime-acm/src/test/resources/application-prometheus-noauth.yaml
index 57da3af18..a75c5d36f 100644
--- a/runtime-acm/src/test/resources/application-prometheus-noauth.yaml
+++ b/runtime-acm/src/test/resources/application-prometheus-noauth.yaml
@@ -10,37 +10,6 @@ spring:
       ddl-auto: create
     open-in-view: false
 
-server:
-  servlet:
-    context-path: /onap/policy/clamp/acm
-
-runtime:
-  topics:
-    operationTopic: policy-acruntime-participant
-    syncTopic: acm-ppnt-sync
-  participantParameters:
-    updateParameters:
-      maxRetryCount: 3
-  topicParameterGroup:
-    topicSources:
-      -
-        topic: ${runtime.topics.operationTopic}
-        servers:
-          - localhost
-        topicCommInfrastructure: noop
-        fetchTimeout: 15000
-    topicSinks:
-      -
-        topicCommInfrastructure: noop
-        servers:
-          - localhost
-        topic: ${runtime.topics.operationTopic}
-
-      - topic: ${runtime.topics.syncTopic}
-        servers:
-          - ${topicServer:kafka:9092}
-        topicCommInfrastructure: noop
-
 tracing:
   enabled: true
   exporter:
diff --git a/runtime-acm/src/test/resources/application-test.yaml b/runtime-acm/src/test/resources/application-test.yaml
index 31e54737e..e3d4a48df 100644
--- a/runtime-acm/src/test/resources/application-test.yaml
+++ b/runtime-acm/src/test/resources/application-test.yaml
@@ -7,60 +7,5 @@ spring:
       maximumPoolSize: 3
   jpa:
     hibernate:
-      ddl-auto: create
+      ddl-auto: create-drop
     open-in-view: false
-
-server:
-  servlet:
-    context-path: /onap/policy/clamp/acm
-
-runtime:
-  topics:
-    operationTopic: policy-acruntime-participant
-    syncTopic: acm-ppnt-sync
-  participantParameters:
-    updateParameters:
-      maxRetryCount: 3
-  topicParameterGroup:
-    topicSources:
-      -
-        topic: ${runtime.topics.operationTopic}
-        servers:
-          - kafka:9092
-        topicCommInfrastructure: NOOP
-        fetchTimeout: 15000
-    topicSinks:
-      -
-        topicCommInfrastructure: NOOP
-        servers:
-          - kafka:9092
-        topic: ${runtime.topics.operationTopic}
-      -
-        topic: ${runtime.topics.syncTopic}
-        servers:
-            - ${topicServer:kafka:9092}
-        topicCommInfrastructure: NOOP
-  acmParameters:
-    acElementName: org.onap.policy.clamp.acm.AutomationCompositionElement
-    acNodeType: org.onap.policy.clamp.acm.AutomationComposition
-
-management:
-  endpoints:
-    web:
-      base-path: /
-      exposure:
-        include: health, metrics, prometheus
-  tracing:
-    propagation:
-      produce: b3
-    sampling:
-      probability: 1.0
-
-tracing:
-  enabled: true
-  exporter:
-    endpoint: http://jaeger:4317
-    protocol: grpc
-  sampler:
-    jaeger-remote:
-      endpoint: http://jaeger:14250
\ No newline at end of file
diff --git a/runtime-acm/src/test/resources/application-tracing.yaml b/runtime-acm/src/test/resources/application-tracing.yaml
new file mode 100644
index 000000000..d24fe9c53
--- /dev/null
+++ b/runtime-acm/src/test/resources/application-tracing.yaml
@@ -0,0 +1,27 @@
+spring:
+  datasource:
+    url: jdbc:h2:mem:testdb
+    driverClassName: org.h2.Driver
+    hikari:
+      maxLifetime: 1800000
+      maximumPoolSize: 3
+  jpa:
+    hibernate:
+      ddl-auto: create-drop
+    open-in-view: false
+
+management:
+  tracing:
+    propagation:
+      produce: b3
+    sampling:
+      probability: 1.0
+
+tracing:
+  enabled: true
+  exporter:
+    endpoint: http://jaeger:4317
+    protocol: grpc
+  sampler:
+    jaeger-remote:
+      endpoint: http://jaeger:14250
\ No newline at end of file
diff --git a/runtime-acm/src/test/resources/testscripts/listenOnTopic.sh b/runtime-acm/src/test/resources/testscripts/listenOnTopic.sh
deleted file mode 100755
index 5e661777b..000000000
--- a/runtime-acm/src/test/resources/testscripts/listenOnTopic.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/bash
-#  ============LICENSE_START=======================================================
-#  Copyright (C) 2021 Nordix Foundation.
-#  ================================================================================
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#  SPDX-License-Identifier: Apache-2.0
-#  ============LICENSE_END=========================================================
-
-if [ $# -ne 1 ]
-then
-    echo invalid parameters $*, specify a single parameter as the topic to listen on
-    exit 1
-fi
-
-while true
-do
-    curl "http://localhost:3904/events/$1/TEST/1?timeout=60000"
-    echo ""
-done
-