summaryrefslogtreecommitdiffstats
path: root/appc-inbound
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2018-03-22 15:12:48 -0700
committerPatrick Brady <pb071s@att.com>2018-04-11 17:42:20 +0000
commit5b81764739425ccb4a418947e1565a7f691f4204 (patch)
tree245b7d69f2bc2c093c88bc9fb3c2c3757468e9c1 /appc-inbound
parentabd3c649e4e50d9e1e995f81cb080e470eb02b48 (diff)
ODL Upgrade Method 2
Changes necessary to support upgrade to ODL Nitrogen, while continuing to use Karaf 3 style features Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-403
Diffstat (limited to 'appc-inbound')
-rw-r--r--appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml17
-rwxr-xr-xappc-inbound/appc-artifact-handler/installer/resources/scripts/install-feature.sh6
-rw-r--r--appc-inbound/appc-artifact-handler/installer/src/main/resources/scripts/install-feature.sh7
-rwxr-xr-xappc-inbound/appc-artifact-handler/model/pom.xml6
-rwxr-xr-xappc-inbound/appc-artifact-handler/provider/pom.xml6
-rw-r--r--appc-inbound/appc-design-services/features/src/main/resources/features.xml5
-rwxr-xr-xappc-inbound/appc-design-services/installer/resources/scripts/install-feature.sh6
-rw-r--r--appc-inbound/appc-design-services/installer/src/main/resources/scripts/install-feature.sh7
-rw-r--r--appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml5
-rw-r--r--appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh6
-rw-r--r--appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh7
11 files changed, 33 insertions, 45 deletions
diff --git a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
index 10a276460..4c5b9dcd1 100644
--- a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Copyright (C) 2017 Amdocs
=============================================================================
@@ -19,7 +19,6 @@
See the License for the specific language governing permissions and
limitations under the License.
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END=========================================================
-->
@@ -29,20 +28,14 @@
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
- <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
+ <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>-->
<feature name='appc-artifact-handler' description="Application Controller Artifact Handler"
version='${project.version}'>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
- <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
- <feature>sdnc-sli</feature>
- <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
- <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
- <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
- <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
- <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle>
- <bundle>wrap:mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
- <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle>
+ <feature >odl-mdsal-broker</feature>
+ <feature>ccsdk-sli</feature>
+ <!-- <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle> -->
<bundle>wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version}</bundle>
<bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle>
<bundle>mvn:org.onap.appc/appc-artifact-handler-model/${project.version}</bundle>
diff --git a/appc-inbound/appc-artifact-handler/installer/resources/scripts/install-feature.sh b/appc-inbound/appc-artifact-handler/installer/resources/scripts/install-feature.sh
index c5a39bf9a..69ca19451 100755
--- a/appc-inbound/appc-artifact-handler/installer/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-artifact-handler/installer/resources/scripts/install-feature.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# ONAP : APP-C
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-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.
@@ -22,7 +22,7 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,4 +36,4 @@ else
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+
diff --git a/appc-inbound/appc-artifact-handler/installer/src/main/resources/scripts/install-feature.sh b/appc-inbound/appc-artifact-handler/installer/src/main/resources/scripts/install-feature.sh
index 05b4ae373..c3c036864 100644
--- a/appc-inbound/appc-artifact-handler/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-artifact-handler/installer/src/main/resources/scripts/install-feature.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# ONAP : APPC
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Copyright (C) 2017 Amdocs
# =============================================================================
@@ -18,7 +18,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
# ============LICENSE_END=========================================================
###
@@ -26,7 +25,7 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -40,4 +39,4 @@ else
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+
diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml
index d9019c068..40b3ada28 100755
--- a/appc-inbound/appc-artifact-handler/model/pom.xml
+++ b/appc-inbound/appc-artifact-handler/model/pom.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
Copyright (C) 2017 Amdocs
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
See the License for the specific language governing permissions and
limitations under the License.
============LICENSE_END=========================================================
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
@@ -41,7 +40,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Import-Package>*</Import-Package>
+ <Import-Package>!com.google.common.collect,*</Import-Package>
+ <Embed-Dependency>*</Embed-Dependency>
</instructions>
</configuration>
</plugin>
diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml
index 204f93d52..6ac7f1bf5 100755
--- a/appc-inbound/appc-artifact-handler/provider/pom.xml
+++ b/appc-inbound/appc-artifact-handler/provider/pom.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
-Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Copyright (C) 2017 Amdocs
=============================================================================
@@ -19,7 +19,6 @@ 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.
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END=========================================================
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -44,7 +43,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<Bundle-SymbolicName>org.onap.appc.artifact.handler</Bundle-SymbolicName>
<Bundle-Activator>org.onap.appc.artifact.handler.SdcArtifactHandlerActivator</Bundle-Activator>
<Export-Package>org.onap.appc.artifact.handler,org.opendaylight.controller.config.yang.config.artifact-handler_provider.impl</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>!com.google,!org.apache.commons.configuration,*;resolution:=optional</Import-Package>
+ <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|!appc-common|org.eclipse.osgi|slf4j-api|jcl-over-slf4j|mariadb-java-client|xml-apis</Embed-Dependency>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
<manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
index 5ad41adfe..7fb150504 100644
--- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Copyright (C) 2017 Amdocs
=============================================================================
@@ -19,7 +19,6 @@
See the License for the specific language governing permissions and
limitations under the License.
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END=========================================================
-->
@@ -39,7 +38,7 @@
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature>
- <feature>sdnc-sli</feature>
+ <feature>ccsdk-sli</feature>
<bundle>mvn:org.onap.appc/appc-design-services-provider/${project.version}</bundle>
<bundle>mvn:org.onap.appc/appc-network-inventory-client-provider/${project.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle>
diff --git a/appc-inbound/appc-design-services/installer/resources/scripts/install-feature.sh b/appc-inbound/appc-design-services/installer/resources/scripts/install-feature.sh
index c5a39bf9a..69ca19451 100755
--- a/appc-inbound/appc-design-services/installer/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-design-services/installer/resources/scripts/install-feature.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# ONAP : APP-C
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-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.
@@ -22,7 +22,7 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,4 +36,4 @@ else
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+
diff --git a/appc-inbound/appc-design-services/installer/src/main/resources/scripts/install-feature.sh b/appc-inbound/appc-design-services/installer/src/main/resources/scripts/install-feature.sh
index 05b4ae373..c3c036864 100644
--- a/appc-inbound/appc-design-services/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-design-services/installer/src/main/resources/scripts/install-feature.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# ONAP : APPC
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Copyright (C) 2017 Amdocs
# =============================================================================
@@ -18,7 +18,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
# ============LICENSE_END=========================================================
###
@@ -26,7 +25,7 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -40,4 +39,4 @@ else
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+
diff --git a/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml b/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml
index 2d3198cd7..ecb5520fc 100644
--- a/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-interfaces-service/features/src/main/resources/features.xml
@@ -3,7 +3,7 @@
============LICENSE_START=======================================================
ONAP : APPC
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
================================================================================
Copyright (C) 2017 Amdocs
=============================================================================
@@ -19,7 +19,6 @@
See the License for the specific language governing permissions and
limitations under the License.
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END=========================================================
-->
@@ -41,7 +40,7 @@
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
<feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature>
- <feature>sdnc-sli</feature>
+ <feature>ccsdk-sli</feature>
<bundle>mvn:org.onap.appc/appc-interfaces-service-bundle/${project.version}</bundle>
<bundle>mvn:org.onap.appc/appc-aai-client-provider/${project.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle>
diff --git a/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh b/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh
index f2f254bac..3525ba525 100644
--- a/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# ONAP : APP-C
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-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.
@@ -22,7 +22,7 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,4 +36,4 @@ else
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+
diff --git a/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh b/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh
index d0210eb06..cd1b4d973 100644
--- a/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-inbound/appc-interfaces-service/installer/src/main/resources/scripts/install-feature.sh
@@ -2,7 +2,7 @@
# ============LICENSE_START=======================================================
# ONAP : APPC
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Copyright (C) 2017 Amdocs
# =============================================================================
@@ -18,7 +18,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
# ============LICENSE_END=========================================================
###
@@ -26,7 +25,7 @@
ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
INSTALLERDIR=$(dirname $0)
REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -40,4 +39,4 @@ else
fi
${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+