aboutsummaryrefslogtreecommitdiffstats
path: root/generic-resource-api/features
diff options
context:
space:
mode:
authorMarcus Williams <marcus.williams@intel.com>2017-10-13 16:21:35 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-13 16:21:35 +0000
commit860a5ab886772dda6ae610c4c6ff1373fd22c563 (patch)
tree1bf22701084cf52567f4dc1a32c49b768c19127f /generic-resource-api/features
parentcb54816c725dccd5bcaddbe7230d53483d201915 (diff)
parent03575373024593fd1cac6812f0992152edde4d37 (diff)
Merge "Fix installation issues with generic-resource-api"
Diffstat (limited to 'generic-resource-api/features')
-rw-r--r--generic-resource-api/features/pom.xml141
-rw-r--r--generic-resource-api/features/src/main/resources/features.xml9
2 files changed, 72 insertions, 78 deletions
diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml
index 7c2e8907..041307fc 100644
--- a/generic-resource-api/features/pom.xml
+++ b/generic-resource-api/features/pom.xml
@@ -1,42 +1,37 @@
<?xml version='1.0' encoding='UTF-8'?>
-<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>
+<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.sdnc.northbound</groupId>
- <artifactId>generic-resource-api</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.onap.sdnc.northbound</groupId>
+ <artifactId>generic-resource-api</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ </parent>
- <artifactId>generic-resource-api.features</artifactId>
- <packaging>jar</packaging>
+ <artifactId>generic-resource-api-features</artifactId>
+ <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>org.onap.sdnc.northbound</groupId>
- <artifactId>generic-resource-api.model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.sdnc.northbound</groupId>
- <artifactId>generic-resource-api.provider</artifactId>
- <type>xml</type>
- <classifier>config</classifier>
- </dependency>
- <dependency>
- <groupId>org.onap.sdnc.northbound</groupId>
- <artifactId>generic-resource-api.provider</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.sdnc.northbound</groupId>
+ <artifactId>generic-resource-api-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.onap.sdnc.northbound</groupId>
+ <artifactId>generic-resource-api-provider</artifactId>
+ </dependency>
<dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>features-mdsal</artifactId>
- <version>${odl.mdsal.features.version}</version>
+ <version>${odl.mdsal.features.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
- <dependency><!-- Required for launching the feature tests-->
+ <dependency><!-- Required for launching the feature tests -->
<groupId>org.opendaylight.odlparent</groupId>
<artifactId>features-test</artifactId>
<version>${odl.commons.opendaylight.version}</version>
@@ -46,56 +41,56 @@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>features-yangtools</artifactId>
- <version>${odl.yangtools.version}</version>
+ <version>${odl.yangtools.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
- </dependencies>
+ </dependencies>
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <goals>
- <goal>resources</goal>
- </goals>
- <phase>generate-resources</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/classes/${features.file}</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <resources>
+ <resource>
+ <filtering>true</filtering>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/classes/${features.file}</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/generic-resource-api/features/src/main/resources/features.xml b/generic-resource-api/features/src/main/resources/features.xml
index ccf60324..219c7215 100644
--- a/generic-resource-api/features/src/main/resources/features.xml
+++ b/generic-resource-api/features/src/main/resources/features.xml
@@ -4,15 +4,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
- <feature name='GENERIC-RESOURCE-API' description="generic-resource-api.GENERIC-RESOURCE-API" version='${project.version}'>
- <feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature>
+ <feature name='sdnc-generic-resource-api' description="sdnc-generic-resource-api" version='${project.version}'>
+ <feature>odl-mdsal-broker</feature>
<feature>sdnc-sli</feature>
<!-- It is assumed that applications are installed on BVC, which installs bvc-core including MD-SAL etc.
Do not list those features out here as that will tie your implementation to a specific version
of MD-SAL / BVC and force updates to your application for every upgrade of BVC core platform.-->
- <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api.model/${project.version}</bundle>
- <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api.provider/${project.version}</bundle>
- <configfile finalname="etc/opendaylight/karaf/200-generic-resource-api-provider.xml">mvn:org.onap.sdnc.northbound/generic-resource-api.provider/${project.version}/xml/config</configfile>
+ <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api-model/${project.version}</bundle>
+ <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api-provider/${project.version}</bundle>
</feature>
</features>