From: Taka Cho Date: Wed, 9 Oct 2019 02:11:26 +0000 (-0400) Subject: Neon SR1 upgrade X-Git-Tag: 1.7.0~40 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc.git;a=commitdiff_plain;h=9c74c5729c9a52268342e583d6493bb19df80aa6 Neon SR1 upgrade change pom files for ODL Neon SR1 upgrade Issue-ID: APPC-1749 Change-Id: Ib10ff74852a2b38933c0df034c71e21665430f62 Signed-off-by: Taka Cho --- diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml index be4288711..9d3b6a63e 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/pom.xml @@ -27,7 +27,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml index 826c2dd7c..2919d9b6d 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/features-appc-ansible-adapter/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml index 0a2b2db30..a3456291c 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/onap-appc-ansible-adapter/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml index dab3c63b7..334061e56 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-ansible-adapter diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml index 67ebcf279..53f3f06ca 100644 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/pom.xml @@ -27,7 +27,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-ansible-adapter-installer diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh index 6402f6c32..2d6113c04 100755 --- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-adapters/appc-ansible-adapter/pom.xml b/appc-adapters/appc-ansible-adapter/pom.xml index b666c2221..2206f5e82 100644 --- a/appc-adapters/appc-ansible-adapter/pom.xml +++ b/appc-adapters/appc-ansible-adapter/pom.xml @@ -21,14 +21,13 @@ ============LICENSE_END========================================================= --> - 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml index bdeaa53ed..079a52c46 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-chef-adapter-bundle diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml index 75eb04145..38a3ddb14 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/features-appc-chef-adapter/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml index d858f8332..ffcea1057 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/onap-appc-chef-adapter/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml index 35a417809..75b183fc9 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-chef-adapter diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml index 4707458e9..12d3269b1 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + appc-chef-adapter-installer org.onap.appc diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh index 06e8f20d3..e7eb9b5ed 100755 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-adapters/appc-chef-adapter/pom.xml b/appc-adapters/appc-chef-adapter/pom.xml index 2e89db111..b7292caf4 100644 --- a/appc-adapters/appc-chef-adapter/pom.xml +++ b/appc-adapters/appc-chef-adapter/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-chef-adapter diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml index 0f516dd80..188d3e764 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-dmaap-adapter-bundle @@ -204,4 +204,4 @@ 1.7.0-SNAPSHOT - \ No newline at end of file + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml index f5afe826d..13c5e67cf 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/features-appc-dmaap-adapter/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml index 7e57424c9..77694b80b 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/onap-appc-dmaap-adapter/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml index b374fbc8a..6f6875185 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-dmaap-adapter diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml index 91b94fce2..cc4956140 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/pom.xml @@ -25,7 +25,7 @@ odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + org.onap.appc appc-dmaap-adapter-installer diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh index 836910190..17282a8db 100755 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr + sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml index d924343d1..826d9d95b 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml index 8faf96688..82e591d90 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-dmaap-adapter/pom.xml b/appc-adapters/appc-dmaap-adapter/pom.xml index 2eca57ef1..e6c8f6603 100644 --- a/appc-adapters/appc-dmaap-adapter/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-dmaap-adapter diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml index 0636d0a9b..550407ecd 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-bundle/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml index 4421bf905..2c9aa92bc 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/features-appc-iaas-adapter/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml index bd5b12a2d..919eb32e4 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/onap-appc-iaas-adapter/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml index 370e8fe73..4fc966317 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-iaas-adapter diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml index 11e5b33c2..468b3c09b 100644 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/pom.xml @@ -25,7 +25,7 @@ odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + org.onap.appc appc-iaas-adapter-installer diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh index 836910190..f5d3d28e7 100755 --- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-adapters/appc-iaas-adapter/pom.xml b/appc-adapters/appc-iaas-adapter/pom.xml index 8f6815f46..19b97ba1a 100644 --- a/appc-adapters/appc-iaas-adapter/pom.xml +++ b/appc-adapters/appc-iaas-adapter/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml index 1b16129c7..1c22b7c3b 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-netconf-adapter-bundle diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml index 8be6713e8..c6f5bc01d 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/features-appc-netconf-adapter/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml index cc8495929..ae81316ad 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/onap-appc-netconf-adapter/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml index 3f4a08d94..cf6d6c642 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-adapter-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-netconf-adapter diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml index bdc7f2060..16cb011a0 100644 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/pom.xml @@ -25,7 +25,7 @@ odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + appc-netconf-adapter-installer org.onap.appc diff --git a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh index 836910190..17282a8db 100755 --- a/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-netconf-adapter/appc-netconf-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr + sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-adapters/appc-netconf-adapter/pom.xml b/appc-adapters/appc-netconf-adapter/pom.xml index 79423744b..95525cc22 100644 --- a/appc-adapters/appc-netconf-adapter/pom.xml +++ b/appc-adapters/appc-netconf-adapter/pom.xml @@ -24,7 +24,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + 4.0.0 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 6baab04f1..7286ec9d8 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 @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc 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 index 27f4196a1..062253d8d 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index d2418a275..3436de47c 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 b5479390b..372b87b6f 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-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 873ccfa60..37f8a032c 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 @@ -25,7 +25,7 @@ odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + org.onap.appc appc-rest-adapter-installer diff --git a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh index 836910190..f5d3d28e7 100755 --- a/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-rest-adapter/appc-rest-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-adapters/appc-rest-adapter/pom.xml b/appc-adapters/appc-rest-adapter/pom.xml index 4e8057161..9a5669c32 100644 --- a/appc-adapters/appc-rest-adapter/pom.xml +++ b/appc-adapters/appc-rest-adapter/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml index fc5ac058b..9985f9100 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/features-appc-rest-healthcheck-adapter/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/features-appc-rest-healthcheck-adapter/pom.xml index cfcab610e..71f2910ba 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/features-appc-rest-healthcheck-adapter/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/features-appc-rest-healthcheck-adapter/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/onap-appc-rest-healthcheck-adapter/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/onap-appc-rest-healthcheck-adapter/pom.xml index e1c40471d..eaefc3921 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/onap-appc-rest-healthcheck-adapter/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/onap-appc-rest-healthcheck-adapter/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml index 79b47b36a..ff9af3b11 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-rest-healthcheck-adapter diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml index efcb0d286..f7d573976 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/pom.xml @@ -25,7 +25,7 @@ odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + org.onap.appc appc-rest-healthcheck-adapter-installer diff --git a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh index 6402f6c32..c4cdb67ee 100755 --- a/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-rest-healthcheck-adapter/appc-rest-healthcheck-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,6 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-adapters/appc-rest-healthcheck-adapter/pom.xml b/appc-adapters/appc-rest-healthcheck-adapter/pom.xml index c22c1efdc..e42e3057d 100644 --- a/appc-adapters/appc-rest-healthcheck-adapter/pom.xml +++ b/appc-adapters/appc-rest-healthcheck-adapter/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc 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 5d9eb4a4d..fc52543fd 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 @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc 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 index f8a4ac5b7..443b673b8 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index f60485b4b..f07d20773 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 1ba4a4963..670a5b258 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-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 0810ed8e3..b1201877a 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 @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc 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 85a1bdf2b..8f7706d60 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 @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-ssh-adapter-tests diff --git a/appc-adapters/appc-ssh-adapter/pom.xml b/appc-adapters/appc-ssh-adapter/pom.xml index 2a56b270e..03133b577 100644 --- a/appc-adapters/appc-ssh-adapter/pom.xml +++ b/appc-adapters/appc-ssh-adapter/pom.xml @@ -24,7 +24,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc 4.0.0 diff --git a/appc-adapters/pom.xml b/appc-adapters/pom.xml index 960003266..ee88e66f7 100644 --- a/appc-adapters/pom.xml +++ b/appc-adapters/pom.xml @@ -1,3 +1,4 @@ + - - 4.0.0 - - appc-java-client - org.onap.appc.client - 1.6.2-SNAPSHOT - - - client-kit - - - - ${project.parent.parent.basedir} - - - - - - org.onap.appc.client - code-generator - ${project.parent.version} - - - org.onap.appc - appc-provider-model - ${project.parent.version} - - - - - code-generate-json - - generate-sources - - - META-INF/yang/appc-provider-lcm@2016-01-08.yang - target/generated-sources/appc-provider-lcm/appc-provider-lcm.json - templates/open-api/yang-to-open-api.ftl - org.onap.appc.tools.generator.extensions.YangContextBuilderImpl - - APPC - - - - code-generate-java - - generate-sources - - - target/generated-sources/appc-provider-lcm/appc-provider-lcm.json - target/generated-sources/appc-provider-lcm/output.txt - templates/client-kit/open-api-to-java.ftl - org.onap.appc.tools.generator.extensions.JsonContextBuilderImpl - configuration/client-kit.properties - - - - - - - - - - org.onap.appc.client - client-lib - ${project.parent.version} - - - org.opendaylight.yangtools - yang-parser-impl - ${yang.parser.impl.version} - test - - - - + + + + 4.0.0 + + appc-java-client + org.onap.appc.client + 1.6.2-SNAPSHOT + + + client-kit + + + + ${project.parent.parent.basedir} + + + + + + org.onap.appc.client + code-generator + ${project.parent.version} + + + org.onap.appc + appc-provider-model + ${project.parent.version} + + + + + code-generate-json + + generate-sources + + + META-INF/yang/appc-provider-lcm@2016-01-08.yang + target/generated-sources/appc-provider-lcm/appc-provider-lcm.json + templates/open-api/yang-to-open-api.ftl + org.onap.appc.tools.generator.extensions.YangContextBuilderImpl + + APPC + + + + code-generate-java + + generate-sources + + + target/generated-sources/appc-provider-lcm/appc-provider-lcm.json + target/generated-sources/appc-provider-lcm/output.txt + templates/client-kit/open-api-to-java.ftl + org.onap.appc.tools.generator.extensions.JsonContextBuilderImpl + configuration/client-kit.properties + + + + + + + + + + org.onap.appc.client + client-lib + ${project.parent.version} + + + org.opendaylight.yangtools + yang-parser-impl + ${yang.parser.impl.version} + test + + + + diff --git a/appc-client/client-lib/pom.xml b/appc-client/client-lib/pom.xml index 9d58a4ed5..8a42fd9ee 100644 --- a/appc-client/client-lib/pom.xml +++ b/appc-client/client-lib/pom.xml @@ -1,85 +1,85 @@ - - - - 4.0.0 - - appc-java-client - org.onap.appc.client - 1.6.2-SNAPSHOT - - - client-lib - - ${project.parent.parent.basedir} - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.att.nsa - cambriaClient - - - httpclient - org.apache.httpcomponents - - - - - org.apache.httpcomponents - httpclient - 4.5.3 - - - com.att.eelf - eelf-core - - - org.mockito - mockito-core - - - - - org.mockito - mockito-core - 1.10.19 - test - - - + + + + 4.0.0 + + appc-java-client + org.onap.appc.client + 1.6.2-SNAPSHOT + + + client-lib + + ${project.parent.parent.basedir} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.att.nsa + cambriaClient + + + httpclient + org.apache.httpcomponents + + + + + org.apache.httpcomponents + httpclient + 4.5.3 + + + com.att.eelf + eelf-core + + + org.mockito + mockito-core + + + + + org.mockito + mockito-core + 1.10.19 + test + + + diff --git a/appc-client/client-simulator/pom.xml b/appc-client/client-simulator/pom.xml index c3e82c3bc..e5feebb48 100644 --- a/appc-client/client-simulator/pom.xml +++ b/appc-client/client-simulator/pom.xml @@ -21,8 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 appc-java-client diff --git a/appc-client/code-generator/pom.xml b/appc-client/code-generator/pom.xml index d25bdac98..c1f69c188 100644 --- a/appc-client/code-generator/pom.xml +++ b/appc-client/code-generator/pom.xml @@ -1,138 +1,138 @@ - - - - 4.0.0 - - appc-java-client - org.onap.appc.client - 1.6.2-SNAPSHOT - - - code-generator - code-generator - APPC client code generator - maven-plugin - - - ${project.parent.parent.basedir} - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-plugin-plugin - ${maven.plugin.plugin.version} - - code-generator - UTF-8 - - - - default-descriptor - - descriptor - - process-classes - - - help-descriptor - - helpmojo - - process-classes - - - - - - - - org.opendaylight.yangtools - yang-parser-impl - ${yang.parser.impl.version} - - - org.opendaylight.controller - sal-core-api - ${sal.core.api.version} - - - org.opendaylight.yangtools - yang-model-api - ${yang.parser.impl.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven.plugin.annotations.version} - - - org.apache.maven - maven-plugin-api - ${maven.plugin.api.version} - - - org.apache.maven - maven-core - ${maven.core.version} - - - org.codehaus.plexus - plexus-utils - - - - - org.codehaus.plexus - plexus-utils - 3.0.24 - - - - junit - junit - test - - - + + + + 4.0.0 + + appc-java-client + org.onap.appc.client + 1.6.2-SNAPSHOT + + + code-generator + code-generator + APPC client code generator + maven-plugin + + + ${project.parent.parent.basedir} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + org.apache.maven.plugins + maven-plugin-plugin + ${maven.plugin.plugin.version} + + code-generator + UTF-8 + + + + default-descriptor + + descriptor + + process-classes + + + help-descriptor + + helpmojo + + process-classes + + + + + + + + org.opendaylight.yangtools + yang-parser-impl + ${yang.parser.impl.version} + + + org.opendaylight.controller + sal-core-api + ${sal.core.api.version} + + + org.opendaylight.yangtools + yang-model-api + ${yang.parser.impl.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + org.freemarker + freemarker + ${freemarker.version} + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${maven.plugin.annotations.version} + + + org.apache.maven + maven-plugin-api + ${maven.plugin.api.version} + + + org.apache.maven + maven-core + ${maven.core.version} + + + org.codehaus.plexus + plexus-utils + + + + + org.codehaus.plexus + plexus-utils + 3.0.24 + + + + junit + junit + test + + + diff --git a/appc-client/pom.xml b/appc-client/pom.xml index 0cde5e99c..4a6f8ced3 100644 --- a/appc-client/pom.xml +++ b/appc-client/pom.xml @@ -22,8 +22,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 @@ -137,7 +136,7 @@ org.apache.maven.scm maven-scm-provider-jgit - ${maven.scm.provers.jgit.version> + ${maven.scm.provers.jgit.version> diff --git a/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml index efd0ab5e9..f1e0e39f2 100644 --- a/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml +++ b/appc-config/appc-config-adaptor/features/features-appc-config-adaptor/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml index 682bcdb61..ccfed2e70 100644 --- a/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml +++ b/appc-config/appc-config-adaptor/features/onap-appc-config-adaptor/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-adaptor/features/pom.xml b/appc-config/appc-config-adaptor/features/pom.xml index 225c76222..8ea22dee8 100644 --- a/appc-config/appc-config-adaptor/features/pom.xml +++ b/appc-config/appc-config-adaptor/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-adaptor diff --git a/appc-config/appc-config-adaptor/installer/pom.xml b/appc-config/appc-config-adaptor/installer/pom.xml index cc2313a34..cac65cc77 100644 --- a/appc-config/appc-config-adaptor/installer/pom.xml +++ b/appc-config/appc-config-adaptor/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh index 6402f6c32..2d6113c04 100755 --- a/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-config-adaptor/pom.xml b/appc-config/appc-config-adaptor/pom.xml index b1506cd84..eaf2f2b1b 100644 --- a/appc-config/appc-config-adaptor/pom.xml +++ b/appc-config/appc-config-adaptor/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-adaptor/provider/pom.xml b/appc-config/appc-config-adaptor/provider/pom.xml index e359cff8b..32e2c0981 100644 --- a/appc-config/appc-config-adaptor/provider/pom.xml +++ b/appc-config/appc-config-adaptor/provider/pom.xml @@ -21,16 +21,14 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml b/appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml index 08f367fa2..f7715c42d 100644 --- a/appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml +++ b/appc-config/appc-config-audit/features/features-appc-config-audit/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml b/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml index cddadec7a..39ea9d1c6 100644 --- a/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml +++ b/appc-config/appc-config-audit/features/onap-appc-config-audit/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-audit/features/pom.xml b/appc-config/appc-config-audit/features/pom.xml index 8e9d04904..1f5c0f5e3 100644 --- a/appc-config/appc-config-audit/features/pom.xml +++ b/appc-config/appc-config-audit/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-audit diff --git a/appc-config/appc-config-audit/installer/pom.xml b/appc-config/appc-config-audit/installer/pom.xml index a940b3356..ede9f3165 100644 --- a/appc-config/appc-config-audit/installer/pom.xml +++ b/appc-config/appc-config-audit/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-audit/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-config-audit/installer/src/main/resources/scripts/install-feature.sh index 06e8f20d3..e7eb9b5ed 100755 --- a/appc-config/appc-config-audit/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-config-audit/installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-config-audit/pom.xml b/appc-config/appc-config-audit/pom.xml index 231b63ef7..4ba0a4f3c 100644 --- a/appc-config/appc-config-audit/pom.xml +++ b/appc-config/appc-config-audit/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-audit/provider/pom.xml b/appc-config/appc-config-audit/provider/pom.xml index 3c18b247a..32d7d5627 100644 --- a/appc-config/appc-config-audit/provider/pom.xml +++ b/appc-config/appc-config-audit/provider/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-config-audit-provider diff --git a/appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml b/appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml index 5b9ef39cd..7ce43753b 100644 --- a/appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml +++ b/appc-config/appc-config-generator/features/features-appc-config-generator/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml b/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml index 91eeea978..dd3168202 100644 --- a/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml +++ b/appc-config/appc-config-generator/features/onap-appc-config-generator/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-generator/features/pom.xml b/appc-config/appc-config-generator/features/pom.xml index e503a7125..b9d919715 100644 --- a/appc-config/appc-config-generator/features/pom.xml +++ b/appc-config/appc-config-generator/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-generator diff --git a/appc-config/appc-config-generator/installer/pom.xml b/appc-config/appc-config-generator/installer/pom.xml index 93a41f52e..b53321334 100644 --- a/appc-config/appc-config-generator/installer/pom.xml +++ b/appc-config/appc-config-generator/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh index 06e8f20d3..e7eb9b5ed 100755 --- a/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-config-generator/installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-config-generator/pom.xml b/appc-config/appc-config-generator/pom.xml index ce2af5a9f..c8af7ee6a 100644 --- a/appc-config/appc-config-generator/pom.xml +++ b/appc-config/appc-config-generator/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc 4.0.0 diff --git a/appc-config/appc-config-generator/provider/pom.xml b/appc-config/appc-config-generator/provider/pom.xml index 8bfe437e2..37974f71a 100644 --- a/appc-config/appc-config-generator/provider/pom.xml +++ b/appc-config/appc-config-generator/provider/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-config-generator-provider diff --git a/appc-config/appc-config-params/features/features-appc-config-params/pom.xml b/appc-config/appc-config-params/features/features-appc-config-params/pom.xml index e68fe4049..8a222206f 100644 --- a/appc-config/appc-config-params/features/features-appc-config-params/pom.xml +++ b/appc-config/appc-config-params/features/features-appc-config-params/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml index 9741eb491..2269e8748 100644 --- a/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml +++ b/appc-config/appc-config-params/features/onap-appc-config-params/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-config-params/features/pom.xml b/appc-config/appc-config-params/features/pom.xml index be70792ae..517359ed9 100644 --- a/appc-config/appc-config-params/features/pom.xml +++ b/appc-config/appc-config-params/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-params diff --git a/appc-config/appc-config-params/installer/pom.xml b/appc-config/appc-config-params/installer/pom.xml index 67d93d132..c60df748c 100644 --- a/appc-config/appc-config-params/installer/pom.xml +++ b/appc-config/appc-config-params/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-params/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-config-params/installer/src/main/resources/scripts/install-feature.sh index 6402f6c32..2d6113c04 100755 --- a/appc-config/appc-config-params/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-config-params/installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-config-params/pom.xml b/appc-config/appc-config-params/pom.xml index 2ea7397ca..d0ecd2f35 100644 --- a/appc-config/appc-config-params/pom.xml +++ b/appc-config/appc-config-params/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-config-params/provider/pom.xml b/appc-config/appc-config-params/provider/pom.xml index d60b65088..6d4ebf8f4 100644 --- a/appc-config/appc-config-params/provider/pom.xml +++ b/appc-config/appc-config-params/provider/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-config-params-provider diff --git a/appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml b/appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml index feafeab87..40028caa7 100644 --- a/appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml +++ b/appc-config/appc-data-services/features/features-appc-config-data-services/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml b/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml index 4a19743d7..791688924 100644 --- a/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml +++ b/appc-config/appc-data-services/features/onap-appc-config-data-services/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-data-services/features/pom.xml b/appc-config/appc-data-services/features/pom.xml index bed277e1b..5e18c06ae 100644 --- a/appc-config/appc-data-services/features/pom.xml +++ b/appc-config/appc-data-services/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-data-services diff --git a/appc-config/appc-data-services/installer/pom.xml b/appc-config/appc-data-services/installer/pom.xml index de761dd76..815695b5f 100644 --- a/appc-config/appc-data-services/installer/pom.xml +++ b/appc-config/appc-data-services/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh index 0e5496c54..d2093df23 100755 --- a/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-data-services/installer/src/main/resources/scripts/install-feature.sh @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-data-services/pom.xml b/appc-config/appc-data-services/pom.xml index 6a3095c70..7beef4901 100644 --- a/appc-config/appc-data-services/pom.xml +++ b/appc-config/appc-data-services/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-data-services/provider/pom.xml b/appc-config/appc-data-services/provider/pom.xml index c894651bc..f5125e707 100644 --- a/appc-config/appc-data-services/provider/pom.xml +++ b/appc-config/appc-data-services/provider/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-config-data-services-provider diff --git a/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml index 51e08db98..f6df30f0e 100644 --- a/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml +++ b/appc-config/appc-encryption-tool/features/features-appc-config-encryption-tool/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml index 1790689e3..548845def 100644 --- a/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml +++ b/appc-config/appc-encryption-tool/features/onap-appc-config-encryption-tool/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-encryption-tool/features/pom.xml b/appc-config/appc-encryption-tool/features/pom.xml index 448ead342..5a9f58746 100644 --- a/appc-config/appc-encryption-tool/features/pom.xml +++ b/appc-config/appc-encryption-tool/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-encryption-tool diff --git a/appc-config/appc-encryption-tool/installer/pom.xml b/appc-config/appc-encryption-tool/installer/pom.xml index b271bd504..6dabd68e5 100644 --- a/appc-config/appc-encryption-tool/installer/pom.xml +++ b/appc-config/appc-encryption-tool/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh index a42126ee2..55584589f 100755 --- a/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-encryption-tool/installer/src/main/resources/scripts/install-feature.sh @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-encryption-tool/pom.xml b/appc-config/appc-encryption-tool/pom.xml index 76f55729c..2ce9ac7c0 100644 --- a/appc-config/appc-encryption-tool/pom.xml +++ b/appc-config/appc-encryption-tool/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-encryption-tool/provider/pom.xml b/appc-config/appc-encryption-tool/provider/pom.xml index 1c8aefc73..6af583e8c 100644 --- a/appc-config/appc-encryption-tool/provider/pom.xml +++ b/appc-config/appc-encryption-tool/provider/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-config-encryption-tool-provider diff --git a/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml b/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml index 0cfebe33b..1c17ecdcd 100644 --- a/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml +++ b/appc-config/appc-flow-controller/features/features-appc-config-flow-controller/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml index 5573ab760..65651d2e5 100644 --- a/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml +++ b/appc-config/appc-flow-controller/features/onap-appc-config-flow-controller/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-config/appc-flow-controller/features/pom.xml b/appc-config/appc-flow-controller/features/pom.xml index 0444b2b27..a0c6c48ca 100644 --- a/appc-config/appc-flow-controller/features/pom.xml +++ b/appc-config/appc-flow-controller/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-config-flow-controller diff --git a/appc-config/appc-flow-controller/installer/pom.xml b/appc-config/appc-flow-controller/installer/pom.xml index 99e9158e3..32ff33bcb 100644 --- a/appc-config/appc-flow-controller/installer/pom.xml +++ b/appc-config/appc-flow-controller/installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh index 0e5496c54..d2093df23 100755 --- a/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-config/appc-flow-controller/pom.xml b/appc-config/appc-flow-controller/pom.xml index 9197879df..44826f2a4 100644 --- a/appc-config/appc-flow-controller/pom.xml +++ b/appc-config/appc-flow-controller/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 7ec608788..25cc4737a 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-config-flow-controller-provider diff --git a/appc-config/pom.xml b/appc-config/pom.xml index 0ff44d01a..5746d908e 100644 --- a/appc-config/pom.xml +++ b/appc-config/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc diff --git a/appc-core/appc-common-bundle/pom.xml b/appc-core/appc-common-bundle/pom.xml index 6497b43d4..62b24ce03 100644 --- a/appc-core/appc-common-bundle/pom.xml +++ b/appc-core/appc-common-bundle/pom.xml @@ -1,186 +1,188 @@ - - 4.0.0 - - org.onap.appc.parent - binding-parent - 2.7.0-SNAPSHOT - - - org.onap.appc - appc-common-bundle - bundle - - - - - ch.qos.logback - logback-classic - ${logback.version} - - - com.att.eelf - eelf-core - - - ch.qos.logback - logback-classic - - - - - org.slf4j - slf4j-api - provided - - - - - - org.apache.servicemix.bundles - org.apache.servicemix.bundles.jasypt - 1.9.2_1 - - - - - org.apache.commons - commons-lang3 - - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - - - org.onap.ccsdk.sli.core - dblib-provider - provided - - - equinoxSDK381 - org.eclipse.osgi - - - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.powermock - powermock-reflect - test - - - org.powermock - powermock-module-junit4 - test - - - org.powermock - powermock-api-mockito - test - - - - - - - com.att.eelf - eelf-maven-plugin - 1.0.0 - - - validation - install - - ValidateApplicationMsgs - - - - - org.onap.appc.i18n.Msg - - - - - - generate - install - - WikiMsgGenerator - - - target/messages - messages.html - - - org.onap.appc.i18n.Msg -

]]>
- - - - - - - - org.onap.appc - appc-common-bundle - ${project.version} - - - - - - org.apache.felix - maven-bundle-plugin - true - - - appc-common-bundle - org.onap.appc.*, com.att.eelf.* - eelf-core - true - - - - - - 1.7.0-SNAPSHOT - + + + + 4.0.0 + + org.onap.appc.parent + binding-parent + 2.7.0-SNAPSHOT + + + org.onap.appc + appc-common-bundle + bundle + + + + + ch.qos.logback + logback-classic + ${logback.version} + + + com.att.eelf + eelf-core + + + ch.qos.logback + logback-classic + + + + + org.slf4j + slf4j-api + provided + + + + + + org.apache.servicemix.bundles + org.apache.servicemix.bundles.jasypt + 1.9.2_1 + + + + + org.apache.commons + commons-lang3 + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + + + org.onap.ccsdk.sli.core + dblib-provider + provided + + + equinoxSDK381 + org.eclipse.osgi + + + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.powermock + powermock-reflect + test + + + org.powermock + powermock-module-junit4 + test + + + org.powermock + powermock-api-mockito + test + + + + + + + com.att.eelf + eelf-maven-plugin + 1.0.0 + + + validation + install + + ValidateApplicationMsgs + + + + + org.onap.appc.i18n.Msg + + + + + + generate + install + + WikiMsgGenerator + + + target/messages + messages.html + + + org.onap.appc.i18n.Msg +
<p> <ac:macro ac:name="toc" /> </p>
+ + + + + + + + org.onap.appc + appc-common-bundle + ${project.version} + + + + + + org.apache.felix + maven-bundle-plugin + true + + + appc-common-bundle + org.onap.appc.*, com.att.eelf.* + eelf-core + true + + + + + + 1.7.0-SNAPSHOT + diff --git a/appc-core/appc-core-features/onap-appc-common/pom.xml b/appc-core/appc-core-features/onap-appc-common/pom.xml index 7c70fb476..ae7fd1b4e 100644 --- a/appc-core/appc-core-features/onap-appc-common/pom.xml +++ b/appc-core/appc-core-features/onap-appc-common/pom.xml @@ -1,49 +1,50 @@ - - - 4.0.0 - - org.onap.appc.parent - single-feature-parent - 2.7.0-SNAPSHOT - - - - org.onap.appc - onap-appc-common - feature - - - - org.onap.appc - appc-common-bundle - ${project.version} - - - - org.onap.ccsdk.sli.core - ccsdk-dblib - ${ccsdk.sli.core.version} - xml - features - - - 1.7.0-SNAPSHOT - \ No newline at end of file + + + + 4.0.0 + + org.onap.appc.parent + single-feature-parent + 2.7.0-SNAPSHOT + + + + org.onap.appc + onap-appc-common + feature + + + + org.onap.appc + appc-common-bundle + ${project.version} + + + + org.onap.ccsdk.sli.core + ccsdk-dblib + ${ccsdk.sli.core.version} + xml + features + + + 1.7.0-SNAPSHOT + diff --git a/appc-core/appc-core-features/onap-appc-core/pom.xml b/appc-core/appc-core-features/onap-appc-core/pom.xml index ec2905086..6867e84dc 100644 --- a/appc-core/appc-core-features/onap-appc-core/pom.xml +++ b/appc-core/appc-core-features/onap-appc-core/pom.xml @@ -1,43 +1,44 @@ - - - 4.0.0 - - org.onap.appc.parent - single-feature-parent - 2.7.0-SNAPSHOT - - - - org.onap.appc - onap-appc-core - feature - - - - org.onap.appc - onap-appc-common - ${project.version} - xml - features - - - 1.7.0-SNAPSHOT - \ No newline at end of file + + + + 4.0.0 + + org.onap.appc.parent + single-feature-parent + 2.7.0-SNAPSHOT + + + + org.onap.appc + onap-appc-core + feature + + + + org.onap.appc + onap-appc-common + ${project.version} + xml + features + + + 1.7.0-SNAPSHOT + diff --git a/appc-core/appc-core-features/pom.xml b/appc-core/appc-core-features/pom.xml index b4d9a4ece..0586a666c 100644 --- a/appc-core/appc-core-features/pom.xml +++ b/appc-core/appc-core-features/pom.xml @@ -1,37 +1,37 @@ - - - - 4.0.0 - - org.onap.appc.parent - odlparent-lite - 2.7.0-SNAPSHOT - - - org.onap.appc - appc-core-features - pom - - onap-appc-common - onap-appc-core - - 1.7.0-SNAPSHOT - \ No newline at end of file + + + + 4.0.0 + + org.onap.appc.parent + odlparent-lite + 2.7.0-SNAPSHOT + + + org.onap.appc + appc-core-features + pom + + onap-appc-common + onap-appc-core + + 1.7.0-SNAPSHOT + diff --git a/appc-core/appc-core-installer/pom.xml b/appc-core/appc-core-installer/pom.xml index 1fe9c9cc2..0831712dc 100644 --- a/appc-core/appc-core-installer/pom.xml +++ b/appc-core/appc-core-installer/pom.xml @@ -1,144 +1,145 @@ - - - 4.0.0 - - org.onap.appc - appc-core - 1.7.0-SNAPSHOT - - appc-core-installer - pom - - - appc-core - appc-core - - - mvn:org.onap.appc/onap-appc-core/${project.version}/xml/features - mvn:org.onap.appc/onap-appc-common/${project.version}/xml/features - - - - org.onap.appc - onap-appc-common - ${project.version} - xml - features - - - org.onap.appc - onap-appc-core - ${project.version} - xml - features - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - false - false - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - - - - installer-zip - - single - - package - - false - true - ${application.name}-${project.version} - - src/assembly/assemble_installer_zip.xml - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.opendaylight - provided - - - - - - maven-resources-plugin - - - copy-version - - copy-resources - - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - - - - - - 1.7.0-SNAPSHOT - \ No newline at end of file + + + + 4.0.0 + + org.onap.appc + appc-core + 1.7.0-SNAPSHOT + + appc-core-installer + pom + + + appc-core + appc-core + + + mvn:org.onap.appc/onap-appc-core/${project.version}/xml/features + mvn:org.onap.appc/onap-appc-common/${project.version}/xml/features + + + + org.onap.appc + onap-appc-common + ${project.version} + xml + features + + + org.onap.appc + onap-appc-core + ${project.version} + xml + features + + + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + false + false + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + + + + installer-zip + + single + + package + + false + true + ${application.name}-${project.version} + + src/assembly/assemble_installer_zip.xml + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/assembly/system + false + true + true + true + false + false + org.opendaylight + provided + + + + + + maven-resources-plugin + + + copy-version + + copy-resources + + + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + + + + + + 1.7.0-SNAPSHOT + diff --git a/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh b/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh index 229fcc091..edf2c017c 100755 --- a/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-core/appc-core-installer/src/main/resources/scripts/install-feature.sh @@ -36,8 +36,12 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.common} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.core} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.common}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.core}" + +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.common} + +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.core} #COUNT=0 diff --git a/appc-core/pom.xml b/appc-core/pom.xml index 55b4b2dba..15091e5dd 100644 --- a/appc-core/pom.xml +++ b/appc-core/pom.xml @@ -1,37 +1,38 @@ - - - 4.0.0 - - org.onap.appc.parent - odlparent-lite - 2.7.0-SNAPSHOT - - - org.onap.appc - appc-core - pom - - appc-common-bundle - appc-core-features - appc-core-installer - - 1.7.0-SNAPSHOT - \ No newline at end of file + + + + 4.0.0 + + org.onap.appc.parent + odlparent-lite + 2.7.0-SNAPSHOT + + + org.onap.appc + appc-core + pom + + appc-common-bundle + appc-core-features + appc-core-installer + + 1.7.0-SNAPSHOT + diff --git a/appc-dg-util/appc-dg-util-bundle/pom.xml b/appc-dg-util/appc-dg-util-bundle/pom.xml index 69448c16b..f59079a57 100644 --- a/appc-dg-util/appc-dg-util-bundle/pom.xml +++ b/appc-dg-util/appc-dg-util-bundle/pom.xml @@ -21,14 +21,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-dg-util-bundle 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 index 817e2049e..f11dd4eb8 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index 977d4c92c..20e46b795 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dg-util/appc-dg-util-features/pom.xml b/appc-dg-util/appc-dg-util-features/pom.xml index 62102b43a..fad6d88f5 100644 --- a/appc-dg-util/appc-dg-util-features/pom.xml +++ b/appc-dg-util/appc-dg-util-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-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 8363714d7..8bbf5f405 100644 --- a/appc-dg-util/appc-dg-util-installer/pom.xml +++ b/appc-dg-util/appc-dg-util-installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-dg-util-installer APPC DG Util - Karaf Installer diff --git a/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh b/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh index 836910190..f5d3d28e7 100755 --- a/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-dg-util/appc-dg-util-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-dg-util/pom.xml b/appc-dg-util/pom.xml index 54bd98022..1b242efa8 100644 --- a/appc-dg-util/pom.xml +++ b/appc-dg-util/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc 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 f8c71aa33..dcf7bf843 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 @@ -1,4 +1,4 @@ - + - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -93,13 +92,11 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + org.opendaylight.controller yang-jmx-generator-plugin 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 03c0f6493..cb50b9b31 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 @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-dg-mdsal-store 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 9302d20bf..ecfbee6a6 100644 --- a/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-netconf/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-dg-netconf 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 index 88b0fd57a..ddb9e24b4 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index 99b0e3e65..5a2d25e42 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 951da62c2..93164c4ac 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-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 988eaa449..2384c1dc9 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 @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-dg-shared-installer diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh index 836910190..f5d3d28e7 100755 --- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 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 28bab1709..aed8ef21b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml +++ b/appc-dg/appc-dg-shared/appc-dg-ssh/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-dg-ssh diff --git a/appc-dg/appc-dg-shared/pom.xml b/appc-dg/appc-dg-shared/pom.xml index d23294faa..8cbac7848 100644 --- a/appc-dg/appc-dg-shared/pom.xml +++ b/appc-dg/appc-dg-shared/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-dg-shared pom diff --git a/appc-directed-graph/appc-dgraph/pom.xml b/appc-directed-graph/appc-dgraph/pom.xml index 0f23bf8f3..011e15d6b 100644 --- a/appc-directed-graph/appc-dgraph/pom.xml +++ b/appc-directed-graph/appc-dgraph/pom.xml @@ -21,10 +21,7 @@ ============LICENSE_END========================================================= --> - - + org.onap.appc appc-directed-graph diff --git a/appc-directed-graph/appc-dgraph/provider/pom.xml b/appc-directed-graph/appc-dgraph/provider/pom.xml index 3850332b9..7b040aca0 100644 --- a/appc-directed-graph/appc-dgraph/provider/pom.xml +++ b/appc-directed-graph/appc-dgraph/provider/pom.xml @@ -19,8 +19,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-directed-graph/dg-loader/features/pom.xml b/appc-directed-graph/dg-loader/features/pom.xml index 9a7f08195..abf78d571 100644 --- a/appc-directed-graph/dg-loader/features/pom.xml +++ b/appc-directed-graph/dg-loader/features/pom.xml @@ -19,8 +19,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.plugins diff --git a/appc-directed-graph/dg-loader/pom.xml b/appc-directed-graph/dg-loader/pom.xml index 9a3f6ebf2..cb21e2e8d 100644 --- a/appc-directed-graph/dg-loader/pom.xml +++ b/appc-directed-graph/dg-loader/pom.xml @@ -21,8 +21,7 @@ ============LICENSE_END========================================================= --> - + org.onap.appc diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml index d08ccf4b1..11a146bf0 100644 --- a/appc-directed-graph/dg-loader/provider/pom.xml +++ b/appc-directed-graph/dg-loader/provider/pom.xml @@ -21,8 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.plugins diff --git a/appc-directed-graph/pom.xml b/appc-directed-graph/pom.xml index 2f6240ad4..640283be8 100644 --- a/appc-directed-graph/pom.xml +++ b/appc-directed-graph/pom.xml @@ -1,3 +1,4 @@ + - - + 4.0.0 diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml index ff9176559..f8678a584 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-api/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-command-executor-api diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml index 6c9ac448f..7b8a7e1a7 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-core/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-command-executor-core diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/pom.xml index 96d7eb15d..b79ed2308 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/features-appc-command-executor/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml index 9118473b6..ff4964bc9 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/onap-appc-command-executor/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml index 5fa42e247..69e5a085b 100644 --- a/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml +++ b/appc-dispatcher/appc-command-executor/appc-command-executor-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-command-executor diff --git a/appc-dispatcher/appc-command-executor/pom.xml b/appc-dispatcher/appc-command-executor/pom.xml index 2f8ed1759..46b6f551e 100644 --- a/appc-dispatcher/appc-command-executor/pom.xml +++ b/appc-dispatcher/appc-command-executor/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-command-executor diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml index 4f6f5cd3a..ae3f1b3e1 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/pom.xml @@ -21,8 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml index a19b4a6ac..c5071f8c0 100644 --- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml index aa3808431..5c9e2c8bb 100644 --- a/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml index 3e5334c0b..5dda197b1 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-api/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 lock-manager-lib diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml index 52f8f3e3a..c77ce9837 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-features/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 lock-manager-lib diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml index 31be79e8a..2d97bace6 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/lock-manager-impl/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 lock-manager-lib diff --git a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml index a0ceca6bf..70b48bee5 100644 --- a/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/lock-manager-lib/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 appc-dispatcher-common diff --git a/appc-dispatcher/appc-dispatcher-common/pom.xml b/appc-dispatcher/appc-dispatcher-common/pom.xml index 51031c050..24e5600eb 100644 --- a/appc-dispatcher/appc-dispatcher-common/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml index 50fb55f22..bce357f67 100644 --- a/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/ranking-framework-lib/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml index dd1f99b90..0cfefaa77 100644 --- a/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml +++ b/appc-dispatcher/appc-dispatcher-common/transaction-recorder/pom.xml @@ -21,8 +21,7 @@ ============LICENSE_END========================================================= --> - + appc-dispatcher-common org.onap.appc diff --git a/appc-dispatcher/appc-dispatcher-features/pom.xml b/appc-dispatcher/appc-dispatcher-features/pom.xml index ec5dd4e47..c7aad9fba 100644 --- a/appc-dispatcher/appc-dispatcher-features/pom.xml +++ b/appc-dispatcher/appc-dispatcher-features/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 appc-dispatcher diff --git a/appc-dispatcher/appc-dispatcher-installer/pom.xml b/appc-dispatcher/appc-dispatcher-installer/pom.xml index 7b8a7487b..754bbcf9a 100644 --- a/appc-dispatcher/appc-dispatcher-installer/pom.xml +++ b/appc-dispatcher/appc-dispatcher-installer/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 appc-dispatcher @@ -187,6 +185,7 @@ maven-resources-plugin + 3.1.0 copy-version diff --git a/appc-dispatcher/appc-dispatcher-installer/src/main/resources/scripts/install-feature.sh b/appc-dispatcher/appc-dispatcher-installer/src/main/resources/scripts/install-feature.sh index dd474f896..7ec315f28 100755 --- a/appc-dispatcher/appc-dispatcher-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-dispatcher/appc-dispatcher-installer/src/main/resources/scripts/install-feature.sh @@ -38,17 +38,23 @@ fi # ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -# INSTALLING ODL FEATURES SEPARATELY--> -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.dispatcher} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.requestHandler} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.commandExecutor} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.lifecycleManagement} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.licenseManager} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.workflowManagement} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.lockManager} -# INSTALLING appc-license-manager first since it's a dependency on other features -#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install -r ${features.boot.licenseManager} +# INSTALLING ODL FEATURES SEPARATELY--> +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.dispatcher} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.requestHandler} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.commandExecutor} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.lifecycleManagement} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.licenseManager} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.workflowManagement} +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repo.lockManager} +# INSTALLING ODL FEATURES SEPARATELY--> +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.dispatcher}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.requestHandler}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.commandExecutor}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.lifecycleManagement}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.licenseManager}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.workflowManagement}" +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repo.lockManager}" diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml index 44f165131..cdb0b01dd 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-license-manager-api org.onap.appc diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml index 6c50ede2b..d6761208a 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-license-manager-core diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml index 9679a46d8..a1320be6e 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/features-appc-license-manager/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml index 18c7068d3..fda0ddba2 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/onap-appc-license-manager/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml index 16b386a6a..846310d0a 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-license-manager diff --git a/appc-dispatcher/appc-license-manager/pom.xml b/appc-dispatcher/appc-license-manager/pom.xml index 05386d8a0..d4300801d 100644 --- a/appc-dispatcher/appc-license-manager/pom.xml +++ b/appc-dispatcher/appc-license-manager/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-license-manager diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml index 6c8330ac5..f31510c1b 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-api/pom.xml @@ -20,15 +20,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-request-handler-api diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml index 50bcb817c..6b23f4ec0 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-core/pom.xml @@ -20,16 +20,14 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-request-handler-core diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/pom.xml index 15120daab..217bc93ae 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/features-appc-request-handler/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml index 77993794d..23334889c 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/onap-appc-request-handler/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml index 3bb66033b..c01fcafa9 100644 --- a/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml +++ b/appc-dispatcher/appc-request-handler/appc-request-handler-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-request-handler diff --git a/appc-dispatcher/appc-request-handler/pom.xml b/appc-dispatcher/appc-request-handler/pom.xml index 439707e19..ac922ea30 100644 --- a/appc-dispatcher/appc-request-handler/pom.xml +++ b/appc-dispatcher/appc-request-handler/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-request-handler diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml index ee013026d..cb5c027b5 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-api/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-workflow-management-api diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml index dc0ab3d81..e43bffc90 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-core/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + appc-workflow-management-core diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/pom.xml index 42870c22f..57cda026e 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/features-appc-workflow-management/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml index 189a9a0ef..ef98ba558 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/onap-appc-workflow-management/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml index d225ac741..53cdd5527 100644 --- a/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml +++ b/appc-dispatcher/appc-workflow-management/appc-workflow-management-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-workflow-management diff --git a/appc-dispatcher/appc-workflow-management/pom.xml b/appc-dispatcher/appc-workflow-management/pom.xml index a16880079..a29a1ec09 100644 --- a/appc-dispatcher/appc-workflow-management/pom.xml +++ b/appc-dispatcher/appc-workflow-management/pom.xml @@ -21,15 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-workflow-management diff --git a/appc-dispatcher/pom.xml b/appc-dispatcher/pom.xml index a532b8c78..c076781e0 100644 --- a/appc-dispatcher/pom.xml +++ b/appc-dispatcher/pom.xml @@ -21,9 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc diff --git a/appc-event-listener/appc-event-listener-bundle/pom.xml b/appc-event-listener/appc-event-listener-bundle/pom.xml index b98006c47..18645b17a 100644 --- a/appc-event-listener/appc-event-listener-bundle/pom.xml +++ b/appc-event-listener/appc-event-listener-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-event-listener/appc-event-listener-features/features-appc-event-listener/pom.xml b/appc-event-listener/appc-event-listener-features/features-appc-event-listener/pom.xml index 55d2955d9..3a8b0e6d6 100644 --- a/appc-event-listener/appc-event-listener-features/features-appc-event-listener/pom.xml +++ b/appc-event-listener/appc-event-listener-features/features-appc-event-listener/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-event-listener/appc-event-listener-features/onap-appc-event-listener/pom.xml b/appc-event-listener/appc-event-listener-features/onap-appc-event-listener/pom.xml index c26132428..d8f4e42a0 100644 --- a/appc-event-listener/appc-event-listener-features/onap-appc-event-listener/pom.xml +++ b/appc-event-listener/appc-event-listener-features/onap-appc-event-listener/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-event-listener/appc-event-listener-features/pom.xml b/appc-event-listener/appc-event-listener-features/pom.xml index d24976e21..43ae0e6da 100644 --- a/appc-event-listener/appc-event-listener-features/pom.xml +++ b/appc-event-listener/appc-event-listener-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-event-listener diff --git a/appc-event-listener/appc-event-listener-installer/pom.xml b/appc-event-listener/appc-event-listener-installer/pom.xml index 3c9c263f3..ee1ed7eda 100644 --- a/appc-event-listener/appc-event-listener-installer/pom.xml +++ b/appc-event-listener/appc-event-listener-installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-event-listener-installer diff --git a/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh b/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh index 5814cea2a..c93ed44ea 100755 --- a/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-event-listener/appc-event-listener-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr + sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-event-listener/pom.xml b/appc-event-listener/pom.xml index f9699d6b4..3cb56da1d 100644 --- a/appc-event-listener/pom.xml +++ b/appc-event-listener/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc 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 index 1f869f541..185a8320e 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index 233581b80..25eb154db 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-inbound/appc-artifact-handler/features/pom.xml b/appc-inbound/appc-artifact-handler/features/pom.xml index cf4250da7..f07b594a8 100644 --- a/appc-inbound/appc-artifact-handler/features/pom.xml +++ b/appc-inbound/appc-artifact-handler/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-artifact-handler diff --git a/appc-inbound/appc-artifact-handler/installer/pom.xml b/appc-inbound/appc-artifact-handler/installer/pom.xml index 19521fed1..0abece1f5 100755 --- a/appc-inbound/appc-artifact-handler/installer/pom.xml +++ b/appc-inbound/appc-artifact-handler/installer/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-artifact-handler-installer 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 0e5496c54..d2093df23 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 @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 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 6402f6c32..2d6113c04 100755 --- 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 @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-inbound/appc-artifact-handler/model/pom.xml b/appc-inbound/appc-artifact-handler/model/pom.xml index 3b7a7ff80..3c0f2cdb3 100755 --- a/appc-inbound/appc-artifact-handler/model/pom.xml +++ b/appc-inbound/appc-artifact-handler/model/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-artifact-handler-model @@ -110,13 +109,11 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + 1.7.0-SNAPSHOT diff --git a/appc-inbound/appc-artifact-handler/pom.xml b/appc-inbound/appc-artifact-handler/pom.xml index d7fcc8d77..5070bf6f1 100755 --- a/appc-inbound/appc-artifact-handler/pom.xml +++ b/appc-inbound/appc-artifact-handler/pom.xml @@ -26,7 +26,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + pom diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml index 34a72f2d4..b48fdf789 100755 --- a/appc-inbound/appc-artifact-handler/provider/pom.xml +++ b/appc-inbound/appc-artifact-handler/provider/pom.xml @@ -21,14 +21,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-artifact-handler-provider 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 index 344d874f8..e714e427d 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index 4728b4d47..2aba2b25a 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-inbound/appc-design-services/features/pom.xml b/appc-inbound/appc-design-services/features/pom.xml index 7327308e6..578c3a8e7 100644 --- a/appc-inbound/appc-design-services/features/pom.xml +++ b/appc-inbound/appc-design-services/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-design-services diff --git a/appc-inbound/appc-design-services/installer/pom.xml b/appc-inbound/appc-design-services/installer/pom.xml index e31908ad3..881fbeec4 100755 --- a/appc-inbound/appc-design-services/installer/pom.xml +++ b/appc-inbound/appc-design-services/installer/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-design-services-installer 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 0e5496c54..d2093df23 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 @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 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 6402f6c32..2d6113c04 100755 --- 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 @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-inbound/appc-design-services/model/pom.xml b/appc-inbound/appc-design-services/model/pom.xml index 1a50d124d..a3a114799 100755 --- a/appc-inbound/appc-design-services/model/pom.xml +++ b/appc-inbound/appc-design-services/model/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-design-services-model @@ -146,7 +145,7 @@ - + @@ -166,13 +165,11 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + 1.7.0-SNAPSHOT diff --git a/appc-inbound/appc-design-services/pom.xml b/appc-inbound/appc-design-services/pom.xml index 7fe7b4a91..5c70a374a 100755 --- a/appc-inbound/appc-design-services/pom.xml +++ b/appc-inbound/appc-design-services/pom.xml @@ -26,7 +26,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + pom diff --git a/appc-inbound/appc-design-services/provider/pom.xml b/appc-inbound/appc-design-services/provider/pom.xml index 4ae666f38..5986bc9eb 100755 --- a/appc-inbound/appc-design-services/provider/pom.xml +++ b/appc-inbound/appc-design-services/provider/pom.xml @@ -20,14 +20,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-design-services-provider @@ -198,4 +197,3 @@ 1.7.0-SNAPSHOT - diff --git a/appc-inbound/appc-interfaces-service/bundle/pom.xml b/appc-inbound/appc-interfaces-service/bundle/pom.xml index 999761c40..dcb0b385a 100644 --- a/appc-inbound/appc-interfaces-service/bundle/pom.xml +++ b/appc-inbound/appc-interfaces-service/bundle/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-interfaces-service-bundle 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 index c83a4453a..e0228f040 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index 3917771ff..c75f0687a 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-inbound/appc-interfaces-service/features/pom.xml b/appc-inbound/appc-interfaces-service/features/pom.xml index 2ecbe4391..4d1e65b17 100644 --- a/appc-inbound/appc-interfaces-service/features/pom.xml +++ b/appc-inbound/appc-interfaces-service/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-interfaces-service diff --git a/appc-inbound/appc-interfaces-service/installer/pom.xml b/appc-inbound/appc-interfaces-service/installer/pom.xml index fc608e995..cb9fdaa54 100644 --- a/appc-inbound/appc-interfaces-service/installer/pom.xml +++ b/appc-inbound/appc-interfaces-service/installer/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-interfaces-service-installer 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 a42126ee2..55584589f 100755 --- a/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh +++ b/appc-inbound/appc-interfaces-service/installer/resources/scripts/install-feature.sh @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 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 06e8f20d3..e7eb9b5ed 100755 --- 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 @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-inbound/appc-interfaces-service/model/pom.xml b/appc-inbound/appc-interfaces-service/model/pom.xml index 7f2591ce5..a5da6121b 100644 --- a/appc-inbound/appc-interfaces-service/model/pom.xml +++ b/appc-inbound/appc-interfaces-service/model/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-interfaces-service-model @@ -146,7 +145,7 @@ - + @@ -166,13 +165,11 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + 1.7.0-SNAPSHOT diff --git a/appc-inbound/appc-interfaces-service/pom.xml b/appc-inbound/appc-interfaces-service/pom.xml index 50e4367f1..4dcdbcaf3 100644 --- a/appc-inbound/appc-interfaces-service/pom.xml +++ b/appc-inbound/appc-interfaces-service/pom.xml @@ -19,15 +19,14 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -103,7 +102,7 @@ - + diff --git a/appc-inbound/pom.xml b/appc-inbound/pom.xml index cbd303d3a..5a59f8ad3 100755 --- a/appc-inbound/pom.xml +++ b/appc-inbound/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc diff --git a/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml index 517899f82..23f32e16f 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml +++ b/appc-lifecycle-management/appc-lifecycle-management-api/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml index 2f708d619..326660371 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml +++ b/appc-lifecycle-management/appc-lifecycle-management-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-lifecycle-management diff --git a/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml b/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml index 2c3de2d04..da40f5ca0 100644 --- a/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml +++ b/appc-lifecycle-management/appc-lifecycle-management-installer/pom.xml @@ -25,7 +25,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + appc-lifecycle-management-installer diff --git a/appc-lifecycle-management/appc-lifecycle-management-installer/src/main/resources/scripts/install-feature.sh b/appc-lifecycle-management/appc-lifecycle-management-installer/src/main/resources/scripts/install-feature.sh index 98f24b842..7d059bde2 100755 --- a/appc-lifecycle-management/appc-lifecycle-management-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-lifecycle-management/appc-lifecycle-management-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-lifecycle-management/pom.xml b/appc-lifecycle-management/pom.xml index 230389752..5d5805d84 100644 --- a/appc-lifecycle-management/pom.xml +++ b/appc-lifecycle-management/pom.xml @@ -1,3 +1,4 @@ + - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + 4.0.0 diff --git a/appc-lifecycle-management/state-machine-lib/pom.xml b/appc-lifecycle-management/state-machine-lib/pom.xml index b1e3cef57..7b5f552d0 100644 --- a/appc-lifecycle-management/state-machine-lib/pom.xml +++ b/appc-lifecycle-management/state-machine-lib/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-metric/appc-metric-features/pom.xml b/appc-metric/appc-metric-features/pom.xml index 8e7d4ce41..f3d16e8f6 100644 --- a/appc-metric/appc-metric-features/pom.xml +++ b/appc-metric/appc-metric-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-metric diff --git a/appc-metric/appc-metric-installer/pom.xml b/appc-metric/appc-metric-installer/pom.xml index 48f8c27b9..ec2c303bb 100644 --- a/appc-metric/appc-metric-installer/pom.xml +++ b/appc-metric/appc-metric-installer/pom.xml @@ -25,7 +25,7 @@ odlparent-lite org.onap.appc.parent 2.7.0-SNAPSHOT - + org.onap.appc appc-metric-installer diff --git a/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh b/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh index 5d93a3dc9..47173eded 100755 --- a/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-metric/appc-metric-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-metric/pom.xml b/appc-metric/pom.xml index 05219970d..8147164c6 100644 --- a/appc-metric/pom.xml +++ b/appc-metric/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-oam-bundle diff --git a/appc-oam/appc-oam-features/features-appc-oam/pom.xml b/appc-oam/appc-oam-features/features-appc-oam/pom.xml index 46b5ed419..5a838d8cf 100644 --- a/appc-oam/appc-oam-features/features-appc-oam/pom.xml +++ b/appc-oam/appc-oam-features/features-appc-oam/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-oam/appc-oam-features/onap-appc-oam/pom.xml b/appc-oam/appc-oam-features/onap-appc-oam/pom.xml index b005fb85f..60ed80c9b 100644 --- a/appc-oam/appc-oam-features/onap-appc-oam/pom.xml +++ b/appc-oam/appc-oam-features/onap-appc-oam/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-oam/appc-oam-features/pom.xml b/appc-oam/appc-oam-features/pom.xml index 07fc12f49..7c2c86db1 100644 --- a/appc-oam/appc-oam-features/pom.xml +++ b/appc-oam/appc-oam-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-oam diff --git a/appc-oam/appc-oam-installer/pom.xml b/appc-oam/appc-oam-installer/pom.xml index eaa7b3766..3360b2f16 100644 --- a/appc-oam/appc-oam-installer/pom.xml +++ b/appc-oam/appc-oam-installer/pom.xml @@ -27,7 +27,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh index 47a6ea4dd..5c077e86b 100755 --- a/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-oam/appc-oam-installer/src/main/resources/scripts/install-feature.sh @@ -36,13 +36,10 @@ then fi -#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -# - - COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 @@ -50,15 +47,4 @@ while [ $COUNT -lt 10 ]; do let COUNT=10 fi let COUNT=COUNT+1 -done -COUNT=0 -while [ $COUNT -lt 10 ]; do - 2> /tmp/installErr - cat /tmp/installErr - if grep -q 'Failed to get the session' /tmp/installErr; then - sleep 10 - else - let COUNT=10 - fi - let COUNT=COUNT+1 -done +done \ No newline at end of file diff --git a/appc-oam/appc-oam-model/pom.xml b/appc-oam/appc-oam-model/pom.xml index 6bbb2c58c..e51c7dd99 100644 --- a/appc-oam/appc-oam-model/pom.xml +++ b/appc-oam/appc-oam-model/pom.xml @@ -21,14 +21,13 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-oam-model @@ -112,13 +111,11 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + 1.7.0-SNAPSHOT diff --git a/appc-oam/pom.xml b/appc-oam/pom.xml index a97287826..bf237f30c 100644 --- a/appc-oam/pom.xml +++ b/appc-oam/pom.xml @@ -27,7 +27,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-oam diff --git a/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml index 91a711a5b..bf31f318c 100644 --- a/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml +++ b/appc-outbound/appc-aai-client/features/features-appc-aai-client/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml index badb76440..8324ee59b 100644 --- a/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml +++ b/appc-outbound/appc-aai-client/features/onap-appc-aai-client/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-outbound/appc-aai-client/features/pom.xml b/appc-outbound/appc-aai-client/features/pom.xml index 940d9296a..f152649fe 100644 --- a/appc-outbound/appc-aai-client/features/pom.xml +++ b/appc-outbound/appc-aai-client/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-aai-client diff --git a/appc-outbound/appc-aai-client/installer/pom.xml b/appc-outbound/appc-aai-client/installer/pom.xml index 4386b2a1d..9313a9e11 100755 --- a/appc-outbound/appc-aai-client/installer/pom.xml +++ b/appc-outbound/appc-aai-client/installer/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-aai-client-installer diff --git a/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh b/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh index 6402f6c32..2d6113c04 100755 --- a/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-outbound/appc-aai-client/installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-outbound/appc-aai-client/pom.xml b/appc-outbound/appc-aai-client/pom.xml index 3da571025..097ca73b1 100755 --- a/appc-outbound/appc-aai-client/pom.xml +++ b/appc-outbound/appc-aai-client/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-outbound/appc-aai-client/provider/pom.xml b/appc-outbound/appc-aai-client/provider/pom.xml index 7a45c973c..33f58ba1c 100755 --- a/appc-outbound/appc-aai-client/provider/pom.xml +++ b/appc-outbound/appc-aai-client/provider/pom.xml @@ -20,14 +20,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-aai-client-provider 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 index 6315da758..ca67ec2f1 100644 --- 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 @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + 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 index 3d23c88a9..ba5c48325 100644 --- 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 @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-outbound/appc-network-inventory-client/features/pom.xml b/appc-outbound/appc-network-inventory-client/features/pom.xml index 918113908..54fcab391 100644 --- a/appc-outbound/appc-network-inventory-client/features/pom.xml +++ b/appc-outbound/appc-network-inventory-client/features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-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 8c51bb141..fb1d39c46 100755 --- a/appc-outbound/appc-network-inventory-client/installer/pom.xml +++ b/appc-outbound/appc-network-inventory-client/installer/pom.xml @@ -19,14 +19,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc APPC Network Inventory - Installer diff --git a/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh b/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh index 6402f6c32..2d6113c04 100755 --- a/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-outbound/appc-network-inventory-client/installer/src/main/resources/scripts/install-feature.sh @@ -36,5 +36,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-outbound/appc-network-inventory-client/pom.xml b/appc-outbound/appc-network-inventory-client/pom.xml index 99af67d87..165b4c2fb 100755 --- a/appc-outbound/appc-network-inventory-client/pom.xml +++ b/appc-outbound/appc-network-inventory-client/pom.xml @@ -19,13 +19,12 @@ limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-outbound/appc-network-inventory-client/provider/pom.xml b/appc-outbound/appc-network-inventory-client/provider/pom.xml index d8c480384..db803e533 100755 --- a/appc-outbound/appc-network-inventory-client/provider/pom.xml +++ b/appc-outbound/appc-network-inventory-client/provider/pom.xml @@ -1,144 +1,142 @@ - - - - 4.0.0 - - org.onap.appc.parent - binding-parent - 2.7.0-SNAPSHOT - - - org.onap.appc - - appc-network-inventory-client-provider - 1.7.0-SNAPSHOT - bundle - APPC Network Client - Provider - - - - - equinoxSDK381 - org.eclipse.osgi - - - commons-io - commons-io - - - ch.qos.logback - logback-classic - - - com.att.eelf - eelf-core - - - ch.qos.logback - logback-classic - - - - - org.glassfish.jersey.core - jersey-client - provided - - - junit - junit - test - - - org.powermock - powermock-api-mockito - test - - - org.powermock - powermock-module-junit4 - test - - - org.javassist - javassist - 3.22.0-GA - test - - - org.onap.appc - appc-config-params-provider - ${project.version} - - - org.onap.ccsdk.sli.core - sli-common - - - org.onap.ccsdk.sli.core - sli-provider - - - org.onap.ccsdk.sli.core - dblib-provider - - - org.json - json - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - org.yaml - snakeyaml - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.onap.appc.instar - org.onap.appc.instar.InstarClientActivator - org.onap.appc.instar - * - jackson-dataformat-yaml,snakeyaml - - - - - - - - - - + + + + 4.0.0 + + org.onap.appc.parent + binding-parent + 2.7.0-SNAPSHOT + + + org.onap.appc + + appc-network-inventory-client-provider + 1.7.0-SNAPSHOT + bundle + APPC Network Client - Provider + + + + + equinoxSDK381 + org.eclipse.osgi + + + commons-io + commons-io + + + ch.qos.logback + logback-classic + + + com.att.eelf + eelf-core + + + ch.qos.logback + logback-classic + + + + + org.glassfish.jersey.core + jersey-client + provided + + + junit + junit + test + + + org.powermock + powermock-api-mockito + test + + + org.powermock + powermock-module-junit4 + test + + + org.javassist + javassist + 3.22.0-GA + test + + + org.onap.appc + appc-config-params-provider + ${project.version} + + + org.onap.ccsdk.sli.core + sli-common + + + org.onap.ccsdk.sli.core + sli-provider + + + org.onap.ccsdk.sli.core + dblib-provider + + + org.json + json + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + + + org.yaml + snakeyaml + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + org.onap.appc.instar + org.onap.appc.instar.InstarClientActivator + org.onap.appc.instar + * + jackson-dataformat-yaml,snakeyaml + + + + + + + + + + diff --git a/appc-outbound/pom.xml b/appc-outbound/pom.xml index 81b46bdec..f23ad9849 100755 --- a/appc-outbound/pom.xml +++ b/appc-outbound/pom.xml @@ -1,98 +1,98 @@ - - - 4.0.0 - - org.onap.appc - appc - 1.7.0-SNAPSHOT - - appc-outbound - pom - Application Controller Outbound - Application Controller Outbound - - - ${ccsdk.sli.adaptors.version} - - - - - - - org.onap.ccsdk.sli.adaptors - sql-resource-provider - ${ccsdk.sli.adaptors.version} - - - - org.onap.ccsdk.sli.adaptors - aai-service-provider - ${sdnc.aai.version} - - - - - - - appc-aai-client - appc-network-inventory-client - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-checkstyle-plugin - - - [2.17,) - - - check - - - - - - - - - - - - - - + + + + 4.0.0 + + org.onap.appc + appc + 1.7.0-SNAPSHOT + + appc-outbound + pom + Application Controller Outbound + Application Controller Outbound + + + ${ccsdk.sli.adaptors.version} + + + + + + + org.onap.ccsdk.sli.adaptors + sql-resource-provider + ${ccsdk.sli.adaptors.version} + + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + ${sdnc.aai.version} + + + + + + + appc-aai-client + appc-network-inventory-client + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-checkstyle-plugin + + + [2.17,) + + + check + + + + + + + + + + + + + + diff --git a/appc-provider/appc-provider-bundle/pom.xml b/appc-provider/appc-provider-bundle/pom.xml index 4f64ce662..5f6c67733 100644 --- a/appc-provider/appc-provider-bundle/pom.xml +++ b/appc-provider/appc-provider-bundle/pom.xml @@ -21,8 +21,7 @@ ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent @@ -170,4 +169,4 @@ json - \ No newline at end of file + diff --git a/appc-provider/appc-provider-features/features-appc-provider/pom.xml b/appc-provider/appc-provider-features/features-appc-provider/pom.xml index a32ecb295..4e13e10c8 100644 --- a/appc-provider/appc-provider-features/features-appc-provider/pom.xml +++ b/appc-provider/appc-provider-features/features-appc-provider/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -23,4 +24,4 @@ - \ No newline at end of file + diff --git a/appc-provider/appc-provider-features/onap-appc-provider/pom.xml b/appc-provider/appc-provider-features/onap-appc-provider/pom.xml index 0800fa546..356cb0237 100644 --- a/appc-provider/appc-provider-features/onap-appc-provider/pom.xml +++ b/appc-provider/appc-provider-features/onap-appc-provider/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -43,4 +44,4 @@ ${project.version} - \ No newline at end of file + diff --git a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh b/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh index 836910190..f5d3d28e7 100755 --- a/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-provider/appc-provider-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" 2> /tmp/installErr cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-provider/appc-provider-model/pom.xml b/appc-provider/appc-provider-model/pom.xml index 84d79c1ad..b0f62854a 100644 --- a/appc-provider/appc-provider-model/pom.xml +++ b/appc-provider/appc-provider-model/pom.xml @@ -19,8 +19,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent @@ -109,13 +108,11 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + com.google.guava guava diff --git a/appc-provider/pom.xml b/appc-provider/pom.xml index e430cb9b4..4a666a49c 100644 --- a/appc-provider/pom.xml +++ b/appc-provider/pom.xml @@ -1,3 +1,4 @@ + - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-sdc-listener/appc-sdc-listener-features/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/pom.xml index 35e933ad1..5804b0e92 100644 --- a/appc-sdc-listener/appc-sdc-listener-features/pom.xml +++ b/appc-sdc-listener/appc-sdc-listener-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-sdc-listener diff --git a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml index 0395fee82..a89156208 100644 --- a/appc-sdc-listener/appc-sdc-listener-installer/pom.xml +++ b/appc-sdc-listener/appc-sdc-listener-installer/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-sdc-listener-installer diff --git a/appc-sdc-listener/appc-sdc-listener-installer/src/main/resources/scripts/install-feature.sh b/appc-sdc-listener/appc-sdc-listener-installer/src/main/resources/scripts/install-feature.sh index 836910190..64b4d08b6 100755 --- a/appc-sdc-listener/appc-sdc-listener-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-sdc-listener/appc-sdc-listener-installer/src/main/resources/scripts/install-feature.sh @@ -38,7 +38,8 @@ fi COUNT=0 while [ $COUNT -lt 10 ]; do - ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr +# ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 2> /tmp/installErr + sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" cat /tmp/installErr if grep -q 'Failed to get the session' /tmp/installErr; then sleep 10 diff --git a/appc-sdc-listener/appc-yang-generator/pom.xml b/appc-sdc-listener/appc-yang-generator/pom.xml index 9cfbad41c..c40093c22 100644 --- a/appc-sdc-listener/appc-yang-generator/pom.xml +++ b/appc-sdc-listener/appc-yang-generator/pom.xml @@ -21,15 +21,13 @@ limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-sdc-listener/pom.xml b/appc-sdc-listener/pom.xml index 26294839e..66f2ea412 100644 --- a/appc-sdc-listener/pom.xml +++ b/appc-sdc-listener/pom.xml @@ -27,7 +27,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml index 4f28b1f76..55e5d7bfa 100644 --- a/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-bundle/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-sequence-generator-bundle diff --git a/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml index ac7187135..fa6b6188f 100644 --- a/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-features/features-appc-sequence-generator/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent feature-repo-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml index e26c9ab29..1890b92fa 100644 --- a/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-features/onap-appc-sequence-generator/pom.xml @@ -18,15 +18,14 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + 4.0.0 org.onap.appc.parent single-feature-parent 2.7.0-SNAPSHOT - + org.onap.appc @@ -34,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT feature - + diff --git a/appc-sequence-generator/appc-sequence-generator-features/pom.xml b/appc-sequence-generator/appc-sequence-generator-features/pom.xml index 2b60c2127..4fd7d101a 100644 --- a/appc-sequence-generator/appc-sequence-generator-features/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-features/pom.xml @@ -25,7 +25,7 @@ limitations under the License. org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc @@ -33,7 +33,7 @@ limitations under the License. 1.7.0-SNAPSHOT pom - + onap-appc-sequence-generator diff --git a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml index 2e514469b..cf59e42b9 100644 --- a/appc-sequence-generator/appc-sequence-generator-installer/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-installer/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-sequence-generator-installer diff --git a/appc-sequence-generator/appc-sequence-generator-installer/src/main/resources/scripts/install-feature.sh b/appc-sequence-generator/appc-sequence-generator-installer/src/main/resources/scripts/install-feature.sh index 0e5496c54..d2093df23 100755 --- a/appc-sequence-generator/appc-sequence-generator-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-sequence-generator/appc-sequence-generator-installer/src/main/resources/scripts/install-feature.sh @@ -33,5 +33,5 @@ then fi -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} - +#${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +sshpass -pkaraf ssh -o StrictHostKeyChecking=no karaf@localhost -p 8101 "feature:repo-add ${features.repositories}" diff --git a/appc-sequence-generator/appc-sequence-generator-model/pom.xml b/appc-sequence-generator/appc-sequence-generator-model/pom.xml index 20c4192d2..a455c60f0 100644 --- a/appc-sequence-generator/appc-sequence-generator-model/pom.xml +++ b/appc-sequence-generator/appc-sequence-generator-model/pom.xml @@ -1,4 +1,4 @@ - + - + 4.0.0 org.onap.appc.parent binding-parent 2.7.0-SNAPSHOT - + org.onap.appc appc-sequence-generator-model @@ -95,12 +94,10 @@ yang-common - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + + diff --git a/appc-sequence-generator/pom.xml b/appc-sequence-generator/pom.xml index 56afd6a43..aaeda7aa2 100644 --- a/appc-sequence-generator/pom.xml +++ b/appc-sequence-generator/pom.xml @@ -27,7 +27,7 @@ org.onap.appc.parent odlparent-lite 2.7.0-SNAPSHOT - + org.onap.appc appc-sequence-generator diff --git a/pom.xml b/pom.xml index bc77ffa3f..6fb864a30 100644 --- a/pom.xml +++ b/pom.xml @@ -20,8 +20,7 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - + org.onap.ccsdk.parent odlparent @@ -257,15 +256,11 @@ limitations under the License. xml - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - ${odl.ietf-inet-types.version} - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - ${odl.ietf-yang-types.version} - + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + +