From fd307bef420c111df269c7ac911093a75ab802b3 Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Tue, 28 Aug 2018 18:10:51 -0400 Subject: Set parent to policy/parent Set the parent to point to policy/parent instead of oparent. Clean up some duplicate management versions. Change-Id: I28957b05b80c9564ad32c958143822b6b0768219 Issue-ID: INT-619 Signed-off-by: Pamela Dragosh --- feature-active-standby-management/pom.xml | 226 +++++----- feature-distributed-locking/pom.xml | 232 +++++----- feature-eelf/pom.xml | 189 ++++---- feature-healthcheck/pom.xml | 4 +- feature-pooling-dmaap/pom.xml | 324 +++++++------- feature-session-persistence/pom.xml | 334 +++++++------- feature-state-management/pom.xml | 227 +++++----- feature-test-transaction/pom.xml | 160 +++---- packages/base/pom.xml | 143 +++--- packages/docker/pom.xml | 179 ++++---- policy-core/pom.xml | 174 ++++---- policy-management/pom.xml | 502 ++++++++++----------- pom.xml | 719 +++++++++++++++--------------- 13 files changed, 1697 insertions(+), 1716 deletions(-) diff --git a/feature-active-standby-management/pom.xml b/feature-active-standby-management/pom.xml index c118386e..00beae0c 100644 --- a/feature-active-standby-management/pom.xml +++ b/feature-active-standby-management/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= feature-active-standby-management ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -18,124 +18,122 @@ ============LICENSE_END========================================================= --> - + - 4.0.0 + 4.0.0 - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + - feature-active-standby-management + feature-active-standby-management - feature-active-standby-management - Separately loadable module for managing active-standby behavior + feature-active-standby-management + Separately loadable module for managing active-standby behavior - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - true - - - - - - + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + - - - io.swagger - swagger-jersey2-jaxrs - provided - - - org.onap.policy.drools-pdp - policy-core - ${project.version} - provided - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - org.eclipse.persistence - eclipselink - provided - - - org.onap.policy.drools-pdp - api-active-standby-management - ${project.version} - - - org.onap.policy.drools-pdp - api-state-management - ${project.version} - - - org.onap.policy.drools-pdp - feature-state-management - ${project.version} - test - - - com.h2database - h2 - 1.4.196 - test - - - junit - junit - test - - + + + io.swagger + swagger-jersey2-jaxrs + provided + + + org.onap.policy.drools-pdp + policy-core + ${project.version} + provided + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + org.eclipse.persistence + eclipselink + provided + + + org.onap.policy.drools-pdp + api-active-standby-management + ${project.version} + + + org.onap.policy.drools-pdp + api-state-management + ${project.version} + + + org.onap.policy.drools-pdp + feature-state-management + ${project.version} + test + + + com.h2database + h2 + test + + + junit + junit + test + + diff --git a/feature-distributed-locking/pom.xml b/feature-distributed-locking/pom.xml index ddb7c71b..a7eeed6d 100644 --- a/feature-distributed-locking/pom.xml +++ b/feature-distributed-locking/pom.xml @@ -18,125 +18,123 @@ ============LICENSE_END========================================================= --> - - - 4.0.0 - - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - - - feature-distributed-locking - - feature-distributed-locking - Loadable module that provides distributed locking capability + + + 4.0.0 + + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + + + feature-distributed-locking + + feature-distributed-locking + Loadable module that provides distributed locking capability - - 1.8 - 1.8 - + + 1.8 + 1.8 + - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - true - - - - - - + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + - - - org.onap.policy.drools-pdp - policy-core - ${project.version} - provided - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - org.apache.commons - commons-dbcp2 - 2.1.1 - - - org.apache.commons - commons-pool2 - 2.4.2 - - - junit - junit - test - - - com.h2database - h2 - [1.4.186,) - test - - - org.onap.policy.common - utils - ${project.version} - provided - - - org.onap.policy.common - utils-test - ${project.version} - test - - + + + org.onap.policy.drools-pdp + policy-core + ${project.version} + provided + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + org.apache.commons + commons-dbcp2 + 2.1.1 + + + org.apache.commons + commons-pool2 + 2.4.2 + + + junit + junit + test + + + com.h2database + h2 + test + + + org.onap.policy.common + utils + ${project.version} + provided + + + org.onap.policy.common + utils-test + ${project.version} + test + + diff --git a/feature-eelf/pom.xml b/feature-eelf/pom.xml index 6ac2dec7..fa10309c 100644 --- a/feature-eelf/pom.xml +++ b/feature-eelf/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Drools PDP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -18,106 +18,105 @@ ============LICENSE_END========================================================= --> - + - 4.0.0 + 4.0.0 - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + - feature-eelf + feature-eelf - feature-eelf - Loadable module that uses EELF and common module logging infrastructure + feature-eelf + Loadable module that uses EELF and common module logging infrastructure - - 1.8 - 1.8 - + + 1.8 + 1.8 + - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - true - - - - - - + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + - - - ch.qos.logback - logback-classic - test - - - com.att.eelf - eelf-core - 1.0.0 - - - org.onap.policy.common - ONAP-Logging - ${project.version} - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - junit - junit - test - - + + + ch.qos.logback + logback-classic + test + + + com.att.eelf + eelf-core + 1.0.0 + + + org.onap.policy.common + ONAP-Logging + ${project.version} + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + junit + junit + test + + diff --git a/feature-healthcheck/pom.xml b/feature-healthcheck/pom.xml index 50afc0ac..1acfb2d1 100644 --- a/feature-healthcheck/pom.xml +++ b/feature-healthcheck/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Drools PDP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -43,7 +43,6 @@ maven-assembly-plugin - 2.6 zipfile @@ -65,7 +64,6 @@ org.apache.maven.plugins maven-dependency-plugin - 2.8 copy-dependencies diff --git a/feature-pooling-dmaap/pom.xml b/feature-pooling-dmaap/pom.xml index 70a9b528..9a1c965c 100644 --- a/feature-pooling-dmaap/pom.xml +++ b/feature-pooling-dmaap/pom.xml @@ -17,168 +17,166 @@ limitations under the License. ============LICENSE_END========================================================= --> - - - - 4.0.0 - - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - - - feature-pooling-dmaap - - feature-pooling-dmaap - Endpoints - - - 1.8 - 1.8 - 9.3.20.v20170531 - 1.6.6 - - - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - true - - - - - - - - - - - com.att.nsa - cambriaClient - ${cambria.version} - - - org.slf4j - slf4j-log4j12 - - - com.att.nsa - saClientLibrary - - - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - provided - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - provided - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - provided - - - - ch.qos.logback - logback-classic - provided - - - - org.onap.policy.drools-pdp - policy-core - ${project.version} - provided - - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - - junit - junit - test - - - - org.onap.policy.common - utils-test - ${project.version} - test - - - - org.mockito - mockito-core - 2.13.0 - test - - + + + + 4.0.0 + + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + + + feature-pooling-dmaap + + feature-pooling-dmaap + Endpoints + + + 1.8 + 1.8 + 9.3.20.v20170531 + 1.6.6 + + + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + + + + + + com.att.nsa + cambriaClient + + + org.slf4j + slf4j-log4j12 + + + com.att.nsa + saClientLibrary + + + provided + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + provided + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + provided + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + provided + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + provided + + + + ch.qos.logback + logback-classic + provided + + + + org.onap.policy.drools-pdp + policy-core + ${project.version} + provided + + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + + junit + junit + test + + + + org.onap.policy.common + utils-test + ${project.version} + test + + + + org.mockito + mockito-core + 2.13.0 + test + + diff --git a/feature-session-persistence/pom.xml b/feature-session-persistence/pom.xml index 7f8a2560..a7f4cfc3 100644 --- a/feature-session-persistence/pom.xml +++ b/feature-session-persistence/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Drools PDP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -18,177 +18,175 @@ ============LICENSE_END========================================================= --> - + - 4.0.0 + 4.0.0 - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + - feature-session-persistence + feature-session-persistence - feature-session-persistence - Separately loadable feature module with session persistence code + feature-session-persistence + Separately loadable feature module with session persistence code - - 1.8 - 1.8 - 1.6.6 - + + 1.8 + 1.8 + 1.6.6 + - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - provided - true - - - - - - - - - - org.onap.policy.drools-pdp - policy-core - ${project.version} - provided - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - org.onap.policy.common - utils - ${project.version} - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - junit - junit - - - org.powermock - powermock-core - - - org.powermock - powermock-reflect - - - org.javassist - javassist - - - - - org.javassist - javassist - 3.21.0-GA - test - - - org.jboss.jbossts - jbossjta - 4.16.6.Final - - - jboss-servlet-api_3.0_spec - org.jboss.spec.javax.servlet - - - - - com.h2database - h2 - [1.4.186,) - test - - - org.hibernate - hibernate-core - provided - - - org.hibernate.common - hibernate-commons-annotations - provided - - - org.apache.commons - commons-dbcp2 - 2.1.1 - - - org.apache.commons - commons-pool2 - 2.4.2 - - - - junit - junit - test - - + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + provided + true + + + + + + + + + + org.onap.policy.drools-pdp + policy-core + ${project.version} + provided + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + org.onap.policy.common + utils + ${project.version} + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + junit + junit + + + org.powermock + powermock-core + + + org.powermock + powermock-reflect + + + org.javassist + javassist + + + + + org.javassist + javassist + 3.21.0-GA + test + + + org.jboss.jbossts + jbossjta + 4.16.6.Final + + + jboss-servlet-api_3.0_spec + org.jboss.spec.javax.servlet + + + + + com.h2database + h2 + test + + + org.hibernate + hibernate-core + provided + + + org.hibernate.common + hibernate-commons-annotations + provided + + + org.apache.commons + commons-dbcp2 + 2.1.1 + + + org.apache.commons + commons-pool2 + 2.4.2 + + + + junit + junit + test + + diff --git a/feature-state-management/pom.xml b/feature-state-management/pom.xml index 66e3d3ae..4f8a9cf4 100644 --- a/feature-state-management/pom.xml +++ b/feature-state-management/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= feature-state-management ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -18,125 +18,122 @@ ============LICENSE_END========================================================= --> - + - 4.0.0 + 4.0.0 - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + - feature-state-management + feature-state-management - feature-state-management - Separately loadable module for State Management + feature-state-management + Separately loadable module for State Management - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - true - - - - - - + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + - - - io.swagger - swagger-jersey2-jaxrs - provided - - - org.onap.policy.drools-pdp - policy-core - ${project.version} - provided - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - org.onap.policy.drools-pdp - api-state-management - ${project.version} - + + + io.swagger + swagger-jersey2-jaxrs + provided + + + org.onap.policy.drools-pdp + policy-core + ${project.version} + provided + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + org.onap.policy.drools-pdp + api-state-management + ${project.version} + - - com.h2database - h2 - 1.4.196 - test - - - org.eclipse.persistence - eclipselink - provided - - - - org.onap.policy.common - integrity-monitor - ${project.version} - - - - log4j - log4j - 1.2.17 - - - junit - junit - test - - + + com.h2database + h2 + test + + + org.eclipse.persistence + eclipselink + provided + + + + org.onap.policy.common + integrity-monitor + ${project.version} + + + + log4j + log4j + + + junit + junit + test + + diff --git a/feature-test-transaction/pom.xml b/feature-test-transaction/pom.xml index 49f94c66..92c8e217 100644 --- a/feature-test-transaction/pom.xml +++ b/feature-test-transaction/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= feature-test-transaction ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -17,86 +17,86 @@ limitations under the License. ============LICENSE_END========================================================= --> - - - 4.0.0 - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - - feature-test-transaction - + + + 4.0.0 + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + + feature-test-transaction + feature-test-transaction Separately loadable module which sends test transaction through system - - 1.8 - 1.8 - + + 1.8 + 1.8 + - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - runtime - true - - - - - - - - - org.onap.policy.drools-pdp - policy-management - ${project.version} - provided - - - junit - junit - test - - - \ No newline at end of file + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + runtime + true + + + + + + + + + org.onap.policy.drools-pdp + policy-management + ${project.version} + provided + + + junit + junit + test + + + diff --git a/packages/base/pom.xml b/packages/base/pom.xml index 6d4ae970..c97d1021 100644 --- a/packages/base/pom.xml +++ b/packages/base/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= Policy Packages ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -18,79 +18,84 @@ ============LICENSE_END========================================================= --> - + - 4.0.0 + 4.0.0 - - org.onap.policy.drools-pdp - packages - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + packages + 1.3.0-SNAPSHOT + - base - pom + base + pom - Base Package - ONAP Policy Drools PDP Packaging + Base Package + ONAP Policy Drools PDP Packaging - - - - maven-assembly-plugin - - - - single - - package - - - src/assembly/zip.xml - - false - - - - - - + + + + maven-assembly-plugin + + + + single + + package + + + src/assembly/zip.xml + + false + + + + + + - - - unix_pe_version - - - !windows - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - create-version-file - - exec - - prepare-package - - /bin/bash - - -c - mkdir -p target ; echo -e 'version="${project.version}"\ndescription="ONAP Drools PDP"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info - - - - - - - - - + + + unix_pe_version + + + !windows + + + + + + org.codehaus.mojo + exec-maven-plugin + + + create-version-file + + exec + + prepare-package + + /bin/bash + + -c + mkdir -p target ; echo + -e + 'version="${project.version}"\ndescription="ONAP + Drools + PDP"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' + >target/build.info + + + + + + + + + diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml index e62a4396..e666ab72 100644 --- a/packages/docker/pom.xml +++ b/packages/docker/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine - Docker files ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 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. @@ -18,101 +18,100 @@ ============LICENSE_END========================================================= --> - + - 4.0.0 + 4.0.0 - - org.onap.policy.drools-pdp - packages - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + packages + 1.3.0-SNAPSHOT + - docker - pom - Policy Drools PDP - Docker build - ONAP Policy Drools PDP Docker Build + docker + pom + Policy Drools PDP - Docker build + ONAP Policy Drools PDP Docker Build - - https://nexus.onap.org - + + https://nexus.onap.org + - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-drools-zip - prepare-package - - copy - - - ${project.build.directory}/policy-drools - false - true - - - org.onap.policy.drools-pdp - install-drools - ${project.version} - zip - install-drools.zip - - - - - - - - maven-resources-plugin - 3.0.2 - - - copy-resources - prepare-package - - copy-resources - - - ${project.build.directory}/policy-drools - - - src/main/docker - - - - - - + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-drools-zip + prepare-package + + copy + + + ${project.build.directory}/policy-drools + false + true + + + org.onap.policy.drools-pdp + install-drools + ${project.version} + zip + install-drools.zip + + + + + + + + maven-resources-plugin + + + copy-resources + prepare-package + + copy-resources + + + ${project.build.directory}/policy-drools + + + src/main/docker + + + + + + - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - get-target-version - prepare-package - - exec - - - - - echo - ${project.build.directory} - - ${project.version} - - ${project.build.directory}/version - - + + org.codehaus.mojo + exec-maven-plugin + + + get-target-version + prepare-package + + exec + + + + + echo + ${project.build.directory} + + ${project.version} + + ${project.build.directory}/version + + - - + + diff --git a/policy-core/pom.xml b/policy-core/pom.xml index e5be8c39..18157c07 100644 --- a/policy-core/pom.xml +++ b/policy-core/pom.xml @@ -19,107 +19,107 @@ ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - policy-core - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - + policy-core + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + + + + 1.6.6 + - - 1.6.6 - - - + - - org.codehaus.plexus - plexus-utils - 3.0.24 - - - com.thoughtworks.xstream - xstream - 1.4.10 - + + org.codehaus.plexus + plexus-utils + 3.0.24 + + + com.thoughtworks.xstream + xstream + - - org.kie - kie-api - 6.5.0.Final - - - org.kie - kie-ci - 6.5.0.Final + + org.kie + kie-api + 6.5.0.Final + + + org.kie + kie-ci + 6.5.0.Final - - - org.codehaus.plexus - plexus-utils - - - com.thoughtworks.xstream - xstream - - - - - org.drools - drools-core - 6.5.0.Final - - - org.drools - drools-persistence-jpa - 6.5.0.Final - - - org.onap.policy.common - capabilities - ${project.version} - - - org.onap.policy.common - utils - ${project.version} - - - org.onap.policy.drools-pdp - policy-utils - ${project.version} - - - junit - junit - test - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - - org.onap.policy.common - utils-test - ${project.version} - test - - + + + org.codehaus.plexus + plexus-utils + + + com.thoughtworks.xstream + xstream + + + + + org.drools + drools-core + 6.5.0.Final + + + org.drools + drools-persistence-jpa + 6.5.0.Final + + + org.onap.policy.common + capabilities + ${project.version} + + + org.onap.policy.common + utils + ${project.version} + + + org.onap.policy.drools-pdp + policy-utils + ${project.version} + + + junit + junit + test + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + + + org.onap.policy.common + utils-test + ${project.version} + test + + diff --git a/policy-management/pom.xml b/policy-management/pom.xml index 8a408f95..59a47591 100644 --- a/policy-management/pom.xml +++ b/policy-management/pom.xml @@ -19,274 +19,266 @@ ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - + + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + - policy-management + policy-management - policy-management - Policy Management + policy-management + Policy Management - - 2.8.0 - + + + + maven-assembly-plugin + + + zipfile + + single + + package + + true + ${project.artifactId}-${project.version} + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/lib + false + true + true + false + false + false + javax.inject + runtime + + + + + + maven-resources-plugin + + + copy-version + + copy-resources + + validate + + ${basedir}/target/versions + + + src/main/resources/versions + + version.properties + + true + + + + + + copy-resources + + copy-resources + + validate + + ${basedir}/target/etc/bvc-extensions + + + src/main/resources/etc/bvc-extensions + + feature_config_template.cfg + feature_custom.install + + true + + + + + + + + + - - - - maven-assembly-plugin - 2.6 - - - zipfile - - single - - package - - true - ${project.artifactId}-${project.version} - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/lib - false - true - true - false - false - false - javax.inject - runtime - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/versions - - - src/main/resources/versions - - version.properties - - true - - - - - - copy-resources - - copy-resources - - validate - - ${basedir}/target/etc/bvc-extensions - - - src/main/resources/etc/bvc-extensions - - feature_config_template.cfg - feature_custom.install - - true - - - - - - - - + + org.onap.policy.drools-pdp + policy-core + ${project.version} + - - - - org.onap.policy.drools-pdp - policy-core - ${project.version} - - - - org.onap.policy.common - policy-endpoints - ${project.version} - + + org.onap.policy.common + policy-endpoints + ${project.version} + - - org.eclipse.jetty - jetty-server - ${jetty.version} - + + org.eclipse.jetty + jetty-server + ${jetty.version} + - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - - org.glassfish.jersey.core - jersey-server - ${jersey.version} - - - - org.glassfish.jersey.containers - jersey-container-servlet-core - - - - org.glassfish.jersey.media - jersey-media-json-jackson - ${jersey.version} - - - - org.glassfish.jersey.containers - jersey-container-jetty-http - ${jersey.version} - - - org.eclipse.jetty - jetty-util - - - - - - io.swagger - swagger-jersey2-jaxrs - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - - com.google.code.gson - gson - ${gson.version} - - - - com.fatboyindustrial.gson-javatime-serialisers - gson-javatime-serialisers - 1.1.1 - - - - org.apache.commons - commons-collections4 - 4.1 - - - - - commons-codec - commons-codec - 1.9 - - - - ch.qos.logback - logback-classic - + + org.eclipse.jetty + jetty-servlet + ${jetty.version} + - - junit - junit - test - - - - - - org.eclipse.persistence - eclipselink - - - - org.eclipse.persistence - org.eclipse.persistence.jpa - + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + + + + org.glassfish.jersey.containers + jersey-container-servlet-core + + + + org.glassfish.jersey.media + jersey-media-json-jackson + ${jersey.version} + + + + org.glassfish.jersey.containers + jersey-container-jetty-http + ${jersey.version} + + + org.eclipse.jetty + jetty-util + + + + + + io.swagger + swagger-jersey2-jaxrs + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + com.google.code.gson + gson + + + + com.fatboyindustrial.gson-javatime-serialisers + gson-javatime-serialisers + 1.1.1 + + + + org.apache.commons + commons-collections4 + 4.1 + - - org.mariadb.jdbc - mariadb-java-client - + + + commons-codec + commons-codec + - - org.hibernate - hibernate-core - + + ch.qos.logback + logback-classic + - - org.hibernate.common - hibernate-commons-annotations - + + junit + junit + test + - - commons-io - commons-io - - - + + + + org.eclipse.persistence + eclipselink + + + + org.eclipse.persistence + org.eclipse.persistence.jpa + + + + org.mariadb.jdbc + mariadb-java-client + + + + org.hibernate + hibernate-core + + + + org.hibernate.common + hibernate-commons-annotations + + + + commons-io + commons-io + + + diff --git a/pom.xml b/pom.xml index 23eb4a16..f9b9bbef 100644 --- a/pom.xml +++ b/pom.xml @@ -18,378 +18,377 @@ ============LICENSE_END========================================================= --> - - 4.0.0 + + 4.0.0 - - org.onap.oparent - oparent - 1.1.0 - - + + org.onap.policy.parent + integration + 2.0.0-SNAPSHOT + + - org.onap.policy.drools-pdp - drools-pdp - 1.3.0-SNAPSHOT - pom - policy-drools-pdp + org.onap.policy.drools-pdp + drools-pdp + 1.3.0-SNAPSHOT + pom + policy-drools-pdp - The ONAP Policy Engine drools-based PDP Project + The ONAP Policy Engine drools-based PDP Project - - - 1.8 - 1.8 + + + 1.8 + 1.8 - - https://nexus.onap.org - /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} - content/repositories/releases/ - content/repositories/snapshots/ - content/repositories/staging/ + + https://nexus.onap.org + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + content/repositories/releases/ + content/repositories/snapshots/ + content/repositories/staging/ - - - ${project.basedir}/../target/code-coverage/jacoco-ut.exec - ${project.basedir}/../target/code-coverage/jacoco-it.exec - reuseReports + + + ${project.basedir}/../target/code-coverage/jacoco-ut.exec + ${project.basedir}/../target/code-coverage/jacoco-it.exec + reuseReports - - 1.1.3 - 1.2.1-oss - 2.25.1 - 1.5.18 - 2.9.5 - 4.5.5 - 4.4.4 - 1.2.3 - 4.12 - 2.7.0 - 2.1.0 - 5.2.10.Final - 5.0.1.Final - 2.5 - 23.0 - 1.4.01 - 9.3.24.v20180605 - + + 1.1.3 + 1.2.1-oss + 2.25.1 + 1.5.18 + 2.9.5 + 4.5.5 + 4.4.4 + 1.2.3 + 4.12 + 2.7.0 + 2.1.0 + 5.2.10.Final + 5.0.1.Final + 2.5 + 23.0 + 1.4.01 + 9.3.24.v20180605 + - - policy-utils - policy-core - policy-management - feature-healthcheck - feature-eelf + + policy-utils + policy-core + policy-management + feature-healthcheck + feature-eelf feature-pooling-dmaap - feature-session-persistence - feature-test-transaction - api-state-management - feature-state-management - api-active-standby-management - feature-active-standby-management - feature-simulators - feature-distributed-locking - packages - + feature-session-persistence + feature-test-transaction + api-state-management + feature-state-management + api-active-standby-management + feature-active-standby-management + feature-simulators + feature-distributed-locking + packages + - - - ecomp-releases - ONAP Release Repository - ${nexusproxy}/${releases.path} - - - ecomp-snapshots - ONAP Snapshot Repository - ${nexusproxy}/${snapshots.path} - - - ecomp-site - dav:${nexusproxy}${sitePath} - - + + + ecomp-releases + ONAP Release Repository + ${nexusproxy}/${releases.path} + + + ecomp-snapshots + ONAP Snapshot Repository + ${nexusproxy}/${snapshots.path} + + + ecomp-site + dav:${nexusproxy}${sitePath} + + - - - - com.google.guava - guava - ${guava.version} - - - javax.ws.rs - javax.ws.rs-api - 2.0.1 - - - org.glassfish.hk2.external - javax.inject - 2.4.0-b31 - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-base - ${jackson.version} - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - - - org.glassfish.jersey.containers - jersey-common - ${jersey.version} - - - org.glassfish.jersey.containers - jersey-container-servlet-core - ${jersey.version} - - - io.swagger - swagger-jersey2-jaxrs - ${jersey.swagger.version} - - - org.apache.httpcomponents - httpclient - ${http.client.version} - - - org.apache.httpcomponents - httpcore - ${http.core.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - junit - junit - ${junit.version} - - - org.eclipse.persistence - eclipselink - ${eclipselink.version} - - - org.eclipse.persistence - org.eclipse.persistence.jpa - ${eclipselink.version} - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb.jdbc.version} - - - org.hibernate - hibernate-core - ${hibernate.core.version} - - - org.hibernate.common - hibernate-commons-annotations - ${hibernate.commons.annotations.version} - - - commons-io - commons-io - ${commons.io.version} - - - xml-apis - xml-apis - ${xml.apis.version} - - - + + + + com.google.guava + guava + ${guava.version} + + + javax.ws.rs + javax.ws.rs-api + 2.0.1 + + + org.glassfish.hk2.external + javax.inject + 2.4.0-b31 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + ${jackson.version} + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson.version} + + + org.glassfish.jersey.containers + jersey-common + ${jersey.version} + + + org.glassfish.jersey.containers + jersey-container-servlet-core + ${jersey.version} + + + io.swagger + swagger-jersey2-jaxrs + ${jersey.swagger.version} + + + org.apache.httpcomponents + httpclient + ${http.client.version} + + + org.apache.httpcomponents + httpcore + ${http.core.version} + + + ch.qos.logback + logback-classic + ${logback.version} + + + junit + junit + ${junit.version} + + + org.eclipse.persistence + eclipselink + ${eclipselink.version} + + + org.eclipse.persistence + org.eclipse.persistence.jpa + ${eclipselink.version} + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.jdbc.version} + + + org.hibernate + hibernate-core + ${hibernate.core.version} + + + org.hibernate.common + hibernate-commons-annotations + ${hibernate.commons.annotations.version} + + + commons-io + commons-io + ${commons.io.version} + + + xml-apis + xml-apis + ${xml.apis.version} + + + - - - - org.jacoco - jacoco-maven-plugin - - - pre-unit-test - - prepare-agent - - - ${sonar.jacoco.reportPath} - true - - - - post-unit-test - test - - report - - - ${sonar.jacoco.reportPath} - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ${nexusproxy} - 176c31dfe190a - ecomp-staging - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - ${project.encoding} - ${project.source.version} - ${project.target.version} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.6 - - ${project.encoding} - - + + + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + ${sonar.jacoco.reportPath} + true + + + + post-unit-test + test + + report + + + ${sonar.jacoco.reportPath} + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ${nexusproxy} + 176c31dfe190a + ecomp-staging + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${project.encoding} + ${project.source.version} + ${project.target.version} + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.encoding} + + - - org.apache.maven.plugins - maven-site-plugin - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 2.10 - - - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - **/gen/** - **/generated-sources/** - **/yang-gen/** - **/pax/** - - - - - - pre-unit-test - - prepare-agent - - - ${sonar.jacoco.reportPath} - - - - - post-unit-test - test - - report - - - ${sonar.jacoco.reportPath} - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 2.17,) - - check - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - false - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -views - true - - - - + + org.apache.maven.plugins + maven-site-plugin + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + **/gen/** + **/generated-sources/** + **/yang-gen/** + **/pax/** + + + + + + pre-unit-test + + prepare-agent + + + ${sonar.jacoco.reportPath} + + + + + post-unit-test + test + + report + + + ${sonar.jacoco.reportPath} + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17,) + + check + + + + + + + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + + + + -- cgit 1.2.3-korg