diff options
Diffstat (limited to 'generic-resource-api')
| -rw-r--r-- | generic-resource-api/client/pom.xml | 2 | ||||
| -rw-r--r-- | generic-resource-api/features/features-generic-resource-api/pom.xml | 43 | ||||
| -rw-r--r-- | generic-resource-api/features/sdnc-generic-resource-api/pom.xml | 3 | ||||
| -rwxr-xr-x | generic-resource-api/installer/pom.xml | 261 | ||||
| -rw-r--r-- | generic-resource-api/model/pom.xml | 32 | ||||
| -rw-r--r-- | generic-resource-api/model/swagger/pom.xml | 14 | ||||
| -rw-r--r-- | generic-resource-api/model/yang/pom.xml | 2 | ||||
| -rw-r--r-- | generic-resource-api/pom.xml | 38 | ||||
| -rw-r--r-- | generic-resource-api/provider/pom.xml | 17 |
9 files changed, 205 insertions, 207 deletions
diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index 35a400da..36cda5a5 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -20,6 +20,7 @@ <properties> <api.name>generic-resource</api.name> </properties> + <dependencies> <dependency> <groupId>javax.annotation</groupId> @@ -27,6 +28,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 c8dcc505..bd846110 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,28 @@ <?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.2.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>feature-repo-parent</artifactId> + <version>2.2.0-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>features-generic-resource-api</artifactId> - <version>2.2.0-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>features-generic-resource-api</artifactId> + <version>2.2.0-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> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>sdnc-generic-resource-api</artifactId> + <version>${project.version}</version> + <type>xml</type> + <classifier>features</classifier> + </dependency> + </dependencies> </project> 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 8acb44a8..57e69c72 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -26,7 +26,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli</artifactId> - <version>${ccsdk.sli.core.version}</version> + <version>${ccsdk.sli.version}</version> <type>xml</type> <classifier>features</classifier> </dependency> @@ -40,6 +40,5 @@ <artifactId>generic-resource-api-provider</artifactId> <version>${project.version}</version> </dependency> - </dependencies> </project> diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index 2f64fe25..60281ffe 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -1,142 +1,137 @@ <?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.2.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.2.0-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api-installer</artifactId> - <version>2.2.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api-installer</artifactId> + <version>2.2.0-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>generic-resource-api-provider</artifactId> + <version>${project.version}</version> + </dependency> + </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>generic-resource-api-provider</artifactId> - <version>${project.version}</version> - </dependency> - - - </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> - - </executions> - </plugin> - - </plugins> - </build> + <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> + </plugins> + </build> </project> diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 792fe04a..4d49bbb8 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.2.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.2.0-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api-model</artifactId> - <version>2.2.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api-model</artifactId> + <version>2.2.0-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 871c7444..4b0ce29b 100644 --- a/generic-resource-api/model/swagger/pom.xml +++ b/generic-resource-api/model/swagger/pom.xml @@ -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> @@ -52,7 +52,9 @@ <configuration> <outputDirectory>${project.build.directory}/dependency</outputDirectory> <includes>**\/*.yang</includes> - <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound</includeGroupIds> + <includeGroupIds> + org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound + </includeGroupIds> </configuration> <executions> <execution> @@ -145,7 +147,8 @@ <configuration> <codeGenerators> <generator> - <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass> + <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator + </codeGeneratorClass> <outputBaseDir>${project.basedir}/src/main/json</outputBaseDir> <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir> <additionalConfiguration> @@ -169,7 +172,8 @@ <configuration> <codeGenerators> <generator> - <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass> + <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator + </codeGeneratorClass> <outputBaseDir>${project.basedir}/src/main/yaml</outputBaseDir> <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir> <additionalConfiguration> @@ -213,7 +217,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 7dbf48be..8ac6c405 100644 --- a/generic-resource-api/model/yang/pom.xml +++ b/generic-resource-api/model/yang/pom.xml @@ -21,8 +21,6 @@ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991</artifactId> </dependency> - - </dependencies> <build> diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index 61c65498..a84a8272 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.2.0-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.2.0-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.sdnc.northbound</groupId> - <artifactId>generic-resource-api</artifactId> - <version>2.2.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.sdnc.northbound</groupId> + <artifactId>generic-resource-api</artifactId> + <version>2.2.0-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 2dd8d69e..45ed0aee 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -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> + <version>${ccsdk.sli.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> |