From d567ebe4b4f74ad9ac442cca27c361c971c67e1e Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Sun, 13 Oct 2024 15:27:43 +0200 Subject: Upgrade aai-common dependency to 1.15.1-SNAPSHOT - remove ActiveMq dependency Issue-ID: AAI-4017 Change-Id: Ie475172ad13bc5ddd482822db36f1ce48bc846c9 Signed-off-by: Fiete Ostkamp --- src/main/resources/application.properties | 6 +++--- src/main/resources/etc/appprops/aaiconfig.properties | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 47ab0bc..ba35da5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -32,9 +32,6 @@ server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0) server.ssl.client-auth=want server.ssl.key-store-type=JKS -# JMS bind address host port -jms.bind.address=tcp://localhost:61450 - # dmaap is deprecated and now replaced with kafka spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS} spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT @@ -109,4 +106,7 @@ management.metrics.web.server.auto-time-requests=false # but doesn't show up in micrometer metrics aai.actuator.echo.enabled=false +aai.notifications.enabled=false +BOOTSTRAP_SERVERS=localhost:9092 +JAAS_CONFIG= diff --git a/src/main/resources/etc/appprops/aaiconfig.properties b/src/main/resources/etc/appprops/aaiconfig.properties index b2dd2ed..235cbda 100644 --- a/src/main/resources/etc/appprops/aaiconfig.properties +++ b/src/main/resources/etc/appprops/aaiconfig.properties @@ -65,7 +65,7 @@ aai.default.api.version=v14 aai.model.delete.sleep.per.vtx.msec=500 aai.model.query.resultset.maxcount=50 aai.model.query.timeout.sec=90 - + # Used by Data Grooming aai.grooming.default.max.fix=150 aai.grooming.default.sleep.minutes=7 @@ -90,8 +90,6 @@ aai.forceDel.protected.descendant.count=10 aai.ctagPool.rangeString.vplsPe1=2001-2500 aai.ctagPool.rangeString.vplsPe2=2501-3000 -aai.jms.enable=false - #used by the dataGrooming and dataSnapshot cleanup tasks aai.cron.enable.datagroomingcleanup=true aai.cron.enable.datasnapshotcleanup=true -- cgit