Carry forward honolulu fixes

This change carries forward the following fixes from Honolulu to master

Update to allow ranges for ccsdk.sli.version

Update to allow ccsdk.sli.version to be passed with a range as a value

Change-Id: Ibb37082bf8162300ae2de37f33b0e4672b796293
Issue-ID: CCSDK-3209
Signed-off-by: Dan Timoney <dtimoney@att.com>
(cherry picked from commit c3e800149c947ecc9b76a2e3b990664fc5d41ce1)

Minor Refactoring of sliboot pom

Issue-ID: CCSDK-3343
Change-Id: I66d4e2840ff86e092a23453384d02ce49b7048ac
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>

Use CadiFilter instead of shiro

Microservices should use CadiFilter rather than shiro to integrate
with AAF

Change-Id: I95b9a844b7ac868f864134de7345013001357352
Issue-ID: SDNC-1523
Signed-off-by: Dan Timoney <dtimoney@att.com>
(cherry picked from commit a90eecf70419ec4acba6f5a8425300eef7f45290)

Minor Refactoring of sliboot pom

Updating docker-maven-plugin to 0.34.0 and
removing docker image build goal (it was there twice)

Issue-ID: CCSDK-3343
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I26401befaf235ddfe694c6206cbd547cbc56cc03
(cherry picked from commit 108a13c20757f4a437aea22880f019e6e6043841)

missing logs

Add filters for audit and request/response log
Add filters for audit and request/response log

Issue-ID: CCSDK-3367
Signed-off-by: lalena.aria <lalena.aria@att.com>
Change-Id: Id292c1f5109f0c3846a0357d0618f607011825a4

Add code to handle content type plain/text

Add code to handle content type plain/text

Issue-ID: CCSDK-3378
Signed-off-by: lalena.aria <lalena.aria@att.com>
Change-Id: Id4a30ad5ca81db0e7e3a328cc5d2496c42c9e150
Signed-off-by: Dan Timoney <dtimoney@att.com>

1201 sanity test

Add bean for IpAddressTool plugin
Add missing import
Add bean for IpAddressTool plugin
Add missing import
Fx typo (text/plain instead of plain/text)

Issue-ID: CCSDK-3379
Signed-off-by: lalena.aria <lalena.aria@att.com>
Change-Id: I208a6eaf462f86c2a3015af9bf9026ad11efa14b
Signed-off-by: Dan Timoney <dtimoney@att.com>

Use version 1.1.8 of parent

Use version 1.1.8 of parent in order to use APL-licensed version
of liquibase

Issue-ID: CCSDK-3423
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: I1db475fa8991d617d22536ce38d51f96c7806f85

4 files changed, 34 insertions, 4 deletions

diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml
index b9a16ffa..84b9cc51 100644
--- a/ms/neng/pom.xml
+++ b/ms/neng/pom.xml
@@ -18,7 +18,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ms/pom.xml b/ms/pom.xml
index 836a4b56..94cd841e 100644
--- a/ms/pom.xml
+++ b/ms/pom.xml
@@ -18,7 +18,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml
index a9ffec0b..783e7fd3 100644
--- a/ms/sliboot/pom.xml
+++ b/ms/sliboot/pom.xml
@@ -105,6 +105,40 @@
             <version>${aaf.cadi.version}</version>
             <scope>runtime</scope>
         </dependency>
+        <!-- Needed by logging-analytics payload logging filter -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
+            <version>3.4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-client</artifactId>
+            <version>${aaf.cadi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-cadi-core</artifactId>
+            <version>${aaf.cadi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-auth-client</artifactId>
+            <version>${aaf.cadi.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-env</artifactId>
+            <version>${aaf.cadi.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.aaf.authz</groupId>
+            <artifactId>aaf-misc-rosetta</artifactId>
+            <version>${aaf.cadi.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>services</artifactId>
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
index beab2569..2bca1dbc 100644
--- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
@@ -50,8 +50,6 @@ public class SlibootApp {
     SpringApplication.run(SlibootApp.class, args);

   }

 

-

-

   @Bean

   @ConditionalOnProperty("cadi.properties.path")

 	@Order(1)