From 46f865c3df4f8a80a3fff278fa479182cfa317cc Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 13 Aug 2018 10:00:29 -0700 Subject: Karaf 4 for appc outbound Change-Id: I4aceffe33748a8e157bc1cac118de1e6b431378b Issue-ID: APPC-1146 Signed-off-by: Patrick Brady --- .../.gitignore | 1 + .../features-appc-network-inventory-client/pom.xml | 48 +++++++ .../onap-appc-network-inventory-client/.gitignore | 1 + .../onap-appc-network-inventory-client/pom.xml | 107 ++++++++++++++++ .../src/main/feature/feature.xml | 27 ++++ .../appc-network-inventory-client/features/pom.xml | 142 +++++---------------- .../installer/pom.xml | 18 ++- .../appc-network-inventory-client/pom.xml | 6 +- .../appc-network-inventory-client/provider/pom.xml | 10 +- 9 files changed, 238 insertions(+), 122 deletions(-) create mode 100644 appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore create mode 100644 appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/pom.xml create mode 100644 appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore create mode 100644 appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml create mode 100644 appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/src/main/feature/feature.xml mode change 100755 => 100644 appc-outbound/appc-network-inventory-client/features/pom.xml (limited to 'appc-outbound/appc-network-inventory-client') diff --git a/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/pom.xml new file mode 100644 index 000000000..5f30a14e4 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/features-appc-network-inventory-client/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-network-inventory-client + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-network-inventory-client + ${project.version} + xml + features + + + + diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml new file mode 100644 index 000000000..21ae4e153 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/pom.xml @@ -0,0 +1,107 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-network-inventory-client + 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} + + + com.sun.jersey + jersey-client + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.onap.appc + appc-config-params-provider + ${project.version} + + + org.onap.appc + appc-network-inventory-client-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-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/src/main/feature/feature.xml b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/src/main/feature/feature.xml new file mode 100644 index 000000000..9333307c9 --- /dev/null +++ b/appc-outbound/appc-network-inventory-client/features/onap-appc-network-inventory-client/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-outbound/appc-network-inventory-client/features/pom.xml b/appc-outbound/appc-network-inventory-client/features/pom.xml old mode 100755 new mode 100644 index 01bf81504..392ad32e2 --- a/appc-outbound/appc-network-inventory-client/features/pom.xml +++ b/appc-outbound/appc-network-inventory-client/features/pom.xml @@ -1,118 +1,42 @@ - - 4.0.0 - - org.onap.appc - appc-network-inventory-client - 1.4.0-SNAPSHOT - - appc-network-inventory-client-features - APPC Network Inventory - Features - jar +============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 - - - org.onap.appc - appc-network-inventory-client-provider - - - - commons-lang - commons-lang - compile - + http://www.apache.org/licenses/LICENSE-2.0 - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - +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 + + - - com.sun.jersey - jersey-client - - - com.sun.jersey - jersey-core - + org.onap.appc + appc-network-inventory-client-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-network-inventory-client + features-appc-network-inventory-client + diff --git a/appc-outbound/appc-network-inventory-client/installer/pom.xml b/appc-outbound/appc-network-inventory-client/installer/pom.xml index ecc06655e..3ea006f26 100755 --- a/appc-outbound/appc-network-inventory-client/installer/pom.xml +++ b/appc-outbound/appc-network-inventory-client/installer/pom.xml @@ -22,26 +22,29 @@ 4.0.0 - - appc-network-inventory-client - org.onap.appc - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc APPC Network Inventory - Installer pom appc-network-inventory-client appc-network-inventory-client - mvn:org.onap.appc/appc-network-inventory-client-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-network-inventory-client/${project.version}/xml/features false org.onap.appc - appc-network-inventory-client-features + onap-appc-network-inventory-client features + ${project.version} xml @@ -53,6 +56,7 @@ org.onap.appc appc-network-inventory-client-provider + ${project.version} diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml index f11a40701..8fc224575 100755 --- a/appc-outbound/appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/pom.xml @@ -22,10 +22,12 @@ - org.onap.appc - appc-outbound + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc 4.0.0 pom diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index 17ff19843..e2edfbac2 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -25,11 +25,13 @@ 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"> 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-network-inventory-client - 1.4.0-SNAPSHOT - appc-network-inventory-client-provider 1.4.0-SNAPSHOT -- cgit 1.2.3-korg