diff options
| -rw-r--r-- | odlparent/binding-parent/pom.xml | 40 | ||||
| -rw-r--r-- | odlparent/bundle-parent/pom.xml | 40 | ||||
| -rw-r--r-- | odlparent/feature-repo-parent/pom.xml | 40 | ||||
| -rw-r--r-- | odlparent/mdsal-it-parent/pom.xml | 40 | ||||
| -rw-r--r-- | odlparent/odlparent-lite/pom.xml | 40 | ||||
| -rw-r--r-- | odlparent/odlparent/pom.xml | 40 | ||||
| -rwxr-xr-x | odlparent/setup/src/main/resources/pom-template.xml | 40 | ||||
| -rw-r--r-- | odlparent/single-feature-parent/pom.xml | 40 | ||||
| -rwxr-xr-x | pom.xml | 116 | ||||
| -rwxr-xr-x | springboot/springboot1/pom.xml | 35 | ||||
| -rwxr-xr-x | springboot/springboot2/pom.xml | 34 |
11 files changed, 305 insertions, 200 deletions
diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml index 010f25fd..4c804b4b 100644 --- a/odlparent/binding-parent/pom.xml +++ b/odlparent/binding-parent/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml index 411bf560..915a9a5d 100644 --- a/odlparent/bundle-parent/pom.xml +++ b/odlparent/bundle-parent/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml index f1ff9176..0e913d19 100644 --- a/odlparent/feature-repo-parent/pom.xml +++ b/odlparent/feature-repo-parent/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml index 8d52a23f..403058ba 100644 --- a/odlparent/mdsal-it-parent/pom.xml +++ b/odlparent/mdsal-it-parent/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml index 696a409e..45b663a8 100644 --- a/odlparent/odlparent-lite/pom.xml +++ b/odlparent/odlparent-lite/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml index a1159cb7..a86c2fb4 100644 --- a/odlparent/odlparent/pom.xml +++ b/odlparent/odlparent/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> 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> diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml index ae3329b7..1c50cd27 100644 --- a/odlparent/single-feature-parent/pom.xml +++ b/odlparent/single-feature-parent/pom.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://nexus.onap.org</nexusUrl> + <stagingProfileId></stagingProfileId> + <serverId>ecomp-releases</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> @@ -1,58 +1,74 @@ <?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/maven-v4_0_0.xsd"> +<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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <packaging>pom</packaging> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>parent</artifactId> - <version>1.2.1-SNAPSHOT</version> - <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + <groupId>org.onap.ccsdk.parent</groupId> + <artifactId>parent</artifactId> + <version>1.2.1-SNAPSHOT</version> + <name>ONAP :: ${project.groupId} :: ${project.artifactId}</name> - <properties> - <onap.nexus.host>nexus.onap.org</onap.nexus.host> - <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> - <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> - </properties> + <properties> + <onap.nexus.host>nexus.onap.org</onap.nexus.host> + <onap.nexus.staging.server-id>ecomp-staging</onap.nexus.staging.server-id> + <onap.nexus.staging.profile-id>176c31dfe190a</onap.nexus.staging.profile-id> + </properties> - <distributionManagement> - <repository> - <id>ecomp-releases</id> - <url>https://nexus.onap.org/content/repositories/releases</url> - </repository> - <snapshotRepository> - <id>ecomp-snapshots</id> - <url>https://nexus.onap.org/content/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <url>https://nexus.onap.org/content/repositories/releases</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <url>https://nexus.onap.org/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>2.5</version> - <configuration> - <processAllModules>true</processAllModules> - </configuration> - </plugin> - <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> - <modules> - <module>odlparent</module> - <module>springboot</module> - </modules> + <profiles> + <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> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>2.5</version> + <configuration> + <processAllModules>true</processAllModules> + </configuration> + </plugin> + </plugins> + </build> + <modules> + <module>odlparent</module> + <module>springboot</module> + </modules> </project> 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> |