diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2019-12-12 11:20:58 -0500 |
---|---|---|
committer | Singal, Kapil (ks220y) <ks220y@att.com> | 2019-12-13 11:00:40 -0500 |
commit | 05e4277510b9947e3cdcbab8c7bb3846a4211af6 (patch) | |
tree | ae84653e52db29ea754d05ae0dc5a64674e06049 /sdnr/northbound/a1Adapter | |
parent | 4aadd732e162ba6b11f348e758f21f4ff5533e2a (diff) |
Refactoring POM as per tidy:pom
Removing sli version property declared as project.version, and it should inherit from parent pom
Change-Id: I24dc1849e2183560f4c571319be0c490c772a95e
Issue-ID: CCSDK-1993
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Diffstat (limited to 'sdnr/northbound/a1Adapter')
-rw-r--r-- | sdnr/northbound/a1Adapter/feature/pom.xml | 38 | ||||
-rw-r--r-- | sdnr/northbound/a1Adapter/installer/pom.xml | 170 | ||||
-rw-r--r-- | sdnr/northbound/a1Adapter/model/pom.xml | 89 | ||||
-rw-r--r-- | sdnr/northbound/a1Adapter/pom.xml | 42 | ||||
-rw-r--r-- | sdnr/northbound/a1Adapter/provider/pom.xml | 4 |
5 files changed, 169 insertions, 174 deletions
diff --git a/sdnr/northbound/a1Adapter/feature/pom.xml b/sdnr/northbound/a1Adapter/feature/pom.xml index bc64dfffe..ef294b370 100644 --- a/sdnr/northbound/a1Adapter/feature/pom.xml +++ b/sdnr/northbound/a1Adapter/feature/pom.xml @@ -1,28 +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>single-feature-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>single-feature-parent</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>sdnr-a1Adapter</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>sdnr-a1Adapter</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>feature</packaging> - <name>ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId}</name> + <name>ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId}</name> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>a1Adapter-provider</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>a1Adapter-provider</artifactId> + <version>${project.version}</version> + </dependency> - </dependencies> + </dependencies> </project> diff --git a/sdnr/northbound/a1Adapter/installer/pom.xml b/sdnr/northbound/a1Adapter/installer/pom.xml index cda3121e4..9cc63e7b7 100644 --- a/sdnr/northbound/a1Adapter/installer/pom.xml +++ b/sdnr/northbound/a1Adapter/installer/pom.xml @@ -1,97 +1,97 @@ <?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.5.1-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>a1Adapter-installer</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>a1Adapter-installer</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId}</name> + <name>ccsdk-features-sdnr-northbound :: a1Adapter :: ${project.artifactId}</name> - <properties> - <application.name>sdnr-a1Adapter</application.name> - <include.transitive.dependencies>false</include.transitive.dependencies> - </properties> + <properties> + <application.name>sdnr-a1Adapter</application.name> + <include.transitive.dependencies>false</include.transitive.dependencies> + </properties> - <dependencies> + <dependencies> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.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.features.sdnr.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>${project.groupId}</groupId> - <artifactId>a1Adapter-provider</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>a1Adapter-provider</artifactId> + <version>${project.version}</version> + </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> - </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> - <includeArtifactIds>a1Adapter-model,a1Adapter-provider,sdnr-a1Adapter</includeArtifactIds> - <scope>provided</scope> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <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> + </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> + <includeArtifactIds>a1Adapter-model,a1Adapter-provider,sdnr-a1Adapter</includeArtifactIds> + <scope>provided</scope> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> diff --git a/sdnr/northbound/a1Adapter/model/pom.xml b/sdnr/northbound/a1Adapter/model/pom.xml index e9c809773..a557d3c76 100644 --- a/sdnr/northbound/a1Adapter/model/pom.xml +++ b/sdnr/northbound/a1Adapter/model/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>binding-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>a1Adapter-model</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>bundle</packaging> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>a1Adapter-model</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>bundle</packaging> - <dependencies> - <dependency> + <dependencies> + <dependency> <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> <artifactId>rfc6991</artifactId> </dependency> + </dependencies> - - </dependencies> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.codehaus.mojo</groupId> - <artifactId>properties-maven-plugin</artifactId> - <versionRange>[1.0.0,)</versionRange> - <goals> - <goal>set-system-properties</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.codehaus.mojo</groupId> + <artifactId>properties-maven-plugin</artifactId> + <versionRange>[1.0.0,)</versionRange> + <goals> + <goal>set-system-properties</goal> + </goals> + </pluginExecutionFilter> + <action> + <execute/> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> diff --git a/sdnr/northbound/a1Adapter/pom.xml b/sdnr/northbound/a1Adapter/pom.xml index 5ce3a88b0..bea1518ff 100644 --- a/sdnr/northbound/a1Adapter/pom.xml +++ b/sdnr/northbound/a1Adapter/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>odlparent-lite</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>1.5.1-SNAPSHOT</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>a1Adapter</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>a1Adapter</artifactId> + <version>0.7.0-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-features-sdnr-northbound :: a1Adapter</name> + <name>ccsdk-features-sdnr-northbound :: a1Adapter</name> - <modules> - <module>model</module> - <module>feature</module> - <module>provider</module> - <module>installer</module> - </modules> + <modules> + <module>model</module> + <module>feature</module> + <module>provider</module> + <module>installer</module> + </modules> - <properties> - <feature-name>a1Adapter</feature-name> - </properties> + <properties> + <feature-name>a1Adapter</feature-name> + </properties> </project> diff --git a/sdnr/northbound/a1Adapter/provider/pom.xml b/sdnr/northbound/a1Adapter/provider/pom.xml index a0ce6a1a2..41e639152 100644 --- a/sdnr/northbound/a1Adapter/provider/pom.xml +++ b/sdnr/northbound/a1Adapter/provider/pom.xml @@ -38,8 +38,6 @@ </dependencies> </dependencyManagement> - - <dependencies> <dependency> <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> @@ -95,7 +93,6 @@ <!-- <version>${sdnctl.sli.version}</version> --> </dependency> - </dependencies> <build> @@ -128,5 +125,4 @@ </plugins> </pluginManagement> </build> - </project> |