Use 1.15.5 aai-common release

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

4 files changed, 4 insertions, 37 deletions

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 41d0d74..66f0da5 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -21,16 +21,8 @@ server.tomcat.max-idle-time=60000
 # If you get an application startup failure that the port is already taken
 # If thats not it, please check if the key-store file path makes sense
 server.local.startpath=src/main/resources
-server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties
 
 server.port=8449
-server.ssl.enabled-protocols=TLSv1.1,TLSv1.2
-server.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore
-server.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
-server.ssl.trust-store=${server.local.startpath}/etc/auth/aai_keystore
-server.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
-server.ssl.client-auth=want
-server.ssl.key-store-type=JKS
 
 # dmaap is deprecated and now replaced with kafka
 spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
@@ -75,21 +67,10 @@ schema.service.nodes.endpoint=nodes?version=
 schema.service.edges.endpoint=edgerules?version=
 schema.service.versions.endpoint=versions
 
-schema.service.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore
-schema.service.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
-schema.service.ssl.trust-store=${server.local.startpath}/etc/auth/aai_keystore
-schema.service.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
-
-aaf.cadi.file=${server.local.startpath}/cadi.properties
-
 aperture.rdbmsname=aai_relational
 
 aperture.service.client=no-auth
 aperture.service.base.url=http://localhost:8457/aai/aperture
-aperture.service.ssl.key-store=${server.local.startpath}/etc/auth/aai_keystore
-aperture.service.ssl.trust-store=${server.local.startpath}/etc/auth/aai_keystore
-aperture.service.ssl.key-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
-aperture.service.ssl.trust-store-password=password(OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0)
 aperture.service.timeout-in-milliseconds=300000
 
 #To Expose the Prometheus scraping endpoint
@@ -112,3 +93,7 @@ aai.notifications.enabled=false
 BOOTSTRAP_SERVERS=localhost:9092
 JAAS_CONFIG=
 aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
+
+aai.basic-auth.enabled=true
+aai.basic-auth.users[0].username=AAI
+aai.basic-auth.users[0].password=AAI
diff --git a/src/main/resources/etc/appprops/aaiconfig.properties b/src/main/resources/etc/appprops/aaiconfig.properties
index 235cbda..c37394c 100644
--- a/src/main/resources/etc/appprops/aaiconfig.properties
+++ b/src/main/resources/etc/appprops/aaiconfig.properties
@@ -39,11 +39,6 @@ aai.global.callback.url=https://localhost:8443/aai/
 
 # Start of INTERNAL Specific Properties
 
-aai.truststore.filename=aai_keystore
-aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-aai.keystore.filename=aai-client-cert.p12
-aai.keystore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
-
 aai.realtime.clients=RO,SDNC,MSO,SO
 
 # End of INTERNAL Specific Properties
diff --git a/src/main/resources/etc/auth/aai_keystore b/src/main/resources/etc/auth/aai_keystore
deleted file mode 100644
index 16d93a7..0000000
--- a/src/main/resources/etc/auth/aai_keystore
+++ /dev/null
diff --git a/src/main/resources/etc/auth/realm.properties b/src/main/resources/etc/auth/realm.properties
deleted file mode 100644
index f0e0172..0000000
--- a/src/main/resources/etc/auth/realm.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# format : username: password[,rolename ...]
-# default username/password: AAI/AAI, MSO/MSO, ModelLoader/ModelLoader...
-AAI:OBF:1gfr1ev31gg7,admin
-MSO:OBF:1jzx1lz31k01,admin
-SDNC:OBF:1itr1i0l1i151isv,admin
-DCAE:OBF:1g8u1f9d1f991g8w,admin
-POLICY:OBF:1mk61i171ima1im41i0j1mko,admin
-ASDC:OBF:1f991j0u1j001f9d,admin
-VID:OBF:1jm91i0v1jl9,admin
-APPC:OBF:1f991ksf1ksf1f9d,admin
-ModelLoader:OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw,admin
-AaiUI:OBF:1gfr1p571unz1p4j1gg7,admin
-OOF:OBF:1img1ke71ily,admin