diff options
| author |   Dan Timoney <dtimoney@att.com> | 2021-04-20 11:59:06 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2021-04-20 11:59:06 -0400 |
| commit | a90eecf70419ec4acba6f5a8425300eef7f45290 (patch) | |
| tree | c9e2a68e7a84f45c0130737c0c6b8430fd2e755f /ms/sliboot/pom.xml | |
| parent | 49dd1b8c88cba58ef87a048688a98508d60fcca8 (diff) | |
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>
Diffstat (limited to 'ms/sliboot/pom.xml')
| -rw-r--r-- | ms/sliboot/pom.xml | 47 |
1 files changed, 33 insertions, 14 deletions
diff --git a/ms/sliboot/pom.xml b/ms/sliboot/pom.xml index cde828b7..9f43ca1a 100644 --- a/ms/sliboot/pom.xml +++ b/ms/sliboot/pom.xml @@ -18,8 +18,7 @@ <properties> <start-class>org.onap.ccsdk.apps.ms.sliboot.SlibootApp</start-class> - <shiro.version>1.5.0</shiro.version> - <aaf-shiro-bundle.version>2.1.13</aaf-shiro-bundle.version> + <aaf.cadi.version>2.1.21</aaf.cadi.version> <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name> <base.image.version>1.1.1</base.image.version> <image.name>onap/ccsdk-sliboot-alpine-image</image.name> @@ -40,17 +39,16 @@ <groupId>io.swagger</groupId> <artifactId>swagger-annotations</artifactId> </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-spring-boot-web-starter</artifactId> - <version>${shiro.version}</version> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-web</artifactId> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-logging</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-log4j2</artifactId> @@ -60,12 +58,6 @@ <artifactId>spring-boot-starter-validation</artifactId> </dependency> <dependency> - <groupId>org.onap.aaf.cadi</groupId> - <artifactId>aaf-cadi-shiro</artifactId> - <version>${aaf-shiro-bundle.version}</version> - </dependency> - - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> @@ -85,6 +77,34 @@ <version>2.9.2</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> <version>${project.version}</version> @@ -283,7 +303,6 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> <configuration> - <forkMode>always</forkMode> <environmentVariables> <SDNC_CONFIG_DIR>${basedir}/src/test/resources</SDNC_CONFIG_DIR> <SVCLOGIC_PROPERTIES>${basedir}/src/test/resources/svclogic.properties</SVCLOGIC_PROPERTIES> |