diff options
| author |   Robert Varga <nite@hq.sk> | 2016-02-04 18:36:00 +0100 |
|---|---|---|
| committer | Robert Varga <nite@hq.sk> | 2016-02-04 18:36:00 +0100 |
| commit | 74a62622f19db08823be3e8f36777df94dc9de4e (patch) | |
| tree | 2ca9c582e6d009ee0fa22569d17cf027fbec8790 /vbd | |
| parent | 882ddc69b05a4001718d90aa9c57f1e13d80aa0d (diff) | |
Fix UI bundle not being installed
Inheriting from aggregator causes the artifacts to be skipped during
install. Use api-parent instead.
Change-Id: I507a21b2999c193d41a924debfcd67b916160f94
Signed-off-by: Robert Varga <nite@hq.sk>
Diffstat (limited to 'vbd')
| -rw-r--r-- | vbd/features/src/main/features/features.xml | 2 | ||||
| -rw-r--r-- | vbd/gui/bundle/pom.xml | 16 | ||||
| -rw-r--r-- | vbd/gui/module/pom.xml | 6 |
3 files changed, 7 insertions, 17 deletions
diff --git a/vbd/features/src/main/features/features.xml b/vbd/features/src/main/features/features.xml index 0f3d7c155..ace5a51de 100644 --- a/vbd/features/src/main/features/features.xml +++ b/vbd/features/src/main/features/features.xml @@ -42,7 +42,6 @@ <feature version="${restconf.version}">odl-restconf</feature> </feature> - <!-- FIXME: disabled until we find out why it fails to verify <feature name='odl-vbd-ui' version='${project.version}' description='OpenDaylight :: vbd :: UI'> <feature version="${project.version}">odl-vbd-rest</feature> <feature version="${restconf.version}">odl-mdsal-apidocs</feature> @@ -50,6 +49,5 @@ <feature version="${dlux.version}">odl-dlux-yangui</feature> <bundle>mvn:io.fd.honeycomb.vbd/vbd-ui-bundle/{{VERSION}}</bundle> </feature> - --> </features> diff --git a/vbd/gui/bundle/pom.xml b/vbd/gui/bundle/pom.xml index c5f9d4804..a8e4ba602 100644 --- a/vbd/gui/bundle/pom.xml +++ b/vbd/gui/bundle/pom.xml @@ -2,10 +2,10 @@ <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>io.fd.honeycomb.vbd</groupId> - <artifactId>vbd-aggregator</artifactId> + <groupId>io.fd.honeycomb.common</groupId> + <artifactId>api-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../../common/api-parent</relativePath> </parent> <groupId>io.fd.honeycomb.vbd</groupId> @@ -17,13 +17,7 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>5.0.0</version> - </dependency> - <dependency> - <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> - <version>5.0.0</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -33,12 +27,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.7.14</version> </dependency> <dependency> <groupId>org.opendaylight.dlux</groupId> <artifactId>loader</artifactId> - <version>0.3.0-SNAPSHOT</version> + <version>0.3.0-SNAPSHOT</version> </dependency> </dependencies> @@ -55,7 +48,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.6</version> <executions> <!--loader Resources--> <execution> diff --git a/vbd/gui/module/pom.xml b/vbd/gui/module/pom.xml index b60ac7b5a..cdade2893 100644 --- a/vbd/gui/module/pom.xml +++ b/vbd/gui/module/pom.xml @@ -9,10 +9,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 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>io.fd.honeycomb.vbd</groupId> - <artifactId>vbd-aggregator</artifactId> + <groupId>io.fd.honeycomb.common</groupId> + <artifactId>api-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../</relativePath> + <relativePath>../../../common/api-parent</relativePath> </parent> <groupId>io.fd.honeycomb.vbd</groupId> |