diff options
author | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-01-08 12:29:46 -0500 |
---|---|---|
committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-01-08 12:29:46 -0500 |
commit | feb63251ef347534f45c3cea0d04923e6cbd94ad (patch) | |
tree | 312fe4ffaaa635ec2c2dfeb784715ae704bd40d5 /lcm | |
parent | a8137f82acab7c21fa71ae2ff8dc179f434ddc95 (diff) |
Prepare for release build
Prepare for release of early ODL-Oxygen based CCSDK Dublin
Change-Id: I7a11b559e32f953bfd5f514a6cd402090005d9eb
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'lcm')
-rw-r--r-- | lcm/features/ccsdk-lcm/pom.xml | 23 | ||||
-rw-r--r-- | lcm/features/features-lcm/pom.xml | 46 | ||||
-rwxr-xr-x | lcm/features/pom.xml | 5 | ||||
-rwxr-xr-x | lcm/installer/pom.xml | 248 | ||||
-rwxr-xr-x | lcm/model/pom.xml | 6 | ||||
-rwxr-xr-x | lcm/pom.xml | 32 | ||||
-rwxr-xr-x | lcm/provider/pom.xml | 11 |
7 files changed, 192 insertions, 179 deletions
diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml index 18b22225..6138a364 100644 --- a/lcm/features/ccsdk-lcm/pom.xml +++ b/lcm/features/ccsdk-lcm/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>single-feature-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -18,10 +17,14 @@ <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> + <properties> + <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> + </properties> - <dependencyManagement> - <dependencies> - <dependency> + + <dependencyManagement> + <dependencies> + <dependency> <groupId>org.opendaylight.mdsal.model</groupId> <artifactId>mdsal-model-artifacts</artifactId> <version>${odl.mdsal.model.version}</version> @@ -35,9 +38,9 @@ <type>pom</type> <scope>import</scope> </dependency> - </dependencies> - </dependencyManagement> - + </dependencies> + </dependencyManagement> + <dependencies> <dependency> diff --git a/lcm/features/features-lcm/pom.xml b/lcm/features/features-lcm/pom.xml index d50d3e84..08e4fa8a 100644 --- a/lcm/features/features-lcm/pom.xml +++ b/lcm/features/features-lcm/pom.xml @@ -1,29 +1,33 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>feature-repo-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>1.2.0</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>features-lcm</artifactId> - <version>0.4.0-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>features-lcm</artifactId> + <version>0.4.0-SNAPSHOT</version> + <packaging>feature</packaging> - <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> + <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-lcm</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <properties> + <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> + </properties> - </dependencies> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>ccsdk-lcm</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + </dependencies> </project> diff --git a/lcm/features/pom.xml b/lcm/features/pom.xml index c995e2fb..27fdcefa 100755 --- a/lcm/features/pom.xml +++ b/lcm/features/pom.xml @@ -1,12 +1,11 @@ <?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> + <version>1.2.0</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml index 2dcc1974..e51a95e3 100755 --- a/lcm/installer/pom.xml +++ b/lcm/installer/pom.xml @@ -1,147 +1,147 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>1.2.0-SNAPSHOT</version> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.2.0</version> <relativePath/> - </parent> + </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>lcm-installer</artifactId> + <artifactId>lcm-installer</artifactId> <version>0.4.0-SNAPSHOT</version> - <packaging>pom</packaging> + <packaging>pom</packaging> - <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> + <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> - <properties> - <application.name>ccsdk-lcm</application.name> - <features.boot>${application.name}</features.boot> + <properties> + <application.name>ccsdk-lcm</application.name> + <features.boot>${application.name}</features.boot> <features.repositories>mvn:org.onap.ccsdk.sli.northbound/${features.boot}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>${application.name}</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>${application.name}</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-model</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>lcm-provider</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>lcm-provider</artifactId> + <version>${project.version}</version> + </dependency> - </dependencies> + </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>maven-repo-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>stage/${application.name}-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>true</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>installer-zip</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <attach>true</attach> - <finalName>${application.name}-${project.version}-installer</finalName> - <descriptors> - <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> - </descriptors> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <transitive>false</transitive> - <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <useRepositoryLayout>true</useRepositoryLayout> - <addParentPoms>false</addParentPoms> - <copyPom>false</copyPom> - <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-version</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/stage</outputDirectory> - <resources> - <resource> - <directory>src/main/resources/scripts</directory> - <includes> - <include>install-feature.sh</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>maven-repo-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>stage/${application.name}-${project.version}</finalName> + <descriptors> + <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>true</appendAssemblyId> + </configuration> + </execution> + <execution> + <id>installer-zip</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <attach>true</attach> + <finalName>${application.name}-${project.version}-installer</finalName> + <descriptors> + <descriptor>src/assembly/assemble_installer_zip.xml</descriptor> + </descriptors> + <appendAssemblyId>false</appendAssemblyId> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <phase>prepare-package</phase> + <configuration> + <transitive>false</transitive> + <outputDirectory>${project.build.directory}/assembly/system</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <useRepositoryLayout>true</useRepositoryLayout> + <addParentPoms>false</addParentPoms> + <copyPom>false</copyPom> + <includeGroupIds>org.onap.ccsdk.sli.northbound</includeGroupIds> + <scope>provided</scope> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-version</id> + <goals> + <goal>copy-resources</goal> + </goals><!-- here the phase you need --> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/stage</outputDirectory> + <resources> + <resource> + <directory>src/main/resources/scripts</directory> + <includes> + <include>install-feature.sh</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> - </executions> - </plugin> + </executions> + </plugin> - </plugins> - </build> + </plugins> + </build> </project> diff --git a/lcm/model/pom.xml b/lcm/model/pom.xml index 27dcbdc7..090ed649 100755 --- a/lcm/model/pom.xml +++ b/lcm/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>1.2.0</version> <relativePath/> </parent> @@ -16,6 +16,10 @@ <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> + <properties> + <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> + </properties> + <dependencies> <dependency> diff --git a/lcm/pom.xml b/lcm/pom.xml index 89468a88..54f1ba6b 100755 --- a/lcm/pom.xml +++ b/lcm/pom.xml @@ -1,27 +1,27 @@ <?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> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>1.2.0-SNAPSHOT</version> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.2.0</version> <relativePath/> - </parent> + </parent> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>lcm</artifactId> - <version>0.4.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.northbound</groupId> + <artifactId>lcm</artifactId> + <version>0.4.0-SNAPSHOT</version> + <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm</name> - <modules> - <module>model</module> - <module>features</module> - <module>provider</module> - <module>installer</module> - </modules> + <modules> + <module>model</module> + <module>features</module> + <module>provider</module> + <module>installer</module> + </modules> </project> diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml index f383df7f..18810403 100755 --- a/lcm/provider/pom.xml +++ b/lcm/provider/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>binding-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath /> + <version>1.2.0</version> + <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> @@ -17,6 +16,10 @@ <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> + <properties> + <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> + </properties> + <dependencyManagement> <dependencies> <dependency> |