From d3ef54773c1fcda598e7f67110233f735e097da9 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 10 Aug 2018 15:14:38 -0700 Subject: [PATCH] Karaf 4 for 2 features appc-ansible-adaptor and appc-sequence-generator Change-Id: I1f2e8727f899486df84c75350737a7a91bbb1039 Signed-off-by: Patrick Brady Issue-ID: APPC-1142 --- .../appc-ansible-adapter-bundle/pom.xml | 14 +- .../features-appc-ansible-adapter/pom.xml | 48 ++++++ .../onap-appc-ansible-adapter/pom.xml | 87 +++++++++++ .../appc-ansible-adapter-features/pom.xml | 170 ++++---------------- .../appc-ansible-adapter-installer/pom.xml | 12 +- appc-adapters/appc-ansible-adapter/pom.xml | 12 +- .../appc-sequence-generator-bundle/.gitignore | 1 + .../appc-sequence-generator-bundle/pom.xml | 10 +- .../appc-sequence-generator-features/.gitignore | 1 + .../features-appc-sequence-generator/.gitignore | 1 + .../features-appc-sequence-generator/pom.xml | 48 ++++++ .../onap-appc-sequence-generator/.gitignore | 1 + .../onap-appc-sequence-generator/pom.xml | 90 +++++++++++ .../src/main/feature/feature.xml | 27 ++++ .../appc-sequence-generator-features/pom.xml | 173 ++++----------------- .../appc-sequence-generator-installer/pom.xml | 17 +- .../appc-sequence-generator-model/.gitignore | 1 + .../appc-sequence-generator-model/pom.xml | 12 +- appc-sequence-generator/pom.xml | 14 +- 19 files changed, 424 insertions(+), 315 deletions(-) create mode 100644 appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml create mode 100644 appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml create mode 100644 appc-sequence-generator/appc-sequence-generator-bundle/.gitignore create mode 100644 appc-sequence-generator/appc-sequence-generator-features/.gitignore create mode 100644 appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore create mode 100644 appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml create mode 100644 appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore create mode 100644 appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml create mode 100644 appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/src/main/feature/feature.xml create mode 100644 appc-sequence-generator/appc-sequence-generator-model/.gitignore diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml index b46e2bfc4..ab96c842e 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml @@ -23,11 +23,13 @@ --> 4.0.0 - - org.onap.appc - appc-ansible-adapter - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-ansible-adapter-bundle bundle @@ -54,7 +56,7 @@ org.onap.appc - appc-common + appc-common-bundle ${project.version} diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml new file mode 100644 index 000000000..07b305af8 --- /dev/null +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + + org.onap.appc.parent + feature-repo-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + features-appc-ansible-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-ansible-adapter + ${project.version} + xml + features + + + + diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml new file mode 100644 index 000000000..6b9403fb9 --- /dev/null +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-ansible-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + org.onap.appc + appc-ansible-adapter-bundle + ${project.version} + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + false + + slf4j-api + tomcat-jdbc + tomcat-juli + httpcore + httpclient + org.eclipse.osgi + + + + + + + diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml index 8ea4792ee..d7b3672f2 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml @@ -1,144 +1,42 @@ +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 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. +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========================================================= +--> - 4.0.0 - - appc-ansible-adapter - org.onap.appc - 1.4.0-SNAPSHOT - - appc-ansible-adapter-features - Ansible Adaptor - Features - - jar - - - - org.onap.appc - appc-ansible-adapter-bundle - ${project.version} - + 4.0.0 - - commons-lang - commons-lang - compile - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - - - org.opendaylight.controller - opendaylight-karaf-empty - zip - - - - - - - - + org.onap.appc + appc-ansible-adapter-feature-aggregator + 1.4.0-SNAPSHOT + pom - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - + - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - - - - - - - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + onap-appc-ansible-adapter + features-appc-ansible-adapter + diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml index 499eec6f4..848a4621b 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml @@ -24,24 +24,28 @@ 4.0.0 - appc-ansible-adapter - org.onap.appc + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-ansible-adapter-installer Ansible Adapter - Karaf Installer pom appc-ansible-adapter appc-ansible-adapter - mvn:org.onap.appc/appc-ansible-adapter-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-ansible-adapter/${project.version}/xml/features false + appc-ansible-adapter org.onap.appc - appc-ansible-adapter-features + onap-appc-ansible-adapter features + ${project.version} xml diff --git a/appc-adapters/appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/pom.xml index 580a5b2eb..52a08cb0c 100644 --- a/appc-adapters/appc-ansible-adapter/pom.xml +++ b/appc-adapters/appc-ansible-adapter/pom.xml @@ -24,11 +24,13 @@ 4.0.0 - - org.onap.appc - appc-adapters - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc appc-ansible-adapter Appc Ansible Adapter diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/.gitignore b/appc-sequence-generator/appc-sequence-generator-bundle/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-bundle/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml index 3957010e9..f2edf82aa 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml @@ -25,11 +25,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-sequence-generator - 1.4.0-SNAPSHOT - appc-sequence-generator-bundle appc-sequence-generator-bundle bundle diff --git a/appc-sequence-generator/appc-sequence-generator-features/.gitignore b/appc-sequence-generator/appc-sequence-generator-features/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml new file mode 100644 index 000000000..dacd45f86 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + + org.onap.appc.parent + feature-repo-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + features-appc-sequence-generator + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-sequence-generator + ${project.version} + xml + features + + + + diff --git a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml new file mode 100644 index 000000000..fbf33ff1e --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml @@ -0,0 +1,90 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-sequence-generator + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + org.onap.appc + domain-model-lib + ${project.version} + + + org.onap.appc + appc-sequence-generator-model + ${project.version} + + + org.onap.appc + appc-dg-domain-model-lib + ${project.version} + + + org.onap.appc + appc-dg-dependency-model + ${project.version} + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + false + + slf4j-api + tomcat-jdbc + tomcat-juli + httpcore + httpclient + org.eclipse.osgi + + + + + + + diff --git a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/src/main/feature/feature.xml b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/src/main/feature/feature.xml @@ -0,0 +1,27 @@ + + + + + + mvn:org.onap.appc/appc-sequence-generator-bundle/${project.version}/xml/config + + \ No newline at end of file diff --git a/appc-sequence-generator/appc-sequence-generator-features/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/pom.xml index 861517783..dcfb6360c 100644 --- a/appc-sequence-generator/appc-sequence-generator-features/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-features/pom.xml @@ -1,151 +1,42 @@ - + - - 4.0.0 - + + 4.0.0 + + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc - appc-sequence-generator + appc-sequence-generator-feature-aggregator 1.4.0-SNAPSHOT - - appc-sequence-generator-features - Application Controller Sequence Generator Features - - - - org.onap.appc - appc-sequence-generator-bundle - ${project.version} - - - org.onap.appc - appc-sequence-generator-model - ${project.version} - - - org.opendaylight.mdsal - features-mdsal - features - xml + pom - runtime - - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - - org.onap.appc - appc-dg-domain-model-lib - ${project.version} - - - org.onap.appc - appc-dg-dependency-model - ${project.version} - - - org.onap.appc - appc-common - ${project.version} - - + - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + onap-appc-sequence-generator + features-appc-sequence-generator + diff --git a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml index c118fd09b..0f73e25ab 100644 --- a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml @@ -24,11 +24,13 @@ 4.0.0 - - org.onap.appc - appc-sequence-generator - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc appc-sequence-generator-installer Appc Sequence Generator : Karaf Installer pom @@ -36,15 +38,16 @@ appc-sequence-generator appc-sequence-generator - mvn:org.onap.appc/appc-sequence-generator-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-sequence-generator/${project.version}/xml/features false + appc-sequence-generator org.onap.appc - appc-sequence-generator-features + onap-appc-sequence-generator ${project.version} features xml diff --git a/appc-sequence-generator/appc-sequence-generator-model/.gitignore b/appc-sequence-generator/appc-sequence-generator-model/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-sequence-generator/appc-sequence-generator-model/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-sequence-generator/appc-sequence-generator-model/pom.xml b/appc-sequence-generator/appc-sequence-generator-model/pom.xml index 4113b3e2e..f89c102d2 100644 --- a/appc-sequence-generator/appc-sequence-generator-model/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-model/pom.xml @@ -24,11 +24,13 @@ 4.0.0 - - org.onap.appc - appc-sequence-generator - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-sequence-generator-model appc-sequence-generator-model bundle diff --git a/appc-sequence-generator/pom.xml b/appc-sequence-generator/pom.xml index 9bcaeb49d..522a4a2dd 100644 --- a/appc-sequence-generator/pom.xml +++ b/appc-sequence-generator/pom.xml @@ -23,12 +23,12 @@ --> 4.0.0 - - org.onap.appc - appc - 1.4.0-SNAPSHOT - - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + org.onap.appc appc-sequence-generator appc-sequence-generator @@ -65,4 +65,4 @@ appc-sequence-generator-features appc-sequence-generator-installer - \ No newline at end of file + -- 2.16.6