diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-20 00:10:23 -0400 |
|---|---|---|
| committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-06-20 00:10:23 -0400 |
| commit | fe35c591bf2769f3e2ca06b9dff762dcbdd3fe13 (patch) | |
| tree | 83fe601ebbc91a450ace582540de410128f4b8e2 | |
| parent | 3fbb662d06378afad296a593f83b7d49c4f0f677 (diff) | |
Updating parent verson to 2.1.7
Running mvn tidy:pom
Issue-ID: SDNC-1567
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Id0157c1f7306c6ecb0b9fac2a078394f5c41cd73
28 files changed, 673 insertions, 678 deletions
diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml index 3c9d0836..987dcd4d 100644 --- a/features/features-sdnc-northbound/pom.xml +++ b/features/features-sdnc-northbound/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 3832f05c..d531d399 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -1,136 +1,135 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>sdnc-northbound-features-installer</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>sdnc-northbound-features-installer</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound :: features :: ${project.artifactId}</name> + <name>sdnc-northbound :: features :: ${project.artifactId}</name> - <properties> - <application.name>sdnc-northbound-all</application.name> - <features.boot>${application.name}</features.boot> - <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <properties> + <application.name>sdnc-northbound-all</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.sdnc.northbound/${features.boot}/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.onap.sdnc.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.sdnc.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> + </dependencies> - </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <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.sdnc.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> - <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.sdnc.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/features/pom.xml b/features/pom.xml index 694aae31..ab022ee7 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -1,22 +1,22 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>sdnc-northbound-feature-aggregator</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>sdnc-northbound-feature-aggregator</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound :: features</name> + <name>sdnc-northbound :: features</name> - <modules> + <modules> <module>sdnc-northbound-all</module> <module>features-sdnc-northbound</module> <module>installer</module> diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml index 21ad16c9..e284b355 100644 --- a/features/sdnc-northbound-all/pom.xml +++ b/features/sdnc-northbound-all/pom.xml @@ -1,55 +1,54 @@ <?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>single-feature-parent</artifactId> - <version>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>sdnc-northbound-all</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>sdnc-northbound-all</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>feature</packaging> - <name>sdnc-northbound :: features :: ${project.artifactId}</name> + <name>sdnc-northbound :: features :: ${project.artifactId}</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-core-artifacts</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnc-generic-resource-api</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnc-optical-service</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnc-vnftools</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.core</groupId> + <artifactId>sli-core-artifacts</artifactId> + <version>${ccsdk.sli.core.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnc-generic-resource-api</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnc-optical-service</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnc-vnftools</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> - - </dependencies> + </dependencies> </project> diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index 607b128f..e6af4c23 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -5,7 +5,8 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>client-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> + <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> @@ -20,6 +21,7 @@ <properties> <api.name>generic-resource</api.name> </properties> + <dependencies> <dependency> <groupId>javax.annotation</groupId> @@ -27,6 +29,7 @@ <version>1.0</version> </dependency> </dependencies> + <build> <plugins> <plugin> diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml index a58123d0..15e1c73d 100644 --- a/generic-resource-api/features/features-generic-resource-api/pom.xml +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -1,29 +1,29 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>features-generic-resource-api</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>features-generic-resource-api</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>feature</packaging> - <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> + <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnc-generic-resource-api</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnc-generic-resource-api</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> - </dependencies> + </dependencies> </project> diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 5155ed31..5064877a 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml index c6955293..fdf8da40 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index 53635af9..aa0eee46 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -1,142 +1,141 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api-installer</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api-installer</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> + <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> - <properties> - <application.name>sdnc-generic-resource-api</application.name> - <features.boot>${application.name}</features.boot> - <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <properties> + <application.name>sdnc-generic-resource-api</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.onap.sdnc.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.sdnc.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.sdnc.northbound</groupId> - <artifactId>generic-resource-api-provider</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api-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> + </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.sdnc.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> - </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.sdnc.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/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 86d22340..aaa26533 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -1,23 +1,23 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api-model</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api-model</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> + <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> - <modules> - <module>yang</module> - <module>swagger</module> - </modules> + <modules> + <module>yang</module> + <module>swagger</module> + </modules> </project> diff --git a/generic-resource-api/model/swagger/pom.xml b/generic-resource-api/model/swagger/pom.xml index cbf19478..2382ac52 100644 --- a/generic-resource-api/model/swagger/pom.xml +++ b/generic-resource-api/model/swagger/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>oparent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> </parent> <groupId>org.onap.sdnc.northbound</groupId> @@ -29,7 +29,7 @@ <artifactId>generic-resource-api-model-yang</artifactId> <version>${project.version}</version> </dependency> - <!-- End this is where the yang comes from --> + <!-- End this is where the yang comes from --> </dependencies> <repositories> @@ -213,7 +213,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>1.10</version> diff --git a/generic-resource-api/model/yang/pom.xml b/generic-resource-api/model/yang/pom.xml index d738cbac..0d2e4d1e 100644 --- a/generic-resource-api/model/yang/pom.xml +++ b/generic-resource-api/model/yang/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> @@ -22,7 +22,6 @@ <artifactId>rfc6991</artifactId> </dependency> - </dependencies> <build> diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index e6151fb9..3828940e 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -1,26 +1,26 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound :: generic-resource-api</name> + <name>sdnc-northbound :: generic-resource-api</name> - <modules> - <module>model</module> - <module>provider</module> - <module>features</module> - <module>client</module> - <module>installer</module> - </modules> + <modules> + <module>model</module> + <module>provider</module> + <module>features</module> + <module>client</module> + <module>installer</module> + </modules> </project> diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index e31ba094..dbcd9f4c 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> @@ -17,16 +17,16 @@ <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> <dependencyManagement> - <dependencies> - <dependency> + <dependencies> + <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-core-artifacts</artifactId> <version>${ccsdk.sli.core.version}</version> <type>pom</type> <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> + </dependency> + </dependencies> + </dependencyManagement> <dependencies> <dependency> <groupId>org.onap.sdnc.northbound</groupId> @@ -76,14 +76,15 @@ <scope>test</scope> </dependency> </dependencies> + <build> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <forceJavacCompilerUse>true</forceJavacCompilerUse> + <forceJavacCompilerUse>true</forceJavacCompilerUse> </configuration> - </plugin> + </plugin> </plugins> </build> </project> diff --git a/optical-service/features/features-optical-service/pom.xml b/optical-service/features/features-optical-service/pom.xml index 23020cc5..d68b710a 100644 --- a/optical-service/features/features-optical-service/pom.xml +++ b/optical-service/features/features-optical-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/optical-service/features/pom.xml b/optical-service/features/pom.xml index bfa9731a..434bdc62 100644 --- a/optical-service/features/pom.xml +++ b/optical-service/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/optical-service/features/sdnc-optical-service/pom.xml b/optical-service/features/sdnc-optical-service/pom.xml index aa784525..bd1c5016 100644 --- a/optical-service/features/sdnc-optical-service/pom.xml +++ b/optical-service/features/sdnc-optical-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/optical-service/installer/pom.xml b/optical-service/installer/pom.xml index ed3c3031..afe9f7e0 100644 --- a/optical-service/installer/pom.xml +++ b/optical-service/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> @@ -50,7 +50,6 @@ <version>${project.version}</version> </dependency> - </dependencies> <build> diff --git a/optical-service/model/pom.xml b/optical-service/model/pom.xml index 59d383e1..b99fed31 100644 --- a/optical-service/model/pom.xml +++ b/optical-service/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> @@ -26,6 +26,5 @@ <artifactId>rfc6991</artifactId> </dependency> - </dependencies> </project> diff --git a/optical-service/pom.xml b/optical-service/pom.xml index 76f960f4..58773416 100644 --- a/optical-service/pom.xml +++ b/optical-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/optical-service/provider/pom.xml b/optical-service/provider/pom.xml index 410ba20c..3cbe99fa 100644 --- a/optical-service/provider/pom.xml +++ b/optical-service/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> @@ -1,102 +1,101 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>sdnc-northbound</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>sdnc-northbound</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound</name> - <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description> - <url>https://wiki.onap.org</url> - <organization> - <name>ONAP</name> - </organization> + <name>sdnc-northbound</name> + <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description> + <url>https://wiki.onap.org</url> + <organization> + <name>ONAP</name> + </organization> - <modules> - <module>generic-resource-api</module> - <module>optical-service</module> - <module>vnftools</module> - <module>features</module> - </modules> + <modules> + <module>generic-resource-api</module> + <module>optical-service</module> + <module>vnftools</module> + <module>features</module> + </modules> - <scm> - <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection> + <scm> + <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection> - <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection> - <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url> - </scm> - <issueManagement> - <system>JIRA</system> - <url>https://jira.onap.org/</url> - </issueManagement> - <ciManagement> - <system>Jenkins</system> - <url>https://jenkins.onap.org/</url> - </ciManagement> - <distributionManagement> - <site> - <id>sdnc-javadoc</id> - <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> - </site> - </distributionManagement> + <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection> + <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url> + </scm> + <issueManagement> + <system>JIRA</system> + <url>https://jira.onap.org/</url> + </issueManagement> + <ciManagement> + <system>Jenkins</system> + <url>https://jenkins.onap.org/</url> + </ciManagement> + <distributionManagement> + <site> + <id>sdnc-javadoc</id> + <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url> + </site> + </distributionManagement> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.17</version> - <configuration> - <skipTests>false</skipTests> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.17</version> + <configuration> + <skipTests>false</skipTests> + </configuration> + </plugin> + </plugins> + </build> - <profiles> - <profile> - <id>blackduck</id> - <activation> - <property> - <name>blackduck-scan</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <profiles> + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - </build> + </profile> - </profile> - - </profiles> + </profiles> </project> diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml index 84e24788..b7ae6c46 100644 --- a/vnftools/features/features-vnftools/pom.xml +++ b/vnftools/features/features-vnftools/pom.xml @@ -1,29 +1,29 @@ <?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>2.1.4</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>2.1.7</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>features-vnftools</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>features-vnftools</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>feature</packaging> - <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> + <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>sdnc-vnftools</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnc-vnftools</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> - </dependencies> + </dependencies> </project> diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index eacccfdc..0f7f2b02 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml index c5af693c..c3657918 100644 --- a/vnftools/features/sdnc-vnftools/pom.xml +++ b/vnftools/features/sdnc-vnftools/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 8be04061..543d7f23 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -1,141 +1,140 @@ <?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>2.1.4</version> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>vnftools-installer</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnftools-installer</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> - <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> + <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> - <properties> - <application.name>sdnc-vnftools</application.name> - <features.boot>${application.name}</features.boot> - <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <properties> + <application.name>sdnc-vnftools</application.name> + <features.boot>${application.name}</features.boot> + <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</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>${project.groupId}</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.sdnc.northbound</groupId> - <artifactId>vnftools-provider</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnftools-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> + </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.sdnc.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> - </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.sdnc.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/vnftools/pom.xml b/vnftools/pom.xml index f71de103..53e85d82 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -1,49 +1,48 @@ <?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> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>2.1.4</version> - </parent> - - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>vnftools</artifactId> - <version>2.1.5-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>VNF Tools Plugin</name> - <description>Provides execute nodes to Directed Graphs that use the VNF Module.</description> - - <modules> - <module>provider</module> - <module>features</module> - <module>installer</module> - </modules> - - <properties> - <feature-name>vnftools</feature-name> - </properties> - - <dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>vnftools-features</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - <dependency> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>vnftools-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - - - </dependencyManagement> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.7</version> + </parent> + + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnftools</artifactId> + <version>2.1.5-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>VNF Tools Plugin</name> + <description>Provides execute nodes to Directed Graphs that use the VNF Module.</description> + + <modules> + <module>provider</module> + <module>features</module> + <module>installer</module> + </modules> + + <properties> + <feature-name>vnftools</feature-name> + </properties> + + <dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnftools-features</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + + <dependency> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>vnftools-provider</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + </dependencyManagement> </project> diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index 18739c2a..c546ba08 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.1.4</version> + <version>2.1.7</version> <relativePath/> </parent> |