diff options
Diffstat (limited to 'properties-node')
| -rw-r--r-- | properties-node/features/ccsdk-properties-node/pom.xml | 29 | ||||
| -rwxr-xr-x | properties-node/installer/pom.xml | 4 | ||||
| -rw-r--r-- | properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml | 2 |
3 files changed, 23 insertions, 12 deletions
diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml index 420ba49d..fd38cb22 100644 --- a/properties-node/features/ccsdk-properties-node/pom.xml +++ b/properties-node/features/ccsdk-properties-node/pom.xml @@ -16,17 +16,28 @@ <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name> - <properties> - <skip.karaf.featureTest>true</skip.karaf.featureTest> - </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.opendaylight.mdsal.model</groupId> + <artifactId>mdsal-model-artifacts</artifactId> + <version>${odl.mdsal.model.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + <dependency> + <groupId>org.opendaylight.controller</groupId> + <artifactId>mdsal-artifacts</artifactId> + <version>${odl.mdsal.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml index c9a11c61..965bdbb7 100755 --- a/properties-node/installer/pom.xml +++ b/properties-node/installer/pom.xml @@ -59,12 +59,12 @@ </goals> <phase>package</phase> <configuration> - <attach>false</attach> + <attach>true</attach> <finalName>stage/${application.name}-${project.version}</finalName> <descriptors> <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> </descriptors> - <appendAssemblyId>false</appendAssemblyId> + <appendAssemblyId>true</appendAssemblyId> </configuration> </execution> <execution> diff --git a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml index 2ee22447..9cdc7887 100644 --- a/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/properties-node/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -25,7 +25,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <id>mvnrepo_zip</id> + <id>repo</id> <formats> <format>zip</format> </formats> |