diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-01-10 11:11:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-01-10 11:11:39 +0000 |
| commit | f7c24c3dce2845ab17b9cecda15e431123f3832f (patch) | |
| tree | bd30b9d92f414cde2c8e28a021e7c9ade4dbeeb7 /features | |
| parent | 097fcd64daacf17596e11b4c06ee80c47d028e6d (diff) | |
| parent | 21ec6554123a0496d8e210739e94d91b23ca3340 (diff) | |
Merge "Prepare for release build"0.4.0
Diffstat (limited to 'features')
| -rw-r--r-- | features/ccsdk-sli-adaptors-all/pom.xml | 172 | ||||
| -rw-r--r-- | features/features-sli-adaptors/pom.xml | 6 | ||||
| -rwxr-xr-x | features/installer/pom.xml | 7 | ||||
| -rwxr-xr-x | features/pom.xml | 2 |
4 files changed, 95 insertions, 92 deletions
diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml index 367c48f6..48907270 100644 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ b/features/ccsdk-sli-adaptors-all/pom.xml @@ -1,98 +1,98 @@ <?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.2.0-SNAPSHOT</version> - <relativePath /> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>1.2.0</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ccsdk-sli-adaptors-all</artifactId> - <version>0.4.0-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>ccsdk-sli-adaptors-all</artifactId> + <version>0.4.0-SNAPSHOT</version> + <packaging>feature</packaging> - <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: features :: ${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> + <properties> + <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version> + </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> <dependency> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>aai-service-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> - </dependencyManagement> + </dependencies> + </dependencyManagement> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-aai-service</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-ansible-adapter</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-saltstack-adapter</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-netbox-client</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-mdsal-resource</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-resource-assignment</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-sql-resource</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-aai-service</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-ansible-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-saltstack-adapter</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-netbox-client</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-mdsal-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-resource-assignment</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-sql-resource</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> </project> diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml index eeffd8be..0d2724f1 100644 --- a/features/features-sli-adaptors/pom.xml +++ b/features/features-sli-adaptors/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0</version> <relativePath/> </parent> @@ -16,6 +16,10 @@ <name>ccsdk-sli-adaptors :: features :: ${project.artifactId}</name> + <properties> + <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version> + </properties> + <dependencies> <dependency> <groupId>${project.groupId}</groupId> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 06f30632..3578e622 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -1,13 +1,12 @@ <?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"> +<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>odlparent-lite</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/features/pom.xml b/features/pom.xml index 4a673deb..cd720a6a 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0</version> <relativePath/> </parent> |