diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-04-17 15:26:38 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-04-17 15:26:41 -0400 |
| commit | dc63c6821144ac87c94d2e2a63863537f460924f (patch) | |
| tree | d7c5c7122eb51c4c7389bd1979f35cc233317044 /springboot | |
| parent | e1d7eb376cf7edab7cee1043b7fae23280155fe4 (diff) | |
Fix staging build1.1.4casablanca
Fix staging build for casablanca. This needs to be done to create
release version for 3.0.2 mtce release.
Change-Id: I81647c621e9c934d9672396aed75e9d541ba2a95
Issue-ID: CCSDK-1166
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'springboot')
| -rwxr-xr-x | springboot/pom.xml | 4 | ||||
| -rwxr-xr-x | springboot/springboot1/pom.xml | 38 | ||||
| -rwxr-xr-x | springboot/springboot2/pom.xml | 38 |
3 files changed, 52 insertions, 28 deletions
diff --git a/springboot/pom.xml b/springboot/pom.xml index 8a3f0d87..a876c20b 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -7,12 +7,12 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>springboot-aggregator</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.4-SNAPSHOT</version> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.4-SNAPSHOT</version> </parent> <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml index 62d28169..61b81e4b 100755 --- a/springboot/springboot1/pom.xml +++ b/springboot/springboot1/pom.xml @@ -6,7 +6,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-1-starter-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.4-SNAPSHOT</version> <parent> <groupId>org.springframework.boot</groupId> @@ -327,7 +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://nexus.onap.org</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> @@ -946,17 +968,7 @@ </execution> </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> diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml index 5790b008..2cff612c 100755 --- a/springboot/springboot2/pom.xml +++ b/springboot/springboot2/pom.xml @@ -6,7 +6,7 @@ <packaging>pom</packaging> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>1.1.3-SNAPSHOT</version> + <version>1.1.4-SNAPSHOT</version> <parent> <groupId>org.springframework.boot</groupId> @@ -327,7 +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://nexus.onap.org</nexusUrl> + <stagingProfileId>176c31dfe190a</stagingProfileId> + <serverId>ecomp-staging</serverId> + </configuration> + </plugin> + </plugins> + </build> + </profile> </profiles> @@ -946,17 +968,7 @@ </execution> </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> |