From ca4f7e16fc35f9f1a8c0a885e3ad8c62c64c3c37 Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 13 Aug 2018 22:38:26 -0700 Subject: [PATCH] Karaf 4 for appc-inbound Change-Id: I94f8b31e509d0e231e36b8b8d2871ad10bdf02f8 Issue-ID: APPC-1148 Signed-off-by: Patrick Brady --- .../appc-dg-mdsal-bundle/pom.xml | 5 - .../features-appc-artifact-handler/.gitignore | 1 + .../features-appc-artifact-handler/pom.xml | 48 +++++++ .../features/onap-appc-artifact-handler/.gitignore | 1 + .../features/onap-appc-artifact-handler/pom.xml | 100 ++++++++++++++ .../src/main/feature/feature.xml | 26 ++++ .../appc-artifact-handler/features/pom.xml | 150 +++++---------------- .../appc-artifact-handler/installer/pom.xml | 18 ++- appc-inbound/appc-artifact-handler/model/pom.xml | 6 +- appc-inbound/appc-artifact-handler/pom.xml | 12 +- .../appc-artifact-handler/provider/pom.xml | 11 +- .../features-appc-design-services/.gitignore | 1 + .../features/features-appc-design-services/pom.xml | 48 +++++++ .../features/onap-appc-design-services/.gitignore | 1 + .../features/onap-appc-design-services/pom.xml | 96 +++++++++++++ appc-inbound/appc-design-services/features/pom.xml | 131 +++++------------- .../appc-design-services/installer/pom.xml | 16 ++- appc-inbound/appc-design-services/model/pom.xml | 6 +- appc-inbound/appc-design-services/pom.xml | 11 +- appc-inbound/appc-design-services/provider/pom.xml | 16 +-- .../appc-interfaces-service/bundle/pom.xml | 15 +-- .../features-appc-interfaces-service/.gitignore | 1 + .../features-appc-interfaces-service/pom.xml | 48 +++++++ .../onap-appc-interfaces-service/.gitignore | 1 + .../features/onap-appc-interfaces-service/pom.xml | 96 +++++++++++++ .../appc-interfaces-service/features/pom.xml | 129 +++++------------- .../appc-interfaces-service/installer/pom.xml | 10 +- appc-inbound/appc-interfaces-service/model/pom.xml | 10 +- appc-inbound/appc-interfaces-service/pom.xml | 6 +- appc-oam/appc-oam-bundle/pom.xml | 6 - appc-provider/appc-provider-bundle/pom.xml | 5 - appc-sdc-listener/appc-yang-generator/pom.xml | 4 +- .../appc-sequence-generator-bundle/pom.xml | 5 - pom.xml | 5 - 34 files changed, 649 insertions(+), 396 deletions(-) create mode 100644 appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore create mode 100644 appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml create mode 100644 appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore create mode 100644 appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml create mode 100644 appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml mode change 100755 => 100644 appc-inbound/appc-artifact-handler/features/pom.xml create mode 100644 appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore create mode 100644 appc-inbound/appc-design-services/features/features-appc-design-services/pom.xml create mode 100644 appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore create mode 100644 appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml mode change 100755 => 100644 appc-inbound/appc-design-services/features/pom.xml create mode 100644 appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/.gitignore create mode 100644 appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/pom.xml create mode 100644 appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/.gitignore create mode 100644 appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml index 482329960..311a83a79 100644 --- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/pom.xml @@ -169,11 +169,6 @@ org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml new file mode 100644 index 000000000..35de7a50b --- /dev/null +++ b/appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/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-artifact-handler + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-artifact-handler + ${project.version} + xml + features + + + + diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml new file mode 100644 index 000000000..df20fbb87 --- /dev/null +++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/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-artifact-handler + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.openecomp.sdc.common + openecomp-tosca-datatype + ${tosca.datatype.version} + + + org.onap.appc + appc-config-params-provider + ${project.version} + + + org.onap.appc + appc-artifact-handler-model + ${project.version} + + + org.onap.appc + appc-artifact-handler-provider + ${project.version} + + + org.onap.appc + appc-yang-generator + ${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-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml new file mode 100644 index 000000000..0e5ddcfac --- /dev/null +++ b/appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/src/main/feature/feature.xml @@ -0,0 +1,26 @@ + + + + + mvn:org.onap.appc/appc-artifact-handler-provider/${project.version}/xml/config + + \ No newline at end of file diff --git a/appc-inbound/appc-artifact-handler/features/pom.xml b/appc-inbound/appc-artifact-handler/features/pom.xml old mode 100755 new mode 100644 index ec0d117dd..e65e1d678 --- a/appc-inbound/appc-artifact-handler/features/pom.xml +++ b/appc-inbound/appc-artifact-handler/features/pom.xml @@ -1,120 +1,42 @@ - - 4.0.0 - - appc-artifact-handler - org.onap.appc - 1.4.0-SNAPSHOT - - appc-artifact-handler-features - APPC Artifact Handler - Feature - 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-artifact-handler-model - - - org.onap.appc - appc-artifact-handler-provider - config - xml - - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - - org.opendaylight.controller - opendaylight-karaf-empty - zip - + http://www.apache.org/licenses/LICENSE-2.0 - - - org.opendaylight.odlparent - features-test - test - ${odl.commons.opendaylight.version} - - - 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 - - - - 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.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + + org.onap.appc + appc-artifact-handler-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-artifact-handler + features-appc-artifact-handler + diff --git a/appc-inbound/appc-artifact-handler/installer/pom.xml b/appc-inbound/appc-artifact-handler/installer/pom.xml index 1c8e3358e..c1ef46446 100755 --- a/appc-inbound/appc-artifact-handler/installer/pom.xml +++ b/appc-inbound/appc-artifact-handler/installer/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - - appc-artifact-handler - org.onap.appc - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc appc-artifact-handler-installer appc-artifact-handler-installer pom @@ -34,7 +36,7 @@ appc-artifact-handler appc-artifact-handler - mvn:org.onap.appc/appc-artifact-handler-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-artifact-handler/${project.version}/xml/features false @@ -42,8 +44,9 @@ org.onap.appc - appc-artifact-handler-features + onap-appc-artifact-handler features + ${project.version} xml @@ -55,6 +58,7 @@ org.onap.appc appc-artifact-handler-provider + ${project.version} diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml index 84d528dee..90030bb84 100755 --- a/appc-inbound/appc-artifact-handler/model/pom.xml +++ b/appc-inbound/appc-artifact-handler/model/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 - appc-artifact-handler - org.onap.appc + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-artifact-handler-model APPC Artifact Handler - Model bundle diff --git a/appc-inbound/appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/pom.xml index 10b0ec281..d2098e64d 100755 --- a/appc-inbound/appc-artifact-handler/pom.xml +++ b/appc-inbound/appc-artifact-handler/pom.xml @@ -22,11 +22,13 @@ - - org.onap.appc - appc-inbound - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc 4.0.0 pom appc-artifact-handler diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml index ed25b1684..c82cf2e27 100755 --- a/appc-inbound/appc-artifact-handler/provider/pom.xml +++ b/appc-inbound/appc-artifact-handler/provider/pom.xml @@ -25,10 +25,12 @@ limitations under the License. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - appc-artifact-handler - org.onap.appc + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-artifact-handler-provider bundle @@ -170,11 +172,6 @@ limitations under the License. org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore b/appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-inbound/appc-design-services/features/features-appc-design-services/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-inbound/appc-design-services/features/features-appc-design-services/pom.xml b/appc-inbound/appc-design-services/features/features-appc-design-services/pom.xml new file mode 100644 index 000000000..f0c979e5c --- /dev/null +++ b/appc-inbound/appc-design-services/features/features-appc-design-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-design-services + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-design-services + ${project.version} + xml + features + + + + diff --git a/appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore b/appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-inbound/appc-design-services/features/onap-appc-design-services/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml b/appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml new file mode 100644 index 000000000..1721d2d8a --- /dev/null +++ b/appc-inbound/appc-design-services/features/onap-appc-design-services/pom.xml @@ -0,0 +1,96 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-design-services + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.mdsal.model + odl-mdsal-models + xml + features + + + org.onap.appc + appc-design-services-model + ${project.version} + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.appc + appc-design-services-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-inbound/appc-design-services/features/pom.xml b/appc-inbound/appc-design-services/features/pom.xml old mode 100755 new mode 100644 index b94024d3f..eacaf50fe --- a/appc-inbound/appc-design-services/features/pom.xml +++ b/appc-inbound/appc-design-services/features/pom.xml @@ -1,105 +1,42 @@ - - 4.0.0 - - - appc-design-services - org.onap.appc - 1.4.0-SNAPSHOT - - appc-design-services-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 - jar +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-design-services-model - - - org.onap.appc - appc-design-services-provider - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + - - - org.opendaylight.controller - opendaylight-karaf-empty - zip - + org.onap.appc + appc-design-services-feature-aggregator + 1.4.0-SNAPSHOT + pom - - - org.opendaylight.odlparent - features-test - test - ${odl.commons.opendaylight.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-design-services + features-appc-design-services + diff --git a/appc-inbound/appc-design-services/installer/pom.xml b/appc-inbound/appc-design-services/installer/pom.xml index 052cd6dc4..a5bb0c535 100755 --- a/appc-inbound/appc-design-services/installer/pom.xml +++ b/appc-inbound/appc-design-services/installer/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - - appc-design-services - org.onap.appc - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc appc-design-services-installer appc-design-services-installer pom @@ -34,7 +36,7 @@ appc-design-services appc-design-services - mvn:org.onap.appc/appc-design-services-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-design-services/${project.version}/xml/features false @@ -42,7 +44,7 @@ org.onap.appc - appc-design-services-features + onap-appc-design-services ${project.version} features xml diff --git a/appc-inbound/appc-design-services/model/pom.xml b/appc-inbound/appc-design-services/model/pom.xml index e8ea06513..87fccfa29 100755 --- a/appc-inbound/appc-design-services/model/pom.xml +++ b/appc-inbound/appc-design-services/model/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 - appc-design-services - org.onap.appc + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-design-services-model bundle diff --git a/appc-inbound/appc-design-services/pom.xml b/appc-inbound/appc-design-services/pom.xml index 5e9a0e3dc..e8a9b7da4 100755 --- a/appc-inbound/appc-design-services/pom.xml +++ b/appc-inbound/appc-design-services/pom.xml @@ -22,11 +22,12 @@ 4.0.0 - - org.onap.appc - appc-inbound - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + pom org.onap.appc diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml index f34319bb6..7197c0633 100755 --- a/appc-inbound/appc-design-services/provider/pom.xml +++ b/appc-inbound/appc-design-services/provider/pom.xml @@ -23,11 +23,13 @@ 4.0.0 - - appc-design-services + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - 1.4.0-SNAPSHOT - appc-design-services-provider bundle @@ -59,6 +61,7 @@ org.onap.appc appc-design-services-model + ${project.version} org.onap.appc @@ -106,11 +109,6 @@ org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index efd8791a9..f9d21e13e 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - - appc-interfaces-service + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - 1.4.0-SNAPSHOT - appc-interfaces-service-bundle bundle @@ -103,11 +105,6 @@ org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/.gitignore b/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/pom.xml new file mode 100644 index 000000000..f27ea7b58 --- /dev/null +++ b/appc-inbound/appc-interfaces-service/features/features-appc-interfaces-service/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-interfaces-service + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-interfaces-service + ${project.version} + xml + features + + + + diff --git a/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/.gitignore b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml new file mode 100644 index 000000000..cd1045267 --- /dev/null +++ b/appc-inbound/appc-interfaces-service/features/onap-appc-interfaces-service/pom.xml @@ -0,0 +1,96 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-interfaces-service + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.mdsal.model + odl-mdsal-models + xml + features + + + org.onap.appc + appc-interfaces-service-model + ${project.version} + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.appc + appc-interfaces-service-bundle + ${project.version} + + + org.onap.appc + appc-aai-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-inbound/appc-interfaces-service/features/pom.xml b/appc-inbound/appc-interfaces-service/features/pom.xml index 43a92de87..b2f134ebc 100644 --- a/appc-inbound/appc-interfaces-service/features/pom.xml +++ b/appc-inbound/appc-interfaces-service/features/pom.xml @@ -1,103 +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-interfaces-service - org.onap.appc + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - appc-interfaces-service-features - APPC Interfaces Service - Feature - jar - - - - org.onap.appc - appc-interfaces-service-model - - - org.onap.appc - appc-interfaces-service-bundle - - - - org.opendaylight.controller - opendaylight-karaf-empty - zip - - - - org.opendaylight.odlparent - features-test - test - ${odl.commons.opendaylight.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 - - - - - - - - + org.onap.appc + appc-interfaces-service-feature-aggregator + 1.4.0-SNAPSHOT + pom + + + + + onap-appc-interfaces-service + features-appc-interfaces-service + diff --git a/appc-inbound/appc-interfaces-service/installer/pom.xml b/appc-inbound/appc-interfaces-service/installer/pom.xml index 55ca30a47..ded1c3677 100644 --- a/appc-inbound/appc-interfaces-service/installer/pom.xml +++ b/appc-inbound/appc-interfaces-service/installer/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 - appc-interfaces-service - org.onap.appc + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-interfaces-service-installer appc-interfaces-service-installer pom @@ -34,7 +36,7 @@ appc-interfaces-service appc-interfaces-service - mvn:org.onap.appc/appc-interfaces-service-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-interfaces-service/${project.version}/xml/features false @@ -42,7 +44,7 @@ org.onap.appc - appc-interfaces-service-features + onap-appc-interfaces-service ${project.version} features xml diff --git a/appc-inbound/appc-interfaces-service/model/pom.xml b/appc-inbound/appc-interfaces-service/model/pom.xml index eb4e09915..4e021cb0e 100644 --- a/appc-inbound/appc-interfaces-service/model/pom.xml +++ b/appc-inbound/appc-interfaces-service/model/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - - appc-interfaces-service + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - 1.4.0-SNAPSHOT - appc-interfaces-service-model bundle diff --git a/appc-inbound/appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/pom.xml index 50297f6d8..47baa4327 100644 --- a/appc-inbound/appc-interfaces-service/pom.xml +++ b/appc-inbound/appc-interfaces-service/pom.xml @@ -24,10 +24,12 @@ 4.0.0 - org.onap.appc - appc-inbound + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc pom appc-interfaces-service diff --git a/appc-oam/appc-oam-bundle/pom.xml b/appc-oam/appc-oam-bundle/pom.xml index 5a91f4432..731dc4259 100644 --- a/appc-oam/appc-oam-bundle/pom.xml +++ b/appc-oam/appc-oam-bundle/pom.xml @@ -67,7 +67,6 @@ org.opendaylight.yangtools yang-maven-plugin - ${odl.yangtools.version} config @@ -225,11 +224,6 @@ org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/appc-provider/appc-provider-bundle/pom.xml b/appc-provider/appc-provider-bundle/pom.xml index bda1e40db..fe3972577 100644 --- a/appc-provider/appc-provider-bundle/pom.xml +++ b/appc-provider/appc-provider-bundle/pom.xml @@ -224,11 +224,6 @@ org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml index d268ac448..d13f4698d 100644 --- a/appc-sdc-listener/appc-yang-generator/pom.xml +++ b/appc-sdc-listener/appc-yang-generator/pom.xml @@ -64,7 +64,9 @@ limitations under the License. org.opendaylight.yangtools yang-parser-impl - ${odl.yangtools.version} + + 1.2.2 junit diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml index f2edf82aa..77390a0eb 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml @@ -148,11 +148,6 @@ org.opendaylight.controller test - - sal-rest-connector - org.opendaylight.netconf - test - org.opendaylight.controller sal-binding-broker-impl diff --git a/pom.xml b/pom.xml index 3300e1fe2..ee2185d99 100644 --- a/pom.xml +++ b/pom.xml @@ -229,11 +229,6 @@ limitations under the License. sal-test-model ${odl.mdsal.version} - - org.opendaylight.netconf - sal-rest-connector - ${odl.mdsal.version} - org.opendaylight.controller sal-binding-broker-impl -- 2.16.6