summaryrefslogtreecommitdiffstats
path: root/appc-inbound/appc-artifact-handler
diff options
context:
space:
mode:
Diffstat (limited to 'appc-inbound/appc-artifact-handler')
-rw-r--r--appc-inbound/appc-artifact-handler/features/features-appc-artifact-handler/pom.xml4
-rw-r--r--appc-inbound/appc-artifact-handler/features/onap-appc-artifact-handler/pom.xml7
-rw-r--r--appc-inbound/appc-artifact-handler/features/pom.xml4
-rwxr-xr-xappc-inbound/appc-artifact-handler/installer/pom.xml5
-rwxr-xr-xappc-inbound/appc-artifact-handler/installer/resources/scripts/install-feature.sh4
-rwxr-xr-xappc-inbound/appc-artifact-handler/installer/src/main/resources/scripts/install-feature.sh4
-rwxr-xr-xappc-inbound/appc-artifact-handler/model/pom.xml17
-rwxr-xr-xappc-inbound/appc-artifact-handler/pom.xml2
-rwxr-xr-xappc-inbound/appc-artifact-handler/provider/pom.xml5
9 files changed, 23 insertions, 29 deletions
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.
<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-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=========================================================
-->
-<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-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.
<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-artifact-handler</module>
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=========================================================
-->
-<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>odlparent-lite</artifactId>
<version>2.7.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath/>
</parent>
<groupId>org.onap.appc</groupId>
<artifactId>appc-artifact-handler-installer</artifactId>
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=========================================================
-->
-<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>
<artifactId>appc-artifact-handler-model</artifactId>
@@ -110,13 +109,11 @@
<artifactId>yang-common</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types-2013-07-15</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types-20130715</artifactId>
- </dependency>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991</artifactId>
+ </dependency>
+
+
</dependencies>
<version>1.7.0-SNAPSHOT</version>
</project>
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 @@
<groupId>org.onap.appc.parent</groupId>
<artifactId>odlparent-lite</artifactId>
<version>2.7.0-SNAPSHOT</version>
- <relativePath />
+ <relativePath/>
</parent>
<packaging>pom</packaging>
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=========================================================
-->
-<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>
<artifactId>appc-artifact-handler-provider</artifactId>