diff options
Diffstat (limited to 'appc-adapters')
59 files changed, 104 insertions, 115 deletions
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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-ansible-adapter</module> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-ansible-adapter-installer</artifactId> 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========================================================= --> - <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <artifactId>appc-chef-adapter-bundle</artifactId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-chef-adapter</module> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <artifactId>odlparent-lite</artifactId> <groupId>org.onap.appc.parent</groupId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <artifactId>appc-chef-adapter-installer</artifactId> <groupId>org.onap.appc</groupId> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <artifactId>appc-chef-adapter</artifactId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter-bundle</artifactId> @@ -204,4 +204,4 @@ </plugins> </build> <version>1.7.0-SNAPSHOT</version> -</project>
\ No newline at end of file +</project> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-dmaap-adapter</module> 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 @@ <artifactId>odlparent-lite</artifactId> <groupId>org.onap.appc.parent</groupId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter-installer</artifactId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-dmaap-adapter</artifactId> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-iaas-adapter</module> 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 @@ <artifactId>odlparent-lite</artifactId> <groupId>org.onap.appc.parent</groupId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-iaas-adapter-installer</artifactId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <artifactId>appc-netconf-adapter-bundle</artifactId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-netconf-adapter</module> 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 @@ <artifactId>odlparent-lite</artifactId> <groupId>org.onap.appc.parent</groupId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <artifactId>appc-netconf-adapter-installer</artifactId> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <modelVersion>4.0.0</modelVersion> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-rest-adapter</module> 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 @@ <artifactId>odlparent-lite</artifactId> <groupId>org.onap.appc.parent</groupId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-rest-adapter-installer</artifactId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-rest-healthcheck-adapter</module> 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 @@ <artifactId>odlparent-lite</artifactId> <groupId>org.onap.appc.parent</groupId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-rest-healthcheck-adapter-installer</artifactId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>feature-repo-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>single-feature-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -34,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> - <name></name> + <name/> <dependencies> <dependency> 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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -33,7 +33,7 @@ limitations under the License. <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> - <name></name> + <name/> <modules> <module>onap-appc-ssh-adapter</module> 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========================================================= --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <artifactId>appc-ssh-adapter-tests</artifactId> 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 @@ <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> <modelVersion>4.0.0</modelVersion> 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 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= ONAP : APPC |