From b49dd1212bb14a47799b847f49e31de0695dcfe5 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 10 Aug 2018 15:30:58 -0700 Subject: [PATCH] Karaf 4 for appc-config Change-Id: I3059bf9bca4320d29432b749df6c55aecbdb22e9 Signed-off-by: Patrick Brady Issue-ID: APPC-1144 --- .../features-appc-config-adaptor/.gitignore | 1 + .../features/features-appc-config-adaptor/pom.xml | 48 ++++++ .../features/onap-appc-config-adaptor/.gitignore | 1 + .../features/onap-appc-config-adaptor/pom.xml | 82 ++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-config-adaptor/features/pom.xml | 139 ++++------------ appc-config/appc-config-adaptor/installer/pom.xml | 12 +- appc-config/appc-config-adaptor/pom.xml | 7 +- appc-config/appc-config-adaptor/provider/pom.xml | 10 +- .../features/features-appc-config-audit/.gitignore | 1 + .../features/features-appc-config-audit/pom.xml | 48 ++++++ .../features/onap-appc-config-audit/.gitignore | 1 + .../features/onap-appc-config-audit/pom.xml | 85 ++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-config-audit/features/pom.xml | 178 +++++---------------- appc-config/appc-config-audit/installer/pom.xml | 12 +- appc-config/appc-config-audit/pom.xml | 7 +- appc-config/appc-config-audit/provider/pom.xml | 11 +- .../features-appc-config-generator/.gitignore | 1 + .../features-appc-config-generator/pom.xml | 48 ++++++ .../features/onap-appc-config-generator/.gitignore | 1 + .../features/onap-appc-config-generator/pom.xml | 85 ++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-config-generator/features/pom.xml | 142 ++++------------ .../appc-config-generator/installer/pom.xml | 11 +- appc-config/appc-config-generator/pom.xml | 6 +- appc-config/appc-config-generator/provider/pom.xml | 10 +- .../features-appc-config-params/.gitignore | 1 + .../features/features-appc-config-params/pom.xml | 48 ++++++ .../features/onap-appc-config-params/.gitignore | 1 + .../features/onap-appc-config-params/pom.xml | 100 ++++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-config-params/features/pom.xml | 167 +++++-------------- appc-config/appc-config-params/installer/pom.xml | 11 +- appc-config/appc-config-params/pom.xml | 12 +- appc-config/appc-config-params/provider/pom.xml | 6 +- .../features-appc-config-data-services/.gitignore | 1 + .../features-appc-config-data-services/pom.xml | 48 ++++++ .../onap-appc-config-data-services/.gitignore | 1 + .../onap-appc-config-data-services/pom.xml | 104 ++++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-data-services/features/pom.xml | 165 +++++-------------- appc-config/appc-data-services/installer/pom.xml | 11 +- appc-config/appc-data-services/pom.xml | 12 +- appc-config/appc-data-services/provider/pom.xml | 6 +- .../.gitignore | 1 + .../features-appc-config-encryption-tool/pom.xml | 48 ++++++ .../onap-appc-config-encryption-tool/.gitignore | 1 + .../onap-appc-config-encryption-tool/pom.xml | 109 +++++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-encryption-tool/features/pom.xml | 139 ++++------------ appc-config/appc-encryption-tool/installer/pom.xml | 11 +- appc-config/appc-encryption-tool/pom.xml | 6 +- appc-config/appc-encryption-tool/provider/pom.xml | 10 +- .../.gitignore | 1 + .../features-appc-config-flow-controller/pom.xml | 48 ++++++ .../onap-appc-config-flow-controller/.gitignore | 1 + .../onap-appc-config-flow-controller/pom.xml | 90 +++++++++++ .../src/main/feature/feature.xml | 27 ++++ appc-config/appc-flow-controller/features/pom.xml | 144 ++++------------- appc-config/appc-flow-controller/installer/pom.xml | 11 +- appc-config/appc-flow-controller/pom.xml | 6 +- appc-config/appc-flow-controller/provider/pom.xml | 10 +- 63 files changed, 1563 insertions(+), 903 deletions(-) create mode 100644 appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore create mode 100644 appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml create mode 100644 appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore create mode 100644 appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml create mode 100644 appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/src/main/feature/feature.xml create mode 100644 appc-config/appc-config-audit/features/features-appc-config-audit/.gitignore create mode 100644 appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml create mode 100644 appc-config/appc-config-audit/features/onap-appc-config-audit/.gitignore create mode 100644 appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml create mode 100644 appc-config/appc-config-audit/features/onap-appc-config-audit/src/main/feature/feature.xml create mode 100644 appc-config/appc-config-generator/features/features-appc-config-generator/.gitignore create mode 100644 appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml create mode 100644 appc-config/appc-config-generator/features/onap-appc-config-generator/.gitignore create mode 100644 appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml create mode 100644 appc-config/appc-config-generator/features/onap-appc-config-generator/src/main/feature/feature.xml create mode 100644 appc-config/appc-config-params/features/features-appc-config-params/.gitignore create mode 100644 appc-config/appc-config-params/features/features-appc-config-params/pom.xml create mode 100644 appc-config/appc-config-params/features/onap-appc-config-params/.gitignore create mode 100644 appc-config/appc-config-params/features/onap-appc-config-params/pom.xml create mode 100644 appc-config/appc-config-params/features/onap-appc-config-params/src/main/feature/feature.xml create mode 100644 appc-config/appc-data-services/features/features-appc-config-data-services/.gitignore create mode 100644 appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml create mode 100644 appc-config/appc-data-services/features/onap-appc-config-data-services/.gitignore create mode 100644 appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml create mode 100644 appc-config/appc-data-services/features/onap-appc-config-data-services/src/main/feature/feature.xml create mode 100644 appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/.gitignore create mode 100644 appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml create mode 100644 appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/.gitignore create mode 100644 appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml create mode 100644 appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/src/main/feature/feature.xml create mode 100644 appc-config/appc-flow-controller/features/features-appc-config-flow-controller/.gitignore create mode 100644 appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml create mode 100644 appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/.gitignore create mode 100644 appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml create mode 100644 appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/src/main/feature/feature.xml diff --git a/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml new file mode 100644 index 000000000..0be7434ba --- /dev/null +++ b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/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-config-adaptor + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-adaptor + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml new file mode 100644 index 000000000..c431e98fa --- /dev/null +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml @@ -0,0 +1,82 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-config-adaptor + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.onap.appc + appc-config-adaptor-provider + ${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-config/appc-config-adaptor/features/onap-appc-config-adaptor/src/main/feature/feature.xml b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/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-config/appc-config-adaptor/features/pom.xml b/appc-config/appc-config-adaptor/features/pom.xml index d6d58d8fe..09d4f8c9f 100644 --- a/appc-config/appc-config-adaptor/features/pom.xml +++ b/appc-config/appc-config-adaptor/features/pom.xml @@ -1,119 +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 - org.onap.appc - appc-config-adaptor + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - 4.0.0 - appc-config-adaptor-features - Config Component Adaptor - Features - - jar - - - - org.onap.appc - appc-config-adaptor-provider - ${project.version} - - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - - ${odl.commons.opendaylight.version} - test - - + org.onap.appc + appc-config-adaptor-feature-aggregator + 1.4.0-SNAPSHOT + pom - - - - 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-config-adaptor + features-appc-config-adaptor + diff --git a/appc-config/appc-config-adaptor/installer/pom.xml b/appc-config/appc-config-adaptor/installer/pom.xml index 6b0fbac50..742fd343a 100644 --- a/appc-config/appc-config-adaptor/installer/pom.xml +++ b/appc-config/appc-config-adaptor/installer/pom.xml @@ -22,25 +22,29 @@ 4.0.0 - org.onap.appc - appc-config-adaptor + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc + appc-config-adaptor-installer Config Component Adaptor - Installer pom appc-config-adaptor appc-config-adaptor - mvn:org.onap.appc/appc-config-adaptor-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-adaptor/${project.version}/xml/features false org.onap.appc - appc-config-adaptor-features + onap-appc-config-adaptor features + ${project.version} xml diff --git a/appc-config/appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/pom.xml index fd25cb80d..a91e32006 100644 --- a/appc-config/appc-config-adaptor/pom.xml +++ b/appc-config/appc-config-adaptor/pom.xml @@ -23,11 +23,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - org.onap.appc - appc-config + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc + 4.0.0 appc-config-adaptor pom diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index ea4f61996..a5c90e48a 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -26,11 +26,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-config-adaptor - 1.4.0-SNAPSHOT - appc-config-adaptor-provider bundle diff --git a/appc-config/appc-config-audit/features/features-appc-config-audit/.gitignore b/appc-config/appc-config-audit/features/features-appc-config-audit/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-audit/features/features-appc-config-audit/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml b/appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml new file mode 100644 index 000000000..9de493161 --- /dev/null +++ b/appc-config/appc-config-audit/features/features-appc-config-audit/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-config-audit + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-audit + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-config-audit/features/onap-appc-config-audit/.gitignore b/appc-config/appc-config-audit/features/onap-appc-config-audit/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-audit/features/onap-appc-config-audit/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml b/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml new file mode 100644 index 000000000..e67f4f668 --- /dev/null +++ b/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml @@ -0,0 +1,85 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-config-audit + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + commons-lang + commons-lang + 2.6 + + + org.onap.appc + appc-config-audit-provider + ${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-config/appc-config-audit/features/onap-appc-config-audit/src/main/feature/feature.xml b/appc-config/appc-config-audit/features/onap-appc-config-audit/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-config-audit/features/onap-appc-config-audit/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-config/appc-config-audit/features/pom.xml b/appc-config/appc-config-audit/features/pom.xml index 50fdf5c41..d94526d0e 100644 --- a/appc-config/appc-config-audit/features/pom.xml +++ b/appc-config/appc-config-audit/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 - - org.onap.appc - appc-config-audit - 1.4.0-SNAPSHOT - - appc-config-audit-features - Config Audit Plugin - Features - - jar - - - - - org.onap.appc - appc-config-audit-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - - - - - 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 - - - - - - - - + 4.0.0 + + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + + org.onap.appc + appc-config-audit-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-config-audit + features-appc-config-audit + diff --git a/appc-config/appc-config-audit/installer/pom.xml b/appc-config/appc-config-audit/installer/pom.xml index 55ae9992b..33d51d30b 100644 --- a/appc-config/appc-config-audit/installer/pom.xml +++ b/appc-config/appc-config-audit/installer/pom.xml @@ -22,25 +22,29 @@ 4.0.0 - org.onap.appc - appc-config-audit + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc + appc-config-audit-installer Config Component Audit - Installer pom appc-config-audit appc-config-audit - mvn:org.onap.appc/appc-config-audit-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-audit/${project.version}/xml/features false org.onap.appc - appc-config-audit-features + onap-appc-config-audit features + ${project.version} xml diff --git a/appc-config/appc-config-audit/pom.xml b/appc-config/appc-config-audit/pom.xml index 57bfc928d..25b03d35a 100644 --- a/appc-config/appc-config-audit/pom.xml +++ b/appc-config/appc-config-audit/pom.xml @@ -22,10 +22,13 @@ - org.onap.appc - appc-config + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + + org.onap.appc 4.0.0 pom appc-config-audit diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index 964e5972f..59baa05fe 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-config-audit - 1.4.0-SNAPSHOT - appc-config-audit-provider bundle Config Audit - Provider @@ -45,7 +47,6 @@ xmlunit xmlunit - ${xmlunit.version} compile diff --git a/appc-config/appc-config-generator/features/features-appc-config-generator/.gitignore b/appc-config/appc-config-generator/features/features-appc-config-generator/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-generator/features/features-appc-config-generator/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml b/appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml new file mode 100644 index 000000000..98a360385 --- /dev/null +++ b/appc-config/appc-config-generator/features/features-appc-config-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-config-generator + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-generator + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-config-generator/features/onap-appc-config-generator/.gitignore b/appc-config/appc-config-generator/features/onap-appc-config-generator/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-generator/features/onap-appc-config-generator/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml b/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml new file mode 100644 index 000000000..c41b4aa08 --- /dev/null +++ b/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml @@ -0,0 +1,85 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-config-generator + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + commons-lang + commons-lang + 2.6 + + + org.onap.appc + appc-config-generator-provider + ${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-config/appc-config-generator/features/onap-appc-config-generator/src/main/feature/feature.xml b/appc-config/appc-config-generator/features/onap-appc-config-generator/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-config-generator/features/onap-appc-config-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-config/appc-config-generator/features/pom.xml b/appc-config/appc-config-generator/features/pom.xml index e7dbe166b..a225937ff 100644 --- a/appc-config/appc-config-generator/features/pom.xml +++ b/appc-config/appc-config-generator/features/pom.xml @@ -1,120 +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 + - org.onap.appc - appc-config-generator + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - appc-config-generator-features - Config Generator Plugin - Features - - jar - - - - - - org.onap.appc - appc-config-generator-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - - - + org.onap.appc + appc-config-generator-feature-aggregator + 1.4.0-SNAPSHOT + pom - + - - - - 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-config-generator + features-appc-config-generator + diff --git a/appc-config/appc-config-generator/installer/pom.xml b/appc-config/appc-config-generator/installer/pom.xml index ccd352a0c..5a1f56e44 100644 --- a/appc-config/appc-config-generator/installer/pom.xml +++ b/appc-config/appc-config-generator/installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - org.onap.appc - appc-config-generator + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-config-generator-installer Config Component Generator - Installer @@ -33,14 +35,15 @@ appc-config-generator appc-config-generator - mvn:org.onap.appc/appc-config-generator-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-generator/${project.version}/xml/features false org.onap.appc - appc-config-generator-features + onap-appc-config-generator features + ${project.version} xml diff --git a/appc-config/appc-config-generator/pom.xml b/appc-config/appc-config-generator/pom.xml index 9b78f6dab..afc3cdd28 100644 --- a/appc-config/appc-config-generator/pom.xml +++ b/appc-config/appc-config-generator/pom.xml @@ -22,10 +22,12 @@ - org.onap.appc - appc-config + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc 4.0.0 pom appc-config-generator diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index ebdca7eb3..271873581 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-config-generator - 1.4.0-SNAPSHOT - appc-config-generator-provider bundle Config Generator - Provider diff --git a/appc-config/appc-config-params/features/features-appc-config-params/.gitignore b/appc-config/appc-config-params/features/features-appc-config-params/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-params/features/features-appc-config-params/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-params/features/features-appc-config-params/pom.xml b/appc-config/appc-config-params/features/features-appc-config-params/pom.xml new file mode 100644 index 000000000..b2fa29f7b --- /dev/null +++ b/appc-config/appc-config-params/features/features-appc-config-params/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-config-params + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-params + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-config-params/features/onap-appc-config-params/.gitignore b/appc-config/appc-config-params/features/onap-appc-config-params/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-config-params/features/onap-appc-config-params/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml new file mode 100644 index 000000000..20e921f50 --- /dev/null +++ b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml @@ -0,0 +1,100 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-config-params + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + commons-lang + commons-lang + 2.6 + + + commons-collections + commons-collections + ${commons.collections.version} + + + org.openecomp.sdc.common + openecomp-tosca-datatype + ${tosca.datatype.version} + + + org.yaml + snakeyaml + ${snakeyaml.version} + + + org.onap.appc + appc-config-params-provider + ${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-config/appc-config-params/features/onap-appc-config-params/src/main/feature/feature.xml b/appc-config/appc-config-params/features/onap-appc-config-params/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-config-params/features/onap-appc-config-params/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-config/appc-config-params/features/pom.xml b/appc-config/appc-config-params/features/pom.xml index fcce61aef..d44dfffe9 100644 --- a/appc-config/appc-config-params/features/pom.xml +++ b/appc-config/appc-config-params/features/pom.xml @@ -1,131 +1,42 @@ - - 4.0.0 - - org.onap.appc - appc-config-params - 1.4.0-SNAPSHOT - - appc-config-params-features - Config Params Plugin - Features - jar - - - - org.onap.appc - appc-config-params-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - - - - - 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 - - - - - - - - +============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 + + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + + org.onap.appc + appc-config-params-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-config-params + features-appc-config-params + diff --git a/appc-config/appc-config-params/installer/pom.xml b/appc-config/appc-config-params/installer/pom.xml index ea99c5879..c58ce66f5 100644 --- a/appc-config/appc-config-params/installer/pom.xml +++ b/appc-config/appc-config-params/installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - org.onap.appc - appc-config-params + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-config-params-installer Config Component Params - Installer @@ -33,14 +35,15 @@ appc-config-params appc-config-params - mvn:org.onap.appc/appc-config-params-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-params/${project.version}/xml/features false org.onap.appc - appc-config-params-features + onap-appc-config-params features + ${project.version} xml diff --git a/appc-config/appc-config-params/pom.xml b/appc-config/appc-config-params/pom.xml index db51e9930..7d17e3b22 100644 --- a/appc-config/appc-config-params/pom.xml +++ b/appc-config/appc-config-params/pom.xml @@ -21,11 +21,13 @@ --> - - org.onap.appc - appc-config - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc 4.0.0 pom diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml index 67932b625..ac0dbe93b 100644 --- a/appc-config/appc-config-params/provider/pom.xml +++ b/appc-config/appc-config-params/provider/pom.xml @@ -23,10 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.appc - appc-config-params + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-config-params-provider bundle Config Params - Provider diff --git a/appc-config/appc-data-services/features/features-appc-config-data-services/.gitignore b/appc-config/appc-data-services/features/features-appc-config-data-services/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-data-services/features/features-appc-config-data-services/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml b/appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml new file mode 100644 index 000000000..986a30617 --- /dev/null +++ b/appc-config/appc-data-services/features/features-appc-config-data-services/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-config-data-services + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-data-services + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-data-services/features/onap-appc-config-data-services/.gitignore b/appc-config/appc-data-services/features/onap-appc-config-data-services/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-data-services/features/onap-appc-config-data-services/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml b/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml new file mode 100644 index 000000000..f27fa3157 --- /dev/null +++ b/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml @@ -0,0 +1,104 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-config-data-services + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-dblib + xml + features + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.adaptors + ccsdk-sql-resource + xml + features + ${ccsdk.sli.adaptors.version} + + + commons-lang + commons-lang + 2.6 + + + commons-collections + commons-collections + ${commons.collections.version} + + + org.onap.appc + appc-config-data-services-provider + ${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-config/appc-data-services/features/onap-appc-config-data-services/src/main/feature/feature.xml b/appc-config/appc-data-services/features/onap-appc-config-data-services/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-data-services/features/onap-appc-config-data-services/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-config/appc-data-services/features/pom.xml b/appc-config/appc-data-services/features/pom.xml index 0e242afea..67ee9f811 100644 --- a/appc-config/appc-data-services/features/pom.xml +++ b/appc-config/appc-data-services/features/pom.xml @@ -1,131 +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-config-data-services - org.onap.appc - 1.4.0-SNAPSHOT - - appc-config-data-services-features - APPC Data Services Plugin - Features - - jar - - - - org.onap.appc - appc-config-data-services-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - - - - - 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 - - - - - - - - + 4.0.0 + + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + + org.onap.appc + appc-config-data-services-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-config-data-services + features-appc-config-data-services + diff --git a/appc-config/appc-data-services/installer/pom.xml b/appc-config/appc-data-services/installer/pom.xml index 9d62bc83e..e62704aac 100644 --- a/appc-config/appc-data-services/installer/pom.xml +++ b/appc-config/appc-data-services/installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - org.onap.appc - appc-config-data-services + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-config-data-services-installer Config Component Data Services - Installer @@ -33,14 +35,15 @@ appc-config-data-services appc-config-data-services - mvn:org.onap.appc/appc-config-data-services-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-data-services/${project.version}/xml/features false org.onap.appc - appc-config-data-services-features + onap-appc-config-data-services features + ${project.version} xml diff --git a/appc-config/appc-data-services/pom.xml b/appc-config/appc-data-services/pom.xml index bb5432f4e..33379544a 100644 --- a/appc-config/appc-data-services/pom.xml +++ b/appc-config/appc-data-services/pom.xml @@ -21,11 +21,13 @@ --> - - org.onap.appc - appc-config - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc 4.0.0 pom diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index a7f124605..92468db81 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -23,10 +23,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.onap.appc - appc-config-data-services + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-config-data-services-provider bundle APPC Data Services - Provider diff --git a/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/.gitignore b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml new file mode 100644 index 000000000..7130555db --- /dev/null +++ b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/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-config-encryption-tool + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-encryption-tool + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/.gitignore b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml new file mode 100644 index 000000000..f457992c3 --- /dev/null +++ b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml @@ -0,0 +1,109 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-config-encryption-tool + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-dblib + xml + features + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.adaptors + ccsdk-sql-resource + xml + features + ${ccsdk.sli.adaptors.version} + + + commons-lang + commons-lang + 2.6 + + + commons-collections + commons-collections + ${commons.collections.version} + + + org.apache.velocity + velocity + ${velocity.version} + + + org.onap.appc + appc-config-encryption-tool-provider + ${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-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/src/main/feature/feature.xml b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/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-config/appc-encryption-tool/features/pom.xml b/appc-config/appc-encryption-tool/features/pom.xml index 368d9b320..bcce63235 100644 --- a/appc-config/appc-encryption-tool/features/pom.xml +++ b/appc-config/appc-encryption-tool/features/pom.xml @@ -1,113 +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 + - org.onap.appc - appc-config-encryption-tool + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - appc-config-encryption-tool-features - APPC Encryption Tool Plugin - Features - jar - - - org.onap.appc - appc-config-encryption-tool-provider - ${project.version} - - - commons-lang - commons-lang - 2.6 - compile - - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - - - - - - 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 - - - - - - - - + org.onap.appc + appc-config-encryption-tool-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-config-encryption-tool + features-appc-config-encryption-tool + diff --git a/appc-config/appc-encryption-tool/installer/pom.xml b/appc-config/appc-encryption-tool/installer/pom.xml index 70659dfa1..856f3dba0 100644 --- a/appc-config/appc-encryption-tool/installer/pom.xml +++ b/appc-config/appc-encryption-tool/installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - org.onap.appc - appc-config-encryption-tool + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-config-encryption-tool-installer Config Component Encryption Tool - Installer @@ -33,14 +35,15 @@ appc-config-encryption-tool appc-config-encryption-tool - mvn:org.onap.appc/appc-config-encryption-tool-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-encryption-tool/${project.version}/xml/features false org.onap.appc - appc-config-encryption-tool-features + onap-appc-config-encryption-tool features + ${project.version} xml diff --git a/appc-config/appc-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/pom.xml index 9eb2755bd..0c3f31f8e 100644 --- a/appc-config/appc-encryption-tool/pom.xml +++ b/appc-config/appc-encryption-tool/pom.xml @@ -22,10 +22,12 @@ - org.onap.appc - appc-config + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc 4.0.0 pom diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml index 36b7afd4a..1959093a0 100644 --- a/appc-config/appc-encryption-tool/provider/pom.xml +++ b/appc-config/appc-encryption-tool/provider/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-config-encryption-tool - 1.4.0-SNAPSHOT - appc-config-encryption-tool-provider bundle APPC Encryption Tool - Provider diff --git a/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/.gitignore b/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml b/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml new file mode 100644 index 000000000..0ced28c2c --- /dev/null +++ b/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/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-config-flow-controller + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-config-flow-controller + ${project.version} + xml + features + + + + diff --git a/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/.gitignore b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml new file mode 100644 index 000000000..030b46684 --- /dev/null +++ b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/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-config-flow-controller + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + commons-lang + commons-lang + 2.6 + + + commons-collections + commons-collections + ${commons.collections.version} + + + org.onap.appc + appc-config-flow-controller-provider + ${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-config/appc-flow-controller/features/onap-appc-config-flow-controller/src/main/feature/feature.xml b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/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-config/appc-flow-controller/features/pom.xml b/appc-config/appc-flow-controller/features/pom.xml index 6139bdbab..a98223195 100644 --- a/appc-config/appc-flow-controller/features/pom.xml +++ b/appc-config/appc-flow-controller/features/pom.xml @@ -1,122 +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 + - org.onap.appc - appc-config-flow-controller + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - appc-config-flow-controller-features - Flow Executor - Features - jar - - - - org.onap.appc - appc-config-flow-controller-provider - ${project.version} - - - - commons-lang - commons-lang - 2.6 - compile - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - - - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - zip - - - - - org.opendaylight.odlparent - features-test - ${odl.commons.opendaylight.version} - test - + org.onap.appc + appc-config-flow-controller-feature-aggregator + 1.4.0-SNAPSHOT + pom - + - - - - 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-config-flow-controller + features-appc-config-flow-controller + diff --git a/appc-config/appc-flow-controller/installer/pom.xml b/appc-config/appc-flow-controller/installer/pom.xml index dca7249bb..e88925e41 100644 --- a/appc-config/appc-flow-controller/installer/pom.xml +++ b/appc-config/appc-flow-controller/installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - org.onap.appc - appc-config-flow-controller + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-config-flow-controller-installer Config Component Params - Installer @@ -33,14 +35,15 @@ appc-config-flow-controller appc-config-flow-controller - mvn:org.onap.appc/appc-config-flow-controller-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-config-flow-controller/${project.version}/xml/features false org.onap.appc - appc-config-flow-controller-features + onap-appc-config-flow-controller features + ${project.version} xml diff --git a/appc-config/appc-flow-controller/pom.xml b/appc-config/appc-flow-controller/pom.xml index 6ced319cc..f8bb886c9 100644 --- a/appc-config/appc-flow-controller/pom.xml +++ b/appc-config/appc-flow-controller/pom.xml @@ -22,10 +22,12 @@ - org.onap.appc - appc-config + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc 4.0.0 pom diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 78ed47eeb..f3cd09b89 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-config-flow-controller - 1.4.0-SNAPSHOT - appc-config-flow-controller-provider bundle Flow Executor - Provider -- 2.16.6