<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.ccsdk.parent</groupId>
+ <groupId>org.o-ran-sc.oam.features.parent</groupId>
<artifactId>odlparent-lite</artifactId>
<version>1.5.2-SNAPSHOT</version>
<relativePath />
</organization>
<properties>
- <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-20200225T124813Z</base.image.repo>
+ <base.image.repo>nexus3.onap.org:10001/onap/sdnc-image:1.8.0-STAGING-latest</base.image.repo>
<image.name>o-ran-sc/${project.artifactId}</image.name>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
<o-ran-sc.project.version>${project.version}</o-ran-sc.project.version>
<o-ran-sc.features.version>0.7.1-SNAPSHOT</o-ran-sc.features.version>
- <features.repo>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-oran-ru-fh-feature/${o-ran-sc.features.version}/xml/features, mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-xran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</features.repo>
- <features.boot>sdnr-wt-feature-aggregator,devicemanager-oran-ru-fh-feature</features.boot>
+ <repo-oran>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-oran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</repo-oran>
+ <repo-xran>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-xran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</repo-xran>
+ <features.repo>${repo-oran},${repo-xran}</features.repo>
+ <features.boot>sdnr-wt-feature-aggregator,devicemanager-oran-ru-fh-feature,devicemanager-xran-ru-fh-feature</features.boot>
<platform-logic-installer.version>${project.version}</platform-logic-installer.version>
<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<type>zip</type>
<classifier>repo</classifier>
</dependency>
+ <dependency>
+ <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
+ <artifactId>devicemanager-xran-ru-fh-installer</artifactId>
+ <version>${o-ran-sc.features.version}</version>
+ <type>zip</type>
+ <classifier>repo</classifier>
+ </dependency>
</dependencies>
<build>
<version>0.28.0</version>
<inherited>false</inherited>
<configuration>
+ <pushRegistry>${env.CONTAINER_PUSH_REGISTRY}</pushRegistry>
<images>
<image>
<name>${image.name}</name>