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-sdc-listener | |
| 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-sdc-listener')
8 files changed, 20 insertions, 23 deletions
diff --git a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml index 1705d46a6..81e9a6ead 100644 --- a/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml +++ b/appc-sdc-listener/appc-sdc-listener-bundle/pom.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- ============LICENSE_START======================================================= ONAP : APPC @@ -27,7 +28,7 @@ limitations under the License. <groupId>org.onap.appc.parent</groupId> <artifactId>binding-parent</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> @@ -185,13 +186,11 @@ limitations under the License. </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> + + <dependency> <groupId>org.onap.appc</groupId> diff --git a/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml index 291f7fd46..387278ea4 100644 --- a/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/pom.xml +++ b/appc-sdc-listener/appc-sdc-listener-features/features-appc-sdc-listener/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-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml index b63d43074..7f0764076 100644 --- a/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/pom.xml +++ b/appc-sdc-listener/appc-sdc-listener-features/onap-appc-sdc-listener/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-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. <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-sdc-listener</module> 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. <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-sdc-listener-installer</artifactId> 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========================================================= --> -<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-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. <groupId>org.onap.appc.parent</groupId> <artifactId>odlparent-lite</artifactId> <version>2.7.0-SNAPSHOT</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.onap.appc</groupId> |