From: Patrick Brady Date: Thu, 9 Aug 2018 19:05:53 +0000 (-0700) Subject: Karaf 4 for appc-dg features X-Git-Tag: 1.4.0~105 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=3222908ff0b148698d23f5cb3e9402d7f1a662a2;p=appc.git Karaf 4 for appc-dg features Including appc-dg-util, appc-dg-shared, and appc-ssh-adapter Change-Id: Ia137a87c560438d23f7858e0f4068717891be076 Signed-off-by: Patrick Brady Issue-ID: APPC-1137 --- diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml index 632d1415e..fdba33fcd 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/pom.xml @@ -21,11 +21,13 @@ --> 4.0.0 - - org.onap.appc - appc-ssh-adapter - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-ssh-adapter-api bundle diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml new file mode 100644 index 000000000..858655228 --- /dev/null +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/features-appc-ssh-adapter/pom.xml @@ -0,0 +1,48 @@ + + + + 4.0.0 + + + org.onap.appc.parent + feature-repo-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + features-appc-ssh-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-ssh-adapter + ${project.version} + xml + features + + + + diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml new file mode 100644 index 000000000..9967cfb69 --- /dev/null +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/onap-appc-ssh-adapter/pom.xml @@ -0,0 +1,94 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-ssh-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + org.onap.appc + appc-ssh-adapter-api + ${project.version} + + + org.onap.appc + appc-ssh-adapter-sshd + ${project.version} + + + org.apache.sshd + sshd-core + 2.0.0 + + + org.apache.sshd + sshd-sftp + 2.0.0 + + + org.apache.sshd + sshd-scp + 2.0.0 + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + false + + slf4j-api + tomcat-jdbc + tomcat-juli + httpcore + httpclient + org.eclipse.osgi + + + + + + + diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml index 3f38bd1df..840cb4469 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/pom.xml @@ -1,92 +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========================================================= +--> - - appc-ssh-adapter - org.onap.appc - 1.4.0-SNAPSHOT - - 4.0.0 + 4.0.0 - appc-ssh-adapter-features - jar + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + - - - org.onap.appc - appc-ssh-adapter-api - ${project.version} - + org.onap.appc + appc-ssh-adapter-feature-aggregator + 1.4.0-SNAPSHOT + pom - - org.onap.appc - appc-ssh-adapter-sshd - ${project.version} - - + - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + onap-appc-ssh-adapter + features-appc-ssh-adapter + diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml index 854e2d4ef..4d00b5763 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - - org.onap.appc - appc-ssh-adapter - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-ssh-adapter-sshd bundle @@ -42,16 +44,19 @@ org.apache.sshd sshd-core provided + 2.0.0 org.apache.sshd sshd-sftp provided + 2.0.0 org.apache.sshd sshd-scp provided + 2.0.0 com.att.eelf @@ -64,7 +69,7 @@ org.onap.appc - appc-common + appc-common-bundle ${project.version} @@ -86,6 +91,7 @@ !org.apache.log,!org.apache.commons.logging,!groovy.lang,!javax.jms,!org.codehaus.commons.compiler,!org.codehaus.groovy.*,!org.codehaus.janino,!com.ibm.icu.*,!com.sun.faces.*,!org.jasypt.*,* !dblib-provider,jasypt,eelf-core,logback-core,logback-classic;scope=compile|runtime;inline=false true + <_removeheaders>Import-Service diff --git a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml index 7d23bafe5..e2cc2025f 100644 --- a/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml +++ b/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/pom.xml @@ -21,11 +21,13 @@ --> 4.0.0 - - org.onap.appc - appc-ssh-adapter - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-ssh-adapter-tests @@ -41,4 +43,4 @@ test - \ No newline at end of file + diff --git a/appc-adapters/appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/pom.xml index 87f479ad8..092d99e52 100644 --- a/appc-adapters/appc-ssh-adapter/pom.xml +++ b/appc-adapters/appc-ssh-adapter/pom.xml @@ -20,11 +20,13 @@ ============LICENSE_END========================================================= --> - - appc-adapters - org.onap.appc - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc 4.0.0 appc-ssh-adapter @@ -36,4 +38,4 @@ appc-ssh-adapter-sshd appc-ssh-adapter-features - \ No newline at end of file + diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml index 32ecd396e..b521f696d 100644 --- a/appc-dg-util/appc-dg-util-bundle/pom.xml +++ b/appc-dg-util/appc-dg-util-bundle/pom.xml @@ -24,12 +24,13 @@ 4.0.0 - - org.onap.appc - appc-dg-util - 1.4.0-SNAPSHOT - - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-dg-util-bundle bundle appc-dg-util - bundle @@ -190,6 +191,7 @@ org.assertj assertj-core test + ${assertj.version} diff --git a/appc-dg-util/appc-dg-util-features/features-appc-dg-util/.gitignore b/appc-dg-util/appc-dg-util-features/features-appc-dg-util/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-dg-util/appc-dg-util-features/features-appc-dg-util/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-dg-util/appc-dg-util-features/features-appc-dg-util/pom.xml b/appc-dg-util/appc-dg-util-features/features-appc-dg-util/pom.xml new file mode 100644 index 000000000..5e864106b --- /dev/null +++ b/appc-dg-util/appc-dg-util-features/features-appc-dg-util/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-dg-util + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-dg-util + ${project.version} + xml + features + + + + diff --git a/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/.gitignore b/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/pom.xml b/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/pom.xml new file mode 100644 index 000000000..95acf664a --- /dev/null +++ b/appc-dg-util/appc-dg-util-features/onap-appc-dg-util/pom.xml @@ -0,0 +1,81 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-dg-util + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.appc + appc-dg-util-bundle + ${project.version} + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + false + + slf4j-api + tomcat-jdbc + tomcat-juli + httpcore + httpclient + org.eclipse.osgi + + + + + + + diff --git a/appc-dg-util/appc-dg-util-features/pom.xml b/appc-dg-util/appc-dg-util-features/pom.xml index 22d6105bb..5b0f7d2e1 100644 --- a/appc-dg-util/appc-dg-util-features/pom.xml +++ b/appc-dg-util/appc-dg-util-features/pom.xml @@ -1,144 +1,42 @@ +============LICENSE_START======================================================= +ONAP : APPC +================================================================================ +Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +============================================================================= +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +============LICENSE_END========================================================= +--> - 4.0.0 - - appc-dg-util - org.onap.appc - 1.4.0-SNAPSHOT - - appc-dg-util-features - appc-dg-util-features - - jar - - - - org.onap.appc - appc-dg-util-bundle - ${project.version} - - - - org.opendaylight.mdsal - features-mdsal - features - xml - - runtime - - + 4.0.0 + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + - - - - - - - - - - - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - + org.onap.appc + appc-dg-util-feature-aggregator + 1.4.0-SNAPSHOT + pom - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.opendaylight.controller - opendaylight-karaf-empty - ${odl.karaf.empty.distro.version} - - - org.opendaylight.yangtools:features-test - - - - org.ops4j.pax.exam:pax-exam-container-native - - true - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - + - - + + onap-appc-dg-util + features-appc-dg-util + diff --git a/appc-dg-util/appc-dg-util-installer/pom.xml b/appc-dg-util/appc-dg-util-installer/pom.xml index 53f3309ba..719cd6f1a 100644 --- a/appc-dg-util/appc-dg-util-installer/pom.xml +++ b/appc-dg-util/appc-dg-util-installer/pom.xml @@ -21,11 +21,12 @@ --> 4.0.0 - - appc-dg-util - org.onap.appc - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + appc-dg-util-installer APPC DG Util - Karaf Installer pom @@ -33,7 +34,7 @@ appc-dg-util appc-dg-util - mvn:org.onap.appc/appc-dg-util-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-dg-util/${project.version}/xml/features false @@ -41,7 +42,7 @@ org.onap.appc - appc-dg-util-features + onap-appc-dg-util ${project.version} features xml @@ -150,4 +151,5 @@ + org.onap.appc diff --git a/appc-dg-util/pom.xml b/appc-dg-util/pom.xml index 9855c3f6d..1e0333c6c 100644 --- a/appc-dg-util/pom.xml +++ b/appc-dg-util/pom.xml @@ -20,11 +20,12 @@ --> 4.0.0 - - org.onap.appc - appc - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + appc-dg-util pom APPC DG util @@ -40,4 +41,5 @@ appc-dg-util-installer - \ No newline at end of file + org.onap.appc + diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml index e399abacb..731debf7e 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-aai/pom.xml @@ -22,17 +22,19 @@ 4.0.0 - org.onap.appc - appc-dg-shared + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-dg-aai bundle org.onap.appc - appc-common + appc-common-bundle ${project.version} diff --git a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml index f8cae4028..0540b9f9a 100644 --- a/appc-dg/appc-dg-shared/appc-dg-common/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-common/pom.xml @@ -21,18 +21,20 @@ --> 4.0.0 - - org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-dg-common bundle org.onap.appc - appc-common + appc-common-bundle ${project.version} @@ -174,27 +176,22 @@ com.fasterxml.jackson.dataformat jackson-dataformat-yaml - ${jackson-yaml-version} com.fasterxml.jackson.core jackson-annotations - ${jackson-yaml-version} com.fasterxml.jackson.core jackson-databind - ${jackson-yaml-version} com.fasterxml.jackson.core jackson-core - ${jackson-yaml-version} org.yaml snakeyaml - ${snakeyaml.version} commons-lang @@ -220,6 +217,7 @@ true + <_removeheaders>Import-Service diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml index 59863dfa1..4623217d8 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/pom.xml @@ -20,11 +20,13 @@ --> 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - appc-dg-dependency-model jar @@ -41,7 +43,7 @@ org.onap.appc - appc-common + appc-common-bundle ${project.version} @@ -100,6 +102,10 @@ appc-dg-domain-model-lib ${project.version} + + equinoxSDK381 + org.eclipse.osgi + diff --git a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml index fafd68c65..179466d85 100644 --- a/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/pom.xml @@ -21,11 +21,12 @@ --> 4.0.0 - - org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc appc-dg-domain-model-lib diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml index 4c42e3e0a..fc6fe1052 100644 --- a/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/pom.xml @@ -21,11 +21,13 @@ --> 4.0.0 - - org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-dg-license-manager bundle @@ -71,6 +73,7 @@ org.onap.appc.exceptions, com.att.eelf.configuration, *;resolution:=optional + <_removeheaders>Import-Service diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-bundle/.gitignore @@ -0,0 +1 @@ +/target-ide/ 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 36c51560a..482329960 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 @@ -26,10 +26,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-dg-mdsal-store + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-dg-mdsal-bundle bundle @@ -185,6 +187,11 @@ test-jar test + + org.apache.httpcomponents + httpcore + ${apache.httpcomponents.version} + org.onap.ccsdk.sli.core sli-common @@ -213,7 +220,7 @@ org.onap.appc - appc-common + appc-common-bundle ${project.version} diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml index cf66d37a5..89fca6e3b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/appc-dg-mdsal-model/pom.xml @@ -24,11 +24,13 @@ 4.0.0 - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + org.onap.appc - appc-dg-mdsal-store - 1.4.0-SNAPSHOT - appc-dg-mdsal-model bundle diff --git a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml index 4377bbf15..3ec3bb9c0 100644 --- a/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-mdsal-store/pom.xml @@ -26,11 +26,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-dg-shared + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + - + org.onap.appc appc-dg-mdsal-store pom diff --git a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml index 4cb525713..2a75478ea 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml @@ -21,18 +21,20 @@ --> 4.0.0 - - org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-dg-netconf bundle org.onap.appc - appc-common + appc-common-bundle ${project.version} @@ -101,6 +103,7 @@ true + <_removeheaders>Import-Service diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/.gitignore b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/pom.xml new file mode 100644 index 000000000..a45bc7809 --- /dev/null +++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/features-appc-dg-shared/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-dg-shared + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-dg-shared + ${project.version} + xml + features + + + + diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/.gitignore b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/.gitignore new file mode 100644 index 000000000..eacf31a67 --- /dev/null +++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/.gitignore @@ -0,0 +1 @@ +/target-ide/ diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml new file mode 100644 index 000000000..ccf2089e8 --- /dev/null +++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/onap-appc-dg-shared/pom.xml @@ -0,0 +1,115 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-dg-shared + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + org.onap.appc + onap-appc-ssh-adapter + ${project.version} + xml + features + + + org.onap.appc + onap-appc-netconf-adapter + ${project.version} + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.appc + appc-dg-common + ${project.version} + + + org.onap.appc + appc-dg-ssh + ${project.version} + + + org.onap.appc + appc-dg-netconf + ${project.version} + + + org.onap.appc + appc-dg-license-manager + ${project.version} + + + org.onap.appc + appc-dg-aai + ${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-dg/appc-dg-shared/appc-dg-shared-features/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml index dfb413bfc..f010c18c1 100644 --- a/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/pom.xml @@ -1,105 +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-dg-shared - 1.4.0-SNAPSHOT - - appc-dg-shared-features - jar + 4.0.0 + + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + + org.onap.appc + appc-dg-shared-feature-aggregator + 1.4.0-SNAPSHOT + pom - - - org.onap.appc - appc-dg-ssh - ${project.version} - - - org.onap.appc - appc-dg-netconf - ${project.version} - - - org.onap.appc - appc-dg-aai - ${project.version} - - - org.onap.appc - appc-dg-license-manager - ${project.version} - - - org.onap.appc - appc-dg-common - ${project.version} - - + - - - - true - src/main/resources - - - - - org.apache.maven.plugins - maven-resources-plugin - - - filter - - resources - - generate-resources - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - - attach-artifact - - package - - - - ${project.build.directory}/classes/${features.file} - xml - features - - - - - - - - + + onap-appc-dg-shared + features-appc-dg-shared + diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml b/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml index 472697c6f..cd6120114 100644 --- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/pom.xml @@ -21,11 +21,13 @@ --> 4.0.0 - - org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + + org.onap.appc appc-dg-shared-installer APPC DG Shared - Karaf Installer pom @@ -33,13 +35,13 @@ appc-dg-shared appc-dg-shared - mvn:org.onap.appc/appc-dg-shared-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-dg-shared/${project.version}/xml/features org.onap.appc - appc-dg-shared-features + onap-appc-dg-shared ${project.version} features xml @@ -47,15 +49,7 @@ org.onap.appc - appc-ssh-adapter-features - ${project.version} - features - xml - - - - org.onap.appc - appc-netconf-adapter-features + onap-appc-ssh-adapter ${project.version} features xml diff --git a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml index 0a474eab9..f83c43e7c 100644 --- a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml @@ -21,18 +21,20 @@ --> 4.0.0 - - org.onap.appc - appc-dg-shared - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + binding-parent + 1.4.0-SNAPSHOT + + + org.onap.appc appc-dg-ssh bundle org.onap.appc - appc-common + appc-common-bundle ${project.version} @@ -83,6 +85,7 @@ true + <_removeheaders>Import-Service diff --git a/appc-dg/appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/pom.xml index da2f19803..9e048d7e9 100644 --- a/appc-dg/appc-dg-shared/pom.xml +++ b/appc-dg/appc-dg-shared/pom.xml @@ -21,11 +21,12 @@ --> 4.0.0 - - org.onap.appc - appc-dg - 1.4.0-SNAPSHOT - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + appc-dg-shared pom diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml index 9e7f43889..3957010e9 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml @@ -213,6 +213,11 @@ commons-io commons-io + + javax.validation + validation-api + 1.1.0.Final + org.onap.appc