diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-03-04 11:49:26 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-03-04 11:49:26 -0500 |
| commit | e3948b0308c817f0b43918731ee26dab6202c0c9 (patch) | |
| tree | e75b228685fa9293922c8efa50c6193f991d5313 /odlparent/setup/src/main/resources | |
| parent | aac160b9e21ca6fad9c67704720a6034f949668e (diff) | |
Change nexus-staging config
nexus-staging-maven-plugin interferes with Jenkins staging job, but
is needed for release-version and docker-version jobs. Changed to
install nexus-staging-maven-plugin in a separate build profile that
is activated when altDeploymentRepository property is unset. This property
is set by the staging Jenkins job only.
Change-Id: I877e176229efd6bd5c08a6b83a2594cc4e57eebe
Issue-ID: CCSDK-1119
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlparent/setup/src/main/resources')
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml index 58291122..d9b3433d 100755 --- a/odlparent/setup/src/main/resources/pom-template.xml +++ b/odlparent/setup/src/main/resources/pom-template.xml @@ -440,7 +440,29 @@ </profile> <!-- End of profiles from ONAP oparent --> - + <profile> + <id>nexus-staging</id> + <activation> + <property> + <name>!altDeploymentRepository</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + <version>1.6.7</version> + <extensions>true</extensions> + <configuration> + <nexusUrl>https://${onap.nexus.host}</nexusUrl> + <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId> + <serverId>${onap.nexus.staging.server-id}</serverId> + </configuration> + </plugin> + </plugins> + </build> + </profile> <profile> <activation> <file> @@ -747,17 +769,7 @@ <plugins> <!-- Plugins from ONAP version (parent of oparent) --> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>\${onap.nexus.url}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> @@ -984,10 +996,6 @@ <!-- Plugins from oparent version (parent of oparent) --> <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> </plugin> |