summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanielhanrahan <daniel.hanrahan@est.tech>2023-11-10 15:12:22 +0000
committerdanielhanrahan <daniel.hanrahan@est.tech>2023-11-10 15:28:17 +0000
commited9d179947325bbb9b81378b469341d023b46cd8 (patch)
treecb4f91d6a87a1214414282dfaf2fbe1a93281bda
parent1d9dae0c4be8a49d62e022da518cd8e95dc35ea5 (diff)
Update Architecture rule to add cache package
- Modify test to allow org.onap.cps.cache package to access CPS classes - Update archunit to avoid exceptions during build related to Java 17 Issue-ID: CPS-1958 Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech> Change-Id: If74dd897b8e41b83e41ea2a35e087ee56beb3088
-rw-r--r--cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java5
-rwxr-xr-xcps-dependencies/pom.xml2
2 files changed, 5 insertions, 2 deletions
diff --git a/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java b/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java
index 8448136fea..ec16ceefe8 100644
--- a/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java
+++ b/cps-application/src/test/java/org/onap/cps/architecture/LayeredArchitectureTest.java
@@ -44,6 +44,7 @@ public class LayeredArchitectureTest {
private static final String NOTIFICATION_PACKAGE = "org.onap.cps.notification..";
private static final String CPS_UTILS_PACKAGE = "org.onap.cps.utils..";
private static final String NCMP_INIT_PACKAGE = "org.onap.cps.ncmp.init..";
+ private static final String CPS_CACHE_PACKAGE = "org.onap.cps.cache..";
@ArchTest
static final ArchRule restControllerShouldOnlyDependOnRestController =
@@ -55,7 +56,9 @@ public class LayeredArchitectureTest {
freeze(classes().that().resideInAPackage(API_SERVICE_PACKAGE)
.or().resideInAPackage(SPI_SERVICE_PACKAGE).should().onlyHaveDependentClassesThat()
.resideInAnyPackage(REST_CONTROLLER_PACKAGE, API_SERVICE_PACKAGE, SPI_SERVICE_PACKAGE, NCMP_REST_PACKAGE,
- NCMP_SERVICE_PACKAGE, YANG_SCHEMA_PACKAGE, NOTIFICATION_PACKAGE, CPS_UTILS_PACKAGE, NCMP_INIT_PACKAGE));
+ NCMP_SERVICE_PACKAGE, YANG_SCHEMA_PACKAGE, NOTIFICATION_PACKAGE, CPS_UTILS_PACKAGE, NCMP_INIT_PACKAGE,
+ CPS_CACHE_PACKAGE));
+
@ArchTest
static final ArchRule repositoryShouldOnlyBeDependedOnByServicesAndRepository =
diff --git a/cps-dependencies/pom.xml b/cps-dependencies/pom.xml
index 6f3ef10131..beb4de1451 100755
--- a/cps-dependencies/pom.xml
+++ b/cps-dependencies/pom.xml
@@ -150,7 +150,7 @@
<dependency>
<groupId>com.tngtech.archunit</groupId>
<artifactId>archunit-junit5</artifactId>
- <version>0.18.0</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>