diff options
Diffstat (limited to 'appc-adapters/appc-iaas-adapter')
7 files changed, 13 insertions, 14 deletions
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> |