From b49dd1212bb14a47799b847f49e31de0695dcfe5 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Fri, 10 Aug 2018 15:30:58 -0700 Subject: Karaf 4 for appc-config Change-Id: I3059bf9bca4320d29432b749df6c55aecbdb22e9 Signed-off-by: Patrick Brady Issue-ID: APPC-1144 --- .../.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 +- 9 files changed, 237 insertions(+), 115 deletions(-) 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 (limited to 'appc-config/appc-encryption-tool') 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 -- cgit 1.2.3-korg