summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-06-18 11:54:35 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-06-18 11:54:35 -0400
commit7ef4659e0b07164402cf6d7aa89b45df03063669 (patch)
tree5fe92e316f5d2e2e19eb97404436b61ae4b7b2ff
parenta87dc9c351b0c08d20adc428c215cf3934bb79bb (diff)
Update sli/plugins to ODL Oxygen
Minor updates to feature pom.xmls to get clean compile with ODL Oxygen parent poms. Change-Id: I8671ad1366b8dc2e79fe206971675ba56a0e2bac Issue-ID: CCSDK-283 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
-rw-r--r--properties-node/features/ccsdk-properties-node/pom.xml29
-rw-r--r--restapi-call-node/features/ccsdk-restapi-call-node/pom.xml92
-rwxr-xr-xrestapi-call-node/provider/pom.xml4
3 files changed, 67 insertions, 58 deletions
diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml
index 420ba49d9..fd38cb224 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/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
index 43dcc74f0..822a6d1e7 100644
--- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
+++ b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
@@ -1,53 +1,55 @@
<?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.ccsdk.parent</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <relativePath />
- </parent>
+ <parent>
+ <groupId>org.onap.ccsdk.parent</groupId>
+ <artifactId>single-feature-parent</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <relativePath />
+ </parent>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>ccsdk-restapi-call-node</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- <packaging>feature</packaging>
+ <groupId>org.onap.ccsdk.sli.plugins</groupId>
+ <artifactId>ccsdk-restapi-call-node</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <packaging>feature</packaging>
- <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
+ <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
+ <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>
- <properties>
- <skip.karaf.featureTest>true</skip.karaf.featureTest>
- </properties>
+ <dependencies>
-
- <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>
- <version>${ccsdk.sli.core.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>restapi-call-node-provider</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.onap.ccsdk.sli.core</groupId>
+ <artifactId>ccsdk-sli</artifactId>
+ <version>${ccsdk.sli.core.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>restapi-call-node-provider</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml
index 4831356c3..18a20cef1 100755
--- a/restapi-call-node/provider/pom.xml
+++ b/restapi-call-node/provider/pom.xml
@@ -54,24 +54,20 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs.jersey-oauth</groupId>
<artifactId>oauth-signature</artifactId>
<version>${jersey.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs.jersey-oauth</groupId>
<artifactId>oauth-client</artifactId>
<version>${jersey.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>