diff options
| author |   Gao, Chenfei (cg287m) <cgao@research.att.com> | 2017-07-24 15:41:27 -0400 |
|---|---|---|
| committer | Gao, Chenfei (cg287m) <cgao@research.att.com> | 2017-07-26 17:51:08 -0400 |
| commit | 0ba72f3df9d06351a4d2d7d3bac70f1fde48d3b8 (patch) | |
| tree | 8496a9b97402fd69d17e101c532d452fe6db3d9a /controlloop | |
| parent | c182c8b95eda734f9d12dfa41e2959a1fc32ce42 (diff) | |
[POLICY-91] POM dependencies cleanup
Change-Id: Idfc19a978be26e1dfa85736fea5ffecf6b298446
Signed-off-by: Gao, Chenfei (cg287m) <cgao@research.att.com>
Diffstat (limited to 'controlloop')
7 files changed, 233 insertions, 200 deletions
diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml index e5ba6defa..efe7b3487 100644 --- a/controlloop/common/eventmanager/pom.xml +++ b/controlloop/common/eventmanager/pom.xml @@ -1,3 +1,23 @@ +<!-- + ============LICENSE_START======================================================= + eventmanager + ================================================================================ + Copyright (C) 2017 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -9,57 +29,19 @@ <artifactId>eventmanager</artifactId> <dependencies> <dependency> - <groupId>com.att.nsa</groupId> - <artifactId>dmaapClient</artifactId> - <version>0.2.12</version> - </dependency> - <dependency> - <groupId>com.att.nsa</groupId> - <artifactId>cambriaClient</artifactId> - <version>0.0.1</version> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - <version>6.3.0.Final</version> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - <version>6.3.0.Final</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.17</version> - </dependency> - <dependency> - <groupId>org.jgrapht</groupId> - <artifactId>jgrapht-core</artifactId> - <version>0.9.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>policy-yaml</artifactId> - <version>1.1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> + <groupId>org.onap.policy.drools-applications</groupId> <artifactId>actorServiceProvider</artifactId> <version>1.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.onap.policy.drools-applications</groupId> + <groupId>org.onap.policy.drools-applications</groupId> <artifactId>actor.appc</artifactId> <version>1.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.onap.policy.drools-applications</groupId> + <groupId>org.onap.policy.drools-applications</groupId> <artifactId>guard</artifactId> <version>1.1.0-SNAPSHOT</version> <scope>provided</scope> @@ -83,22 +65,11 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>9.1-901.jdbc4</version> - </dependency> - - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>1.5.5</version> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>14.0.1</version> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.5</version> + <scope>provided</scope> </dependency> - <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>sdc</artifactId> @@ -111,15 +82,5 @@ <version>1.1.0-SNAPSHOT</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.jpa</artifactId> - <version>2.6.4</version> - </dependency> </dependencies> </project> diff --git a/controlloop/common/model-impl/events/pom.xml b/controlloop/common/model-impl/events/pom.xml index e7f4f9482..a07bb4786 100644 --- a/controlloop/common/model-impl/events/pom.xml +++ b/controlloop/common/model-impl/events/pom.xml @@ -1,3 +1,23 @@ +<!-- + ============LICENSE_START======================================================= + events in model-impl + ================================================================================ + Copyright (C) 2017 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -11,6 +31,7 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> <version>2.5</version> + <scope>provided</scope> </dependency> </dependencies> </project> diff --git a/controlloop/common/packages/artifacts/pom.xml b/controlloop/common/packages/artifacts/pom.xml index ba996b819..e68b9ee6b 100644 --- a/controlloop/common/packages/artifacts/pom.xml +++ b/controlloop/common/packages/artifacts/pom.xml @@ -67,22 +67,29 @@ </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>demo</artifactId> + <artifactId>controlloop</artifactId> <version>${project.version}</version> - <type>jar</type> - </dependency> + <type>pom</type> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>events</artifactId> + <artifactId>common</artifactId> <version>${project.version}</version> - <type>jar</type> + <type>pom</type> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>rest</artifactId> + <artifactId>model-impl</artifactId> + <version>${project.version}</version> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>events</artifactId> <version>${project.version}</version> <type>jar</type> - </dependency> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>appc</artifactId> @@ -106,13 +113,24 @@ <artifactId>trafficgenerator</artifactId> <version>${project.version}</version> <type>jar</type> - </dependency> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>eventmanager</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>archetype-closedloop-demo-rules</artifactId> + <artifactId>guard</artifactId> + <version>${project.version}</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>policy-yaml</artifactId> <version>${project.version}</version> <type>jar</type> </dependency> </dependencies> - </project> diff --git a/controlloop/common/packages/basex/src/files/bin/create-closed-loop-demo.sh b/controlloop/common/packages/basex/src/files/bin/create-closed-loop-demo.sh index 5fe83532c..5fe83532c 100644..100755 --- a/controlloop/common/packages/basex/src/files/bin/create-closed-loop-demo.sh +++ b/controlloop/common/packages/basex/src/files/bin/create-closed-loop-demo.sh diff --git a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml index 370431dfb..c023a744d 100644 --- a/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/template.demo.v1.0.0/archetype-closedloop-demo-rules/src/main/resources/archetype-resources/pom.xml @@ -40,17 +40,17 @@ <groupId>org.onap.policy.drools-applications</groupId> <artifactId>demo</artifactId> <version>${dependenciesVersion}</version> - </dependency> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>controlloop</artifactId> + <artifactId>events</artifactId> <version>${dependenciesVersion}</version> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>rest</artifactId> <version>${dependenciesVersion}</version> - </dependency> + </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>appc</artifactId> @@ -71,5 +71,20 @@ <artifactId>trafficgenerator</artifactId> <version>${dependenciesVersion}</version> </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>eventmanager</artifactId> + <version>${dependenciesVersion}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>guard</artifactId> + <version>${dependenciesVersion}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>policy-yaml</artifactId> + <version>${dependenciesVersion}</version> + </dependency> </dependencies> </project> diff --git a/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml b/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml index e48b78709..33abe7786 100644 --- a/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml +++ b/controlloop/templates/template.demo.v1.0.0/template.demo/pom.xml @@ -18,10 +18,11 @@ ============LICENSE_END========================================================= --> -<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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> - <artifactId>demo</artifactId> + <artifactId>demo</artifactId> <parent> <groupId>org.onap.policy.drools-applications</groupId> @@ -29,84 +30,78 @@ <version>1.1.0-SNAPSHOT</version> </parent> - <dependencies> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - <version>6.3.0.Final</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - <version>6.3.0.Final</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>events</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>appc</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>aai</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>mso</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>trafficgenerator</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>eventmanager</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>guard</artifactId> - <version>1.1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.onap.policy.drools-applications</groupId> - <artifactId>policy-yaml</artifactId> - <version>1.1.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + <version>6.5.0.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + <version>6.5.0.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>events</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>appc</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>aai</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>mso</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>trafficgenerator</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>eventmanager</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>guard</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications</groupId> + <artifactId>policy-yaml</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + </dependencies> </project> diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml index e7aab68b3..c09cfa2cc 100644 --- a/controlloop/templates/template.demo/pom.xml +++ b/controlloop/templates/template.demo/pom.xml @@ -1,8 +1,29 @@ +<!-- + ============LICENSE_START======================================================= + drools-pdp-apps Control Loop Drools Templates + ================================================================================ + Copyright (C) 2017 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. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + + <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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.policy.drools-applications</groupId> + <groupId>org.onap.policy.drools-applications</groupId> <artifactId>templates</artifactId> <version>1.1.0-SNAPSHOT</version> </parent> @@ -11,95 +32,97 @@ <dependency> <groupId>org.drools</groupId> <artifactId>drools-core</artifactId> - <version>6.3.0.Final</version> + <version>6.5.0.Final</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.drools</groupId> <artifactId>drools-compiler</artifactId> - <version>6.3.0.Final</version> - <scope>provided</scope> + <version>6.5.0.Final</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>appc</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> - <dependency> + <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>events</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>guard</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>aai</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>sdc</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>events</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>policy-yaml</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>eventmanager</artifactId> - <version>1.1.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.5.2</version> + <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml</artifactId> - <version>1.0.0</version> + <groupId>com.att.research.xacml</groupId> + <artifactId>xacml</artifactId> + <version>1.0.0</version> + <scope>test</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <version>1.0.0</version> + <groupId>com.att.research.xacml</groupId> + <artifactId>xacml-pdp</artifactId> + <version>1.0.0</version> + <scope>test</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0.2</version> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0.2</version> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.persistence</groupId> - <artifactId>org.eclipse.persistence.jpa</artifactId> - <version>2.6.4</version> + <groupId>org.eclipse.persistence</groupId> + <artifactId>org.eclipse.persistence.jpa</artifactId> + <version>2.6.4</version> + <scope>provided</scope> </dependency> - <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>actorServiceProvider</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.drools-applications</groupId> <artifactId>actor.appc</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> |