diff options
| author |   Taka Cho <takamune.cho@att.com> | 2019-10-08 22:11:26 -0400 |
|---|---|---|
| committer | Taka Cho <takamune.cho@att.com> | 2019-10-08 22:12:07 -0400 |
| commit | 9c74c5729c9a52268342e583d6493bb19df80aa6 (patch) | |
| tree | beab41f47664f62a54b2b72229c449237af5625b /appc-config/appc-config-adaptor | |
| parent | 701d10c208c24c72e67ac7e555520c6127e0698f (diff) | |
Neon SR1 upgrade
change pom files for
ODL Neon SR1 upgrade
Issue-ID: APPC-1749
Change-Id: Ib10ff74852a2b38933c0df034c71e21665430f62
Signed-off-by: Taka Cho <takamune.cho@att.com>
Diffstat (limited to 'appc-config/appc-config-adaptor')
7 files changed, 14 insertions, 18 deletions
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. <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-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========================================================= --> -<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-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. <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-config-adaptor</module> 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 @@ <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-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========================================================= --> -<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"> <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-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========================================================= --> -<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> |