diff options
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/common/pom.xml | 14 | ||||
| -rw-r--r-- | applications/monitoring/checkstyle-suppressions.xml | 3 | ||||
| -rw-r--r-- | applications/monitoring/pom.xml | 4 | ||||
| -rw-r--r-- | applications/naming/pom.xml | 4 | ||||
| -rw-r--r-- | applications/optimization/pom.xml | 4 |
5 files changed, 20 insertions, 9 deletions
diff --git a/applications/common/pom.xml b/applications/common/pom.xml index bbceefb9..dbde0ae1 100644 --- a/applications/common/pom.xml +++ b/applications/common/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -39,10 +39,20 @@ </dependency> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> + <artifactId>powermock-api-mockito2</artifactId> <scope>test</scope> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${version.javax.bind}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${version.javax.bind}</version> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> diff --git a/applications/monitoring/checkstyle-suppressions.xml b/applications/monitoring/checkstyle-suppressions.xml index b7d7df4e..df6cb9a2 100644 --- a/applications/monitoring/checkstyle-suppressions.xml +++ b/applications/monitoring/checkstyle-suppressions.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- ============LICENSE_START======================================================= - Copyright (C) 2019 AT&T Technologies. All rights reserved. + Copyright (C) 2019-2020 AT&T Technologies. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -36,4 +36,5 @@ <suppress checks="MethodName" files="Stepdefs.java" lines="1-9999"/> + <suppress files="xacml.properties" checks="[a-zA-Z0-9]*"/> </suppressions> diff --git a/applications/monitoring/pom.xml b/applications/monitoring/pom.xml index 92ac7cbe..67417262 100644 --- a/applications/monitoring/pom.xml +++ b/applications/monitoring/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - XACML PDP ================================================================================ - Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -62,7 +62,7 @@ with minor changes --> <configLocation>onap-checkstyle/onap-java-style.xml</configLocation> <!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory --> - <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> + <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories> <includeResources>true</includeResources> <includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestResources>true</includeTestResources> diff --git a/applications/naming/pom.xml b/applications/naming/pom.xml index 0bba663f..7eb945cd 100644 --- a/applications/naming/pom.xml +++ b/applications/naming/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - XACML PDP ================================================================================ - Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> + <artifactId>powermock-api-mockito2</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/applications/optimization/pom.xml b/applications/optimization/pom.xml index 80083643..6d506233 100644 --- a/applications/optimization/pom.xml +++ b/applications/optimization/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - XACML PDP ================================================================================ - Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.powermock</groupId> - <artifactId>powermock-api-mockito</artifactId> + <artifactId>powermock-api-mockito2</artifactId> <scope>test</scope> </dependency> <dependency> |