Upgrade aai-common dependency to 1.15.1-SNAPSHOT

- remove ActiveMQ dependencies

Issue-ID: AAI-4017
Change-Id: I05f91629c7a4a29d63cb87ed9777f1e782d82616
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

2 files changed, 5 insertions, 8 deletions

diff --git a/aai-traversal/src/main/resources/application.properties b/aai-traversal/src/main/resources/application.properties
index de08b4e..b4f7c59 100644
--- a/aai-traversal/src/main/resources/application.properties
+++ b/aai-traversal/src/main/resources/application.properties
@@ -9,7 +9,6 @@ spring.jersey.type=filter
 spring.main.allow-bean-definition-overriding=true
 
 spring.zipkin.baseUrl=http://jaeger-collector.istio-system:9411
-spring.sleuth.messaging.jms.enabled=false
 spring.sleuth.trace-id128=true
 spring.sleuth.sampler.probability=1.0
 spring.sleuth.propagation.type=w3c,b3
@@ -68,13 +67,10 @@ schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,v21,v22,v23,v24,
 schema.source.name=onap
 # End of Internal Specific Properties
 
-# JMS bind address host port
-jms.bind.address=tcp://localhost:61646
-
 # dmaap is deprecated and now replaced with kafka
 spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
 spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
-spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512 
+spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512
 spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
 spring.kafka.producer.properties.sasl.jaas.config = ${JAAS_CONFIG}
@@ -147,3 +143,7 @@ scrape.uri.metrics=true
 # this does the same as the /echo endpoint,
 # but doesn't show up in micrometer metrics
 aai.actuator.echo.enabled=false
+
+BOOTSTRAP_SERVERS=localhost:9092
+JAAS_CONFIG=""
+aai.notifications.enabled=false
diff --git a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties
index 79eb709..b9e161e 100644
--- a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties
+++ b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties
@@ -52,8 +52,6 @@ aai.default.api.version=v19
 # Used by Model-processing code
 aai.model.query.resultset.maxcount=50
 aai.model.query.timeout.sec=90
- 
-aai.jms.enable=false
 
 #timeout for traversal enabled flag
 aai.traversal.timeoutenabled=true
@@ -76,4 +74,3 @@ aai.dsl.max.nodecount=15
 
 # Threshold for margin of error (in ms) for resources_with_sot format to derive the most recent http method performed
 aai.resource.formatter.threshold=10
-