From 7f383f98c874d5918fa6e55597f30432b13a658d Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Mon, 30 Jul 2018 14:35:31 -0700 Subject: Karaf 4 for first few features appc-metric appc-dmaap-adapter appc-chef-adapter appc-netconf-adapter appc-rest-adapter Change-Id: I1d5a8e39cac7be74b05a0782f0971f8d08c8162d Signed-off-by: Patrick Brady Issue-ID: APPC-1029 --- .../appc-rest-adapter-bundle/pom.xml | 26 ++-- .../features-appc-rest-adapter/pom.xml | 48 ++++++ .../onap-appc-rest-adapter/pom.xml | 139 +++++++++++++++++ .../appc-rest-adapter-features/pom.xml | 170 +++++---------------- .../appc-rest-adapter-installer/pom.xml | 116 +++++++++++++- appc-adapters/appc-rest-adapter/pom.xml | 6 +- 6 files changed, 347 insertions(+), 158 deletions(-) create mode 100644 appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml create mode 100644 appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml (limited to 'appc-adapters/appc-rest-adapter') diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml index 3cdbd88f6..c55ec33c6 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-bundle/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - org.onap.appc - appc-rest-adapter + org.onap.appc.parent + binding-parent 1.4.0-SNAPSHOT + + org.onap.appc appc-rest-adapter-bundle bundle rest Adapter - bundle @@ -52,15 +54,8 @@ org.onap.appc - appc-common + appc-common-bundle ${project.version} - - - org.onap.appc - appc-common - ${project.version} - jar-with-dependencies - test javax @@ -78,12 +73,14 @@ com.att.cdp cdp-pal-common compile + ${cdp.pal.version} com.att.cdp cdp-pal-openstack compile + ${cdp.pal.version} @@ -126,11 +123,6 @@ test - - org.codehaus.jackson - jackson-jaxrs - 1.9.13 - commons-codec @@ -187,6 +179,7 @@ org.mariadb.jdbc mariadb-java-client + ${mariadb.client.version} @@ -216,8 +209,7 @@ appc-rest-adapter org.onap.appc.adapter.rest.RestActivator org.onap.appc.adapter.rest - org.onap.ccsdk.sli.core.sli.*,org.osgi.framework.*,org.slf4j.*,com.vmware.*,org.apache.xerces.*,javax.net.*,javax.net.ssl.*,org.xml.sax.*,javax.xml.bind.*,javax.naming.* - *;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis|jaxp-api + * true diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-adapter/pom.xml new file mode 100644 index 000000000..7eac784af --- /dev/null +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/features-appc-rest-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-rest-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.onap.appc + onap-appc-rest-adapter + ${project.version} + xml + features + + + + diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml new file mode 100644 index 000000000..08590d7d8 --- /dev/null +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/onap-appc-rest-adapter/pom.xml @@ -0,0 +1,139 @@ + + + + 4.0.0 + + + org.onap.appc.parent + single-feature-parent + 1.4.0-SNAPSHOT + + + + org.onap.appc + onap-appc-rest-adapter + 1.4.0-SNAPSHOT + feature + + + + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + + org.onap.ccsdk.sli.core + ccsdk-sli + xml + features + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + org.onap.appc + appc-rest-adapter-bundle + ${project.version} + + + org.glassfish.jersey.bundles.repackaged + jersey-guava + 2.25.1 + + + com.fasterxml.jackson.core + jackson-core + 2.8.4 + + + com.fasterxml.jackson.core + jackson-databind + 2.8.4 + + + com.fasterxml.jackson.core + jackson-annotations + 2.8.4 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + 2.8.4 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.8.4 + + + org.glassfish.jersey.core + jersey-server + 2.25.1 + + + com.ning + async-http-client + 1.9.39 + + + org.glassfish.grizzly + grizzly-http-servlet + 2.3.28 + + + org.glassfish.grizzly + grizzly-http + 2.3.28 + + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + true + + true + + slf4j-api + tomcat-jdbc + tomcat-juli + httpcore + httpclient + org.eclipse.osgi + appc-common + + + + + + + diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml index 1f063ef97..0a1f1c1f9 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-features/pom.xml @@ -1,142 +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-rest-adapter - org.onap.appc - 1.4.0-SNAPSHOT - - appc-rest-adapter-features - Rest Adaptor - Features - - jar - - - - org.onap.appc - appc-rest-adapter-bundle - ${project.version} - + 4.0.0 - - commons-lang - commons-lang - compile - + + org.onap.appc.parent + odlparent-lite + 1.4.0-SNAPSHOT + + - - org.opendaylight.mdsal - features-mdsal - features - xml - runtime - - - - - org.opendaylight.controller - opendaylight-karaf-empty - zip - - - - - - - - + org.onap.appc + appc-rest-adapter-feature-aggregator + 1.4.0-SNAPSHOT + pom - - org.opendaylight.yangtools - features-yangtools - features - xml - runtime - - + - - - - 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 - - - - - - - - - \ No newline at end of file + + onap-appc-rest-adapter + features-appc-rest-adapter + + diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml index 11051b8d3..21d701df8 100644 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/pom.xml @@ -22,10 +22,12 @@ 4.0.0 - appc-rest-adapter - org.onap.appc + odlparent-lite + org.onap.appc.parent 1.4.0-SNAPSHOT + + org.onap.appc appc-rest-adapter-installer rest Adapter - Karaf Installer pom @@ -33,15 +35,16 @@ appc-rest-adapter appc-rest-adapter - mvn:org.onap.appc/appc-rest-adapter-features/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-rest-adapter/${project.version}/xml/features false org.onap.appc - appc-rest-adapter-features + onap-appc-rest-adapter features + ${project.version} xml @@ -145,6 +148,111 @@ + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy + + copy + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.opendaylight + provided + + + com.fasterxml.jackson.core + jackson-databind + 2.8.4 + jar + ${project.build.directory}/assembly/system/com/fasterxml/jackson/core/jackson-databind/2.8.4 + + + com.fasterxml.jackson.core + jackson-core + 2.8.4 + jar + ${project.build.directory}/assembly/system/com/fasterxml/jackson/core/jackson-core/2.8.4 + + + com.fasterxml.jackson.core + jackson-annotations + 2.8.4 + jar + ${project.build.directory}/assembly/system/com/fasterxml/jackson/core/jackson-annotations/2.8.4 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + 2.8.4 + jar + ${project.build.directory}/assembly/system/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base/2.8.4 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.8.4 + jar + ${project.build.directory}/assembly/system/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/2.8.4 + + + org.glassfish.jersey.core + jersey-server + 2.25.1 + jar + ${project.build.directory}/assembly/system/org/glassfish/jersey/core/jersey-server/2.25.1 + + + com.ning + async-http-client + 1.9.39 + jar + ${project.build.directory}/assembly/system/com/ning/async-http-client/1.9.39 + + + io.netty + netty + 3.10.5.Final + jar + ${project.build.directory}/assembly/system/io/netty/netty/3.10.5.Final + + + org.glassfish.grizzly + grizzly-http-servlet + 2.3.28 + jar + ${project.build.directory}/assembly/system/org/glassfish/grizzly/grizzly-http-servlet/2.3.28 + + + org.glassfish.grizzly + grizzly-http-server + 2.3.28 + jar + ${project.build.directory}/assembly/system/org/glassfish/grizzly/grizzly-http-server/2.3.28 + + + org.glassfish.grizzly + grizzly-http + 2.3.28 + jar + ${project.build.directory}/assembly/system/org/glassfish/grizzly/grizzly-http/2.3.28 + + + + + + diff --git a/appc-adapters/appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/pom.xml index 0e25f7883..595d1d4ad 100644 --- a/appc-adapters/appc-rest-adapter/pom.xml +++ b/appc-adapters/appc-rest-adapter/pom.xml @@ -22,11 +22,13 @@ 4.0.0 - org.onap.appc - appc-adapters + org.onap.appc.parent + odlparent-lite 1.4.0-SNAPSHOT + + org.onap.appc appc-rest-adapter rest Adaptor Abstraction to connect to and utilize the services of cloud providers such as OpenStack or VMWare. -- cgit 1.2.3-korg