summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gui-editors/gui-editor-apex/pom.xml41
-rw-r--r--gui-editors/pom.xml7
-rw-r--r--pom.xml21
3 files changed, 7 insertions, 62 deletions
diff --git a/gui-editors/gui-editor-apex/pom.xml b/gui-editors/gui-editor-apex/pom.xml
index 3a49df7..1095e14 100644
--- a/gui-editors/gui-editor-apex/pom.xml
+++ b/gui-editors/gui-editor-apex/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
- Modifications Copyright (C) 2019-2021 Nordix Foundation.
+ Modifications Copyright (C) 2019-2022 Nordix Foundation.
Modifications Copyright (C) 2020 Bell Canada.
Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
================================================================================
@@ -35,6 +35,8 @@
<properties>
<policy.apex-pdp.version>2.4.0</policy.apex-pdp.version>
+ <policy.common.version>1.10.1-SNAPSHOT</policy.common.version>
+ <policy.models.version>2.6.1-SNAPSHOT</policy.models.version>
<webapp.dir>src/main/resources/webapp</webapp.dir>
<sonar.nodejs.executable>${project.basedir}/src/main/resources/webapp/node/node</sonar.nodejs.executable>
<sonar.sources>${project.basedir}/src/main/java,${project.basedir}/src/main/resources/webapp/js</sonar.sources>
@@ -44,25 +46,8 @@
<dependencies>
<dependency>
<groupId>org.onap.policy.common</groupId>
- <artifactId>policy-endpoints</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.onap.aaf.authz</groupId>
- <artifactId>aaf-cadi-aaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.att.nsa</groupId>
- <artifactId>cambriaClient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
- <artifactId>dmaapClient</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
<artifactId>utils</artifactId>
+ <version>${policy.common.version}</version>
<exclusions>
<exclusion>
<groupId>com.worldturner.medeia</groupId>
@@ -104,19 +89,6 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.9</version>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>apex-client-common</artifactId>
- <version>${policy.apex-pdp.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>
@@ -126,11 +98,6 @@
<version>3.10.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
</dependencies>
<build>
diff --git a/gui-editors/pom.xml b/gui-editors/pom.xml
index 7deee2d..3810af5 100644
--- a/gui-editors/pom.xml
+++ b/gui-editors/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2020 Nordix Foundation.
+ Copyright (C) 2020-2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,11 +32,6 @@
<name>${project.artifactId}</name>
<description>Web Client editors for PDP policies</description>
- <properties>
- <sonar.sources>${project.basedir}/src/main</sonar.sources>
- <sonar.exclusions>src/main/resources/webapp/js/edit_area/**/*,src/main/resources/webapp/js/jquery/**/*,src/main/resources/webapp/js/jquery-ui-1.12.1/**/*,src/main/resources/webapp/js/lib/**/*</sonar.exclusions>
- </properties>
-
<modules>
<module>gui-editor-apex</module>
</modules>
diff --git a/pom.xml b/pom.xml
index 4be0a92..d1f833c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
ONAP Policy GUI
================================================================================
Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ Modifications Copyright (C) 2020-2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
-->
<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/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -40,8 +40,6 @@
<description>Code for all the Policy GUI's.</description>
<properties>
- <policy.common.version>1.10.1-SNAPSHOT</policy.common.version>
- <policy.models.version>2.6.1-SNAPSHOT</policy.models.version>
<jacoco.dataFile>${project.basedir}/../../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
<sonar.javascript.lcov.reportPaths>${project.basedir}/target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
</properties>
@@ -78,21 +76,6 @@
</site>
</distributionManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>utils</artifactId>
- <version>${policy.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>policy-endpoints</artifactId>
- <version>${policy.common.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<profiles>
<profile>
<!--This profile is used to store Eclipse m2e settings only. It has no