diff options
author | Singal, Kapil (ks220y) <ks220y@att.com> | 2021-03-02 20:00:49 -0500 |
---|---|---|
committer | KAPIL SINGAL <ks220y@att.com> | 2021-03-09 15:41:39 +0000 |
commit | 94f4b9bf8661ad75628163b46518e902b6abc834 (patch) | |
tree | a269b56f643b30b6f9d0c3e264ab6a49a11447bd /adaptors/base | |
parent | 3f3e689bb5940b93d52fe543d9cc0a814c576475 (diff) |
Refactoring pom's name tag
Indenting pom's and running mvn tidy:pom to rearrange items
Issue-ID: CCSDK-3198
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735
Diffstat (limited to 'adaptors/base')
-rw-r--r-- | adaptors/base/http/installer/pom.xml | 228 | ||||
-rw-r--r-- | adaptors/base/http/pom.xml | 2 | ||||
-rw-r--r-- | adaptors/base/http/provider/pom.xml | 68 | ||||
-rw-r--r-- | adaptors/base/pom.xml | 4 |
4 files changed, 154 insertions, 148 deletions
diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index b0f69b966..199bf1a61 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -1,127 +1,127 @@ <?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.1</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>odlparent-lite</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-installer</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-installer</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>pom</packaging> - <name>ccsdk-sli-adaptors :: base-http :: ${project.artifactId}</name> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> - <properties> - <application.name>ccsdk-base-http</application.name> - <features.boot>${application.name}</features.boot> + <properties> + <application.name>ccsdk-base-http</application.name> + <features.boot>${application.name}</features.boot> <features.repositories>mvn:org.onap.ccsdk.sli.adaptors/${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.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> + <dependency> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-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> - <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> - <includeArtifactIds>ccsdk-base-http,base-http-provider</includeArtifactIds> - <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> + <includeArtifactIds>ccsdk-base-http,base-http-provider</includeArtifactIds> + <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/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index ea77acb69..60e9a2407 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -14,6 +14,8 @@ <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>ccsdk-sli-adaptors :: base-${project.artifactId}</name> + <modules> <module>provider</module> <module>installer</module> diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 49fee0cec..daa9dd9e7 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -1,39 +1,41 @@ <?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>2.1.1</version> - <relativePath/> - </parent> + <parent> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>binding-parent</artifactId> + <version>2.1.1</version> + <relativePath/> + </parent> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-provider</artifactId> - <version>1.2.1-SNAPSHOT</version> - <packaging>bundle</packaging> + <groupId>org.onap.ccsdk.sli.adaptors</groupId> + <artifactId>base-http-provider</artifactId> + <version>1.2.1-SNAPSHOT</version> + <packaging>bundle</packaging> - <dependencies> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jersey.core</groupId> - <artifactId>jersey-client</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.onap.logging-analytics</groupId> - <artifactId>logging-filter-base</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + + <dependencies> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>javax.ws.rs-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.onap.logging-analytics</groupId> + <artifactId>logging-filter-base</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> </project> diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 6ab8e4f1a..3320f9358 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -7,13 +7,15 @@ <artifactId>odlparent-lite</artifactId> <version>2.1.1</version> <relativePath/> - </parent> + </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> <artifactId>base-parent</artifactId> <version>1.2.1-SNAPSHOT</version> <packaging>pom</packaging> + <name>ccsdk-sli-adaptors :: ${project.artifactId}</name> + <modules> <module>http</module> </modules> |