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 /springboot | |
| 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 'springboot')
| -rwxr-xr-x | springboot/springboot1/pom.xml | 35 | ||||
| -rwxr-xr-x | springboot/springboot2/pom.xml | 34 |
2 files changed, 47 insertions, 22 deletions
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 37d4d0a9..3d5cf6f5 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -332,6 +332,30 @@ </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> </profiles> @@ -952,17 +976,6 @@ </executions> </plugin> <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.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>2.5</version> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index b3e1c32d..a6d64bec 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -327,6 +327,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> </profiles> @@ -947,17 +970,6 @@ </executions> </plugin> <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.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>2.5</version> |