diff options
| -rw-r--r-- | ncomp-maven-base/pom.xml | 23 | ||||
| -rw-r--r-- | ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-maven-sirius-project/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-maven-sirius-runtime/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-maven-xcore-project/pom.xml | 2 | ||||
| -rw-r--r-- | ncomp-maven-xcore/pom.xml | 23 | ||||
| -rw-r--r-- | pom.xml | 29 |
7 files changed, 61 insertions, 22 deletions
diff --git a/ncomp-maven-base/pom.xml b/ncomp-maven-base/pom.xml index 2dac61e..e247521 100644 --- a/ncomp-maven-base/pom.xml +++ b/ncomp-maven-base/pom.xml @@ -6,16 +6,29 @@ <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> + + + + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <groupPath>ncomp/maven</groupPath> + <site.path>content/sites/site/org/openecomp/${groupPath}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + <build> @@ -64,7 +77,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> diff --git a/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml b/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml index defa15d..d10449e 100644 --- a/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml +++ b/ncomp-maven-parent-project/src/main/resources/archetype-resources/pom.xml @@ -20,6 +20,6 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-base</relativePath> </parent> </project> diff --git a/ncomp-maven-sirius-project/pom.xml b/ncomp-maven-sirius-project/pom.xml index 2ea34da..659139f 100644 --- a/ncomp-maven-sirius-project/pom.xml +++ b/ncomp-maven-sirius-project/pom.xml @@ -9,6 +9,6 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-base</relativePath> </parent> </project> diff --git a/ncomp-maven-sirius-runtime/pom.xml b/ncomp-maven-sirius-runtime/pom.xml index d771da4..3290047 100644 --- a/ncomp-maven-sirius-runtime/pom.xml +++ b/ncomp-maven-sirius-runtime/pom.xml @@ -9,6 +9,6 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-base</relativePath> </parent> </project> diff --git a/ncomp-maven-xcore-project/pom.xml b/ncomp-maven-xcore-project/pom.xml index a74cf1e..c9ff042 100644 --- a/ncomp-maven-xcore-project/pom.xml +++ b/ncomp-maven-xcore-project/pom.xml @@ -9,6 +9,6 @@ <groupId>org.openecomp.ncomp.maven</groupId> <artifactId>ncomp-maven-base</artifactId> <version>1.1.0-SNAPSHOT</version> - <relativePath>../../dcae-org.openecomp.ncomp.maven/ncomp-maven-base</relativePath> + <relativePath>../../ncomp.maven/ncomp-maven-base</relativePath> </parent> </project> diff --git a/ncomp-maven-xcore/pom.xml b/ncomp-maven-xcore/pom.xml index b2aacb3..7d0fede 100644 --- a/ncomp-maven-xcore/pom.xml +++ b/ncomp-maven-xcore/pom.xml @@ -6,16 +6,29 @@ <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> + + + + <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.target>1.7</maven.compiler.target> <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <groupPath>ncomp/maven</groupPath> + <site.path>content/sites/site/org/openecomp/${groupPath}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + <build> @@ -104,7 +117,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> @@ -6,16 +6,29 @@ <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> + + + + <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.target>1.7</maven.compiler.target> - <maven.compiler.source>1.7</maven.compiler.source> - <openecomp.nexus.releases>https://nexus.onap.org/content/repositories/releases/</openecomp.nexus.releases> - <openecomp.nexus.snapshots>https://nexus.onap.org/content/repositories/snapshots/</openecomp.nexus.snapshots> - <openecomp.nexus.proxy>https://nexus.onap.org</openecomp.nexus.proxy> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.7</maven.compiler.target> + <maven.compiler.source>1.7</maven.compiler.source> + <nexusproxy>https://nexus.onap.org</nexusproxy> + <openecomp.nexus.releases>${nexusproxy}/content/repositories/releases/</openecomp.nexus.releases> + <openecomp.nexus.snapshots>${nexusproxy}/content/repositories/snapshots/</openecomp.nexus.snapshots> + <openecomp.nexus.proxy>${nexusproxy}</openecomp.nexus.proxy> <openecomp.nexus.staging.serverId>ecomp-staging</openecomp.nexus.staging.serverId> <openecomp.nexus.staging.profileId>176c31dfe190a</openecomp.nexus.staging.profileId> - <nexusproxy>https://nexus.onap.org</nexusproxy></properties> + <groupPath>ncomp/maven</groupPath> + <site.path>content/sites/site/org/openecomp/${groupPath}/${project.artifactId}/${project.version}</site.path> + <site.urlroot>dav:${nexusproxy}</site.urlroot> + <site.url>${site.urlroot}/${site.path}/</site.url> + </properties> + + + + @@ -68,7 +81,7 @@ </snapshotRepository> <site> <id>ecomp-site</id> - <url>dav:${nexusproxy}/content/sites/site/org/openecomp/ncomp/maven/${project.artifactId}/${project.version}/</url> + <url>${site.url}</url> </site> </distributionManagement> |